From 1f37032990618bfcd0279d631c7d4507f4749c82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 9 Jan 2021 22:18:43 +0100 Subject: [PATCH] fontconverter: properly hook up the ImageConverter plugin manager. Broken since the shared global state for plugin managers got removed in Corrade 2020.06, forgot to update this case. --- src/Magnum/Text/fontconverter.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Magnum/Text/fontconverter.cpp b/src/Magnum/Text/fontconverter.cpp index 383daf0e2..04bee7ff8 100644 --- a/src/Magnum/Text/fontconverter.cpp +++ b/src/Magnum/Text/fontconverter.cpp @@ -173,10 +173,14 @@ int FontConverter::exec() { Containers::Pointer font = fontManager.loadAndInstantiate(args.value("font")); if(!font) return 1; - /* Load font converter */ + /* Register the image converter manager for potential dependencies + (MagnumFontConverter needs TgaImageConverter, for example) */ PluginManager::Manager converterManager{ args.value("plugin-dir").empty() ? std::string{} : Utility::Directory::join(args.value("plugin-dir"), Text::AbstractFontConverter::pluginSearchPaths()[0])}; + converterManager.registerExternalManager(imageConverterManager); + + /* Load font converter */ Containers::Pointer converter = converterManager.loadAndInstantiate(args.value("converter")); if(!converter) return 2;