From 782f5e6dfa23702f6dd9b016c2572c1f1f5d23fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 9 Jun 2022 22:32:02 +0200 Subject: [PATCH] imageconverter: rename internal helpers for clarity. --- src/Magnum/Trade/imageconverter.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Magnum/Trade/imageconverter.cpp b/src/Magnum/Trade/imageconverter.cpp index e37d7eccc..8606655d5 100644 --- a/src/Magnum/Trade/imageconverter.cpp +++ b/src/Magnum/Trade/imageconverter.cpp @@ -245,7 +245,7 @@ template bool checkCommonFormatAndSize(const Utility::Ar return true; } -template class View, UnsignedInt dimensions> bool convertOneOrMoreImages(Trade::AbstractImageConverter& converter, const Containers::Array>& outputImages, const Containers::StringView output) { +template class View, UnsignedInt dimensions> bool convertOneOrMoreImagesToFile(Trade::AbstractImageConverter& converter, const Containers::Array>& outputImages, const Containers::StringView output) { Containers::Array> views; arrayReserve(views, outputImages.size()); for(const Trade::ImageData& outputImage: outputImages) @@ -253,7 +253,7 @@ template class View, UnsignedInt dimensions> bool c return converter.convertToFile(views, output); } -template bool convertOneOrMoreImages(Trade::AbstractImageConverter& converter, const Containers::Array>& outputImages, const Containers::StringView output) { +template bool convertOneOrMoreImagesToFile(Trade::AbstractImageConverter& converter, const Containers::Array>& outputImages, const Containers::StringView output) { /* If there's just one image, convert it using the single-level API. Otherwise the multi-level entrypoint would require the plugin to support multi-level conversion, and only some file formats have that. */ @@ -262,9 +262,9 @@ template bool convertOneOrMoreImages(Trade::AbstractImag CORRADE_INTERNAL_ASSERT(!outputImages.isEmpty()); if(outputImages.front().isCompressed()) - return convertOneOrMoreImages(converter, outputImages, output); + return convertOneOrMoreImagesToFile(converter, outputImages, output); else - return convertOneOrMoreImages(converter, outputImages, output); + return convertOneOrMoreImagesToFile(converter, outputImages, output); } } @@ -988,11 +988,11 @@ key=true; configuration subgroups are delimited with /.)") { Trade::Implementation::Duration d{conversionTime}; if(outputDimensions == 1) - converted = convertOneOrMoreImages(*converter, outputImages1D, output); + converted = convertOneOrMoreImagesToFile(*converter, outputImages1D, output); else if(outputDimensions == 2) - converted = convertOneOrMoreImages(*converter, outputImages2D, output); + converted = convertOneOrMoreImagesToFile(*converter, outputImages2D, output); else if(outputDimensions == 3) - converted = convertOneOrMoreImages(*converter, outputImages3D, output); + converted = convertOneOrMoreImagesToFile(*converter, outputImages3D, output); else CORRADE_INTERNAL_ASSERT_UNREACHABLE(); } if(!converted) {