Browse Source

imageconverter: move colored output logic at the top.

pull/595/head
Vladimír Vondruš 4 years ago
parent
commit
9cf7ee62f5
  1. 18
      src/Magnum/Trade/imageconverter.cpp

18
src/Magnum/Trade/imageconverter.cpp

@ -400,6 +400,15 @@ support conversion to a file, AnyImageConverter is used to save its output; if
no -C / --converter is specified, AnyImageConverter is used.)")
.parse(argc, argv);
/* Colored output. Enable only if a TTY. */
Debug::Flags useColor;
if(args.value("color") == "on")
useColor = Debug::Flags{};
else if(args.value("color") == "off")
useColor = Debug::Flag::DisableColors;
else
useColor = Debug::isTty() ? Debug::Flags{} : Debug::Flag::DisableColors;
/* Generic checks */
if(args.value<Containers::StringView>("output")) {
if(args.isSet("in-place")) {
@ -591,15 +600,6 @@ no -C / --converter is specified, AnyImageConverter is used.)")
Containers::Array<Trade::Implementation::ImageInfo> infos =
Trade::Implementation::imageInfo(*importer, error, importTime);
/* Colored output. Enable only if a TTY. */
Debug::Flags useColor;
if(args.value("color") == "on")
useColor = Debug::Flags{};
else if(args.value("color") == "off")
useColor = Debug::Flag::DisableColors;
else
useColor = Debug::isTty() ? Debug::Flags{} : Debug::Flag::DisableColors;
Trade::Implementation::printImageInfo(useColor, infos, nullptr, nullptr, nullptr);
if(args.isSet("profile")) {

Loading…
Cancel
Save