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

imageconverter: rename internal helpers for clarity.

pull/570/head
Vladimír Vondruš 4 years ago
parent
7e8d65cff3
commit
782f5e6dfa
1 changed files with 7 additions and 7 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. 14
      src/Magnum/Trade/imageconverter.cpp

14
src/Magnum/Trade/imageconverter.cpp
Unescape View File

@ -245,7 +245,7 @@ template<UnsignedInt dimensions> bool checkCommonFormatAndSize(const Utility::Ar
return true; return true;
} }
template<template<UnsignedInt, class> class View, UnsignedInt dimensions> bool convertOneOrMoreImages(Trade::AbstractImageConverter& converter, const Containers::Array<Trade::ImageData<dimensions>>& outputImages, const Containers::StringView output) { template<template<UnsignedInt, class> class View, UnsignedInt dimensions> bool convertOneOrMoreImagesToFile(Trade::AbstractImageConverter& converter, const Containers::Array<Trade::ImageData<dimensions>>& outputImages, const Containers::StringView output) {
Containers::Array<View<dimensions, const char>> views; Containers::Array<View<dimensions, const char>> views;
arrayReserve(views, outputImages.size()); arrayReserve(views, outputImages.size());
for(const Trade::ImageData<dimensions>& outputImage: outputImages) for(const Trade::ImageData<dimensions>& outputImage: outputImages)
@ -253,7 +253,7 @@ template<template<UnsignedInt, class> class View, UnsignedInt dimensions> bool c
return converter.convertToFile(views, output); return converter.convertToFile(views, output);
} }
template<UnsignedInt dimensions> bool convertOneOrMoreImages(Trade::AbstractImageConverter& converter, const Containers::Array<Trade::ImageData<dimensions>>& outputImages, const Containers::StringView output) { template<UnsignedInt dimensions> bool convertOneOrMoreImagesToFile(Trade::AbstractImageConverter& converter, const Containers::Array<Trade::ImageData<dimensions>>& outputImages, const Containers::StringView output) {
/* If there's just one image, convert it using the single-level API. /* If there's just one image, convert it using the single-level API.
Otherwise the multi-level entrypoint would require the plugin to support Otherwise the multi-level entrypoint would require the plugin to support
multi-level conversion, and only some file formats have that. */ multi-level conversion, and only some file formats have that. */
@ -262,9 +262,9 @@ template<UnsignedInt dimensions> bool convertOneOrMoreImages(Trade::AbstractImag
CORRADE_INTERNAL_ASSERT(!outputImages.isEmpty()); CORRADE_INTERNAL_ASSERT(!outputImages.isEmpty());
if(outputImages.front().isCompressed()) if(outputImages.front().isCompressed())
return convertOneOrMoreImages<CompressedImageView, dimensions>(converter, outputImages, output); return convertOneOrMoreImagesToFile<CompressedImageView, dimensions>(converter, outputImages, output);
else else
return convertOneOrMoreImages<ImageView, dimensions>(converter, outputImages, output); return convertOneOrMoreImagesToFile<ImageView, dimensions>(converter, outputImages, output);
} }
} }
@ -988,11 +988,11 @@ key=true; configuration subgroups are delimited with /.)")
{ {
Trade::Implementation::Duration d{conversionTime}; Trade::Implementation::Duration d{conversionTime};
if(outputDimensions == 1) if(outputDimensions == 1)
converted = convertOneOrMoreImages(*converter, outputImages1D, output); converted = convertOneOrMoreImagesToFile(*converter, outputImages1D, output);
else if(outputDimensions == 2) else if(outputDimensions == 2)
converted = convertOneOrMoreImages(*converter, outputImages2D, output); converted = convertOneOrMoreImagesToFile(*converter, outputImages2D, output);
else if(outputDimensions == 3) else if(outputDimensions == 3)
converted = convertOneOrMoreImages(*converter, outputImages3D, output); converted = convertOneOrMoreImagesToFile(*converter, outputImages3D, output);
else CORRADE_INTERNAL_ASSERT_UNREACHABLE(); else CORRADE_INTERNAL_ASSERT_UNREACHABLE();
} }
if(!converted) { if(!converted) {

Write Preview
Loading…
Cancel
Save