ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Text: actually make use of plugin-dir parameter in fontconverter utility. 

What the hell.
pull/55/merge
Vladimír Vondruš 12 years ago
parent
41b892296b
commit
66af4edd7f
1 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/Magnum/Text/fontconverter.cpp

6
src/Magnum/Text/fontconverter.cpp
Unescape View File

@ -77,16 +77,16 @@ FontConverter::FontConverter(const Arguments& arguments): Platform::WindowlessAp
int FontConverter::exec() { int FontConverter::exec() {
/* Font converter dependencies */ /* Font converter dependencies */
PluginManager::Manager<Trade::AbstractImageConverter> imageConverterManager(Utility::Directory::join(MAGNUM_PLUGINS_DIR, "imageconverters/")); PluginManager::Manager<Trade::AbstractImageConverter> imageConverterManager(Utility::Directory::join(args.value("plugin-dir"), "imageconverters/"));
/* Load font */ /* Load font */
PluginManager::Manager<Text::AbstractFont> fontManager(Utility::Directory::join(MAGNUM_PLUGINS_DIR, "fonts/")); PluginManager::Manager<Text::AbstractFont> fontManager(Utility::Directory::join(args.value("plugin-dir"), "fonts/"));
if(!(fontManager.load(args.value("font")) & PluginManager::LoadState::Loaded)) if(!(fontManager.load(args.value("font")) & PluginManager::LoadState::Loaded))
std::exit(1); std::exit(1);
std::unique_ptr<Text::AbstractFont> font = fontManager.instance(args.value("font")); std::unique_ptr<Text::AbstractFont> font = fontManager.instance(args.value("font"));
/* Load font converter */ /* Load font converter */
PluginManager::Manager<Text::AbstractFontConverter> converterManager(Utility::Directory::join(MAGNUM_PLUGINS_DIR, "fontconverters/")); PluginManager::Manager<Text::AbstractFontConverter> converterManager(Utility::Directory::join(args.value("plugin-dir"), "fontconverters/"));
if(!(converterManager.load(args.value("converter")) & PluginManager::LoadState::Loaded)) if(!(converterManager.load(args.value("converter")) & PluginManager::LoadState::Loaded))
std::exit(1); std::exit(1);
std::unique_ptr<Text::AbstractFontConverter> converter = converterManager.instance(args.value("converter")); std::unique_ptr<Text::AbstractFontConverter> converter = converterManager.instance(args.value("converter"));

Write Preview
Loading…
Cancel
Save