From 9c217b04c8dda129238275a6c044bef31901c854 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 9 Jun 2022 20:14:49 +0200 Subject: [PATCH] imageconverter: don't print any output by default. Only when --verbose is specified, consistently with sceneconverter and shaderconverter. --- src/Magnum/Trade/imageconverter.cpp | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/Magnum/Trade/imageconverter.cpp b/src/Magnum/Trade/imageconverter.cpp index 5eb01f6af..0616b0968 100644 --- a/src/Magnum/Trade/imageconverter.cpp +++ b/src/Magnum/Trade/imageconverter.cpp @@ -860,12 +860,18 @@ key=true; configuration subgroups are delimited with /.)") } else CORRADE_INTERNAL_ASSERT_UNREACHABLE(); } - { + const bool outputIsCompressed = + (outputDimensions == 1 && outputImages1D.front().isCompressed()) || + (outputDimensions == 2 && outputImages2D.front().isCompressed()) || + (outputDimensions == 3 && outputImages3D.front().isCompressed()); + + if(args.isSet("verbose")) { Debug d; if(args.value("converter") == "raw") d << "Writing raw image data of size"; else - d << "Converting image of size"; + d << "Saving output of size"; + d << Debug::packed; if(outputDimensions == 1) { d << outputImages1D.front().size(); if(outputImages1D.size() > 1) @@ -880,7 +886,7 @@ key=true; configuration subgroups are delimited with /.)") d << "(and" << outputImages3D.size() - 1 << "more levels)"; } else CORRADE_INTERNAL_ASSERT_UNREACHABLE(); - d << "and format"; + d << "and" << (outputIsCompressed ? "compressed format" : "format") << Debug::packed; if(outputDimensions == 1) { if(outputImages1D.front().isCompressed()) d << outputImages1D.front().compressedFormat(); @@ -894,7 +900,10 @@ key=true; configuration subgroups are delimited with /.)") d << outputImages3D.front().compressedFormat(); else d << outputImages3D.front().format(); } else CORRADE_INTERNAL_ASSERT_UNREACHABLE(); - d << "to" << output; + + if(args.value("converter") != "raw") + d << "with" << args.value("converter"); + d << Debug::nospace << "..."; } /* Save raw data, if requested. Only for single-level images as the data