From 05baf2fa50f7ff3a320109d399ad6aeeb172e9ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 15 Oct 2019 22:14:53 +0200 Subject: [PATCH] imageconverter: apparently I never tested these additions. The --raw is a not-yet-meant-to-be-public thing. --- src/Magnum/Trade/imageconverter.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Magnum/Trade/imageconverter.cpp b/src/Magnum/Trade/imageconverter.cpp index 4d3e94bd1..b6760bef6 100644 --- a/src/Magnum/Trade/imageconverter.cpp +++ b/src/Magnum/Trade/imageconverter.cpp @@ -94,7 +94,7 @@ using namespace Magnum; namespace { void setOptions(PluginManager::AbstractPlugin& plugin, const std::string& options) { - for(const std::string& option: Utility::String::splitWithoutEmptyParts(options, ';')) { + for(const std::string& option: Utility::String::splitWithoutEmptyParts(options, ',')) { auto keyValue = Utility::String::partition(option, '='); Utility::String::trimInPlace(keyValue[0]); Utility::String::trimInPlace(keyValue[2]); @@ -125,9 +125,8 @@ int main(int argc, char** argv) { .addOption("importer", "AnyImageImporter").setHelp("importer", "image importer plugin") .addOption("converter", "AnyImageConverter").setHelp("converter", "image converter plugin") .addOption("plugin-dir").setHelp("plugin-dir", "override base plugin dir", "DIR") - .addOption('i', "importer-options").setHelp("options", "configuration options to pass to the importer", "key=val,key2=val2,…") - .addOption('c', "converter-options").setHelp("options", "configuration options to pass to the converter", "key=val,key2=val2,…") - .addOption("raw").setHelp("raw", "treat the image as raw pixels of given format", "FORMAT") + .addOption('i', "importer-options").setHelp("importer-options", "configuration options to pass to the importer", "key=val,key2=val2,…") + .addOption('c', "converter-options").setHelp("converter-options", "configuration options to pass to the converter", "key=val,key2=val2,…") .setGlobalHelp(R"(Converts images of different formats. The -i / --importer-options and -c / --converter-options arguments accept a