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

Trade: un-combinatorially-explode ImageConverterFeatures. 

Unlike most other options, where a plugin can support 3D but not 2D or
compressed but not uncompressed data, the "levels" option is orthogonal
to the rest -- if a format supports multi-level data, it obviously also
supports a case where there is just a single level, and if it supports
 multi-level images, then it likely supports them for 1D, 2D and 3D, not
just some.

I used the same reasoning for the new SceneConverterFeatures interfaces
already, just "backporting" it here as well.

The bit pattern actually followed this already, but for some reason I
still went ahead and stamped out all possible combinations. Because
of that, nothing really changes on the ABI side either and the
deprecated aliases are now exactly as they were before, so no need to
bump the plugin interface version.
pull/565/merge
Vladimír Vondruš 4 years ago
parent
c29c5d67f7
commit
54d0b999b1
5 changed files with 672 additions and 473 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. 119
      src/Magnum/Trade/AbstractImageConverter.cpp
  2. 525
      src/Magnum/Trade/AbstractImageConverter.h
  3. 488
      src/Magnum/Trade/Test/AbstractImageConverterTest.cpp
  4. 6
      src/Magnum/Trade/imageconverter.cpp
  5. 7
      src/MagnumPlugins/AnyImageConverter/AnyImageConverter.cpp

119
src/Magnum/Trade/AbstractImageConverter.cpp
Unescape View File

@ -343,7 +343,7 @@ AbstractImageConverter::convertToData(const ImageView1D& image) {
} }
Containers::Optional<Containers::Array<char>> AbstractImageConverter::doConvertToData(const ImageView1D& image) { Containers::Optional<Containers::Array<char>> AbstractImageConverter::doConvertToData(const ImageView1D& image) {
CORRADE_ASSERT(features() >= ImageConverterFeature::ConvertLevels1DToData, CORRADE_ASSERT(features() >= ImageConverterFeature::Levels,
"Trade::AbstractImageConverter::convertToData(): 1D image conversion advertised but not implemented", {}); "Trade::AbstractImageConverter::convertToData(): 1D image conversion advertised but not implemented", {});
return doConvertToData(Containers::arrayView({image})); return doConvertToData(Containers::arrayView({image}));
@ -376,7 +376,7 @@ AbstractImageConverter::convertToData(const ImageView2D& image) {
} }
Containers::Optional<Containers::Array<char>> AbstractImageConverter::doConvertToData(const ImageView2D& image) { Containers::Optional<Containers::Array<char>> AbstractImageConverter::doConvertToData(const ImageView2D& image) {
CORRADE_ASSERT(features() >= ImageConverterFeature::ConvertLevels2DToData, CORRADE_ASSERT(features() >= ImageConverterFeature::Levels,
"Trade::AbstractImageConverter::convertToData(): 2D image conversion advertised but not implemented", {}); "Trade::AbstractImageConverter::convertToData(): 2D image conversion advertised but not implemented", {});
return doConvertToData(Containers::arrayView({image})); return doConvertToData(Containers::arrayView({image}));
@ -416,7 +416,7 @@ AbstractImageConverter::convertToData(const ImageView3D& image) {
} }
Containers::Optional<Containers::Array<char>> AbstractImageConverter::doConvertToData(const ImageView3D& image) { Containers::Optional<Containers::Array<char>> AbstractImageConverter::doConvertToData(const ImageView3D& image) {
CORRADE_ASSERT(features() >= ImageConverterFeature::ConvertLevels3DToData, CORRADE_ASSERT(features() >= ImageConverterFeature::Levels,
"Trade::AbstractImageConverter::convertToData(): 3D image conversion advertised but not implemented", {}); "Trade::AbstractImageConverter::convertToData(): 3D image conversion advertised but not implemented", {});
return doConvertToData(Containers::arrayView({image})); return doConvertToData(Containers::arrayView({image}));
@ -449,7 +449,7 @@ AbstractImageConverter::convertToData(const CompressedImageView1D& image) {
} }
Containers::Optional<Containers::Array<char>> AbstractImageConverter::doConvertToData(const CompressedImageView1D& image) { Containers::Optional<Containers::Array<char>> AbstractImageConverter::doConvertToData(const CompressedImageView1D& image) {
CORRADE_ASSERT(features() >= ImageConverterFeature::ConvertCompressedLevels1DToData, CORRADE_ASSERT(features() >= ImageConverterFeature::Levels,
"Trade::AbstractImageConverter::convertToData(): compressed 1D image conversion advertised but not implemented", {}); "Trade::AbstractImageConverter::convertToData(): compressed 1D image conversion advertised but not implemented", {});
return doConvertToData(Containers::arrayView({image})); return doConvertToData(Containers::arrayView({image}));
@ -482,7 +482,7 @@ AbstractImageConverter::convertToData(const CompressedImageView2D& image) {
} }
Containers::Optional<Containers::Array<char>> AbstractImageConverter::doConvertToData(const CompressedImageView2D& image) { Containers::Optional<Containers::Array<char>> AbstractImageConverter::doConvertToData(const CompressedImageView2D& image) {
CORRADE_ASSERT(features() >= ImageConverterFeature::ConvertCompressedLevels2DToData, CORRADE_ASSERT(features() >= ImageConverterFeature::Levels,
"Trade::AbstractImageConverter::convertToData(): compressed 2D image conversion advertised but not implemented", {}); "Trade::AbstractImageConverter::convertToData(): compressed 2D image conversion advertised but not implemented", {});
return doConvertToData(Containers::arrayView({image})); return doConvertToData(Containers::arrayView({image}));
@ -522,7 +522,7 @@ AbstractImageConverter::convertToData(const CompressedImageView3D& image) {
} }
Containers::Optional<Containers::Array<char>> AbstractImageConverter::doConvertToData(const CompressedImageView3D& image) { Containers::Optional<Containers::Array<char>> AbstractImageConverter::doConvertToData(const CompressedImageView3D& image) {
CORRADE_ASSERT(features() >= ImageConverterFeature::ConvertCompressedLevels3DToData, CORRADE_ASSERT(features() >= ImageConverterFeature::Levels,
"Trade::AbstractImageConverter::convertToData(): compressed 3D image conversion advertised but not implemented", {}); "Trade::AbstractImageConverter::convertToData(): compressed 3D image conversion advertised but not implemented", {});
return doConvertToData(Containers::arrayView({image})); return doConvertToData(Containers::arrayView({image}));
@ -623,7 +623,7 @@ Containers::Optional<Containers::Array<char>>
Implementation::ImageConverterOptionalButAlsoArray<char> Implementation::ImageConverterOptionalButAlsoArray<char>
#endif #endif
AbstractImageConverter::convertToData(const Containers::ArrayView<const ImageView1D> imageLevels) { AbstractImageConverter::convertToData(const Containers::ArrayView<const ImageView1D> imageLevels) {
CORRADE_ASSERT(features() >= ImageConverterFeature::ConvertLevels1DToData, CORRADE_ASSERT(features() >= ImageConverterFeature::Levels,
"Trade::AbstractImageConverter::convertToData(): multi-level 1D image conversion not supported", {}); "Trade::AbstractImageConverter::convertToData(): multi-level 1D image conversion not supported", {});
#ifndef CORRADE_NO_ASSERT #ifndef CORRADE_NO_ASSERT
@ -662,7 +662,7 @@ Containers::Optional<Containers::Array<char>>
Implementation::ImageConverterOptionalButAlsoArray<char> Implementation::ImageConverterOptionalButAlsoArray<char>
#endif #endif
AbstractImageConverter::convertToData(const Containers::ArrayView<const ImageView2D> imageLevels) { AbstractImageConverter::convertToData(const Containers::ArrayView<const ImageView2D> imageLevels) {
CORRADE_ASSERT(features() >= ImageConverterFeature::ConvertLevels2DToData, CORRADE_ASSERT(features() >= ImageConverterFeature::Levels,
"Trade::AbstractImageConverter::convertToData(): multi-level 2D image conversion not supported", {}); "Trade::AbstractImageConverter::convertToData(): multi-level 2D image conversion not supported", {});
#ifndef CORRADE_NO_ASSERT #ifndef CORRADE_NO_ASSERT
@ -701,7 +701,7 @@ Containers::Optional<Containers::Array<char>>
Implementation::ImageConverterOptionalButAlsoArray<char> Implementation::ImageConverterOptionalButAlsoArray<char>
#endif #endif
AbstractImageConverter::convertToData(const Containers::ArrayView<const ImageView3D> imageLevels) { AbstractImageConverter::convertToData(const Containers::ArrayView<const ImageView3D> imageLevels) {
CORRADE_ASSERT(features() >= ImageConverterFeature::ConvertLevels3DToData, CORRADE_ASSERT(features() >= ImageConverterFeature::Levels,
"Trade::AbstractImageConverter::convertToData(): multi-level 3D image conversion not supported", {}); "Trade::AbstractImageConverter::convertToData(): multi-level 3D image conversion not supported", {});
#ifndef CORRADE_NO_ASSERT #ifndef CORRADE_NO_ASSERT
@ -740,7 +740,7 @@ Containers::Optional<Containers::Array<char>>
Implementation::ImageConverterOptionalButAlsoArray<char> Implementation::ImageConverterOptionalButAlsoArray<char>
#endif #endif
AbstractImageConverter::convertToData(const Containers::ArrayView<const CompressedImageView1D> imageLevels) { AbstractImageConverter::convertToData(const Containers::ArrayView<const CompressedImageView1D> imageLevels) {
CORRADE_ASSERT(features() >= ImageConverterFeature::ConvertCompressedLevels1DToData, CORRADE_ASSERT(features() >= ImageConverterFeature::Levels,
"Trade::AbstractImageConverter::convertToData(): multi-level compressed 1D image conversion not supported", {}); "Trade::AbstractImageConverter::convertToData(): multi-level compressed 1D image conversion not supported", {});
#ifndef CORRADE_NO_ASSERT #ifndef CORRADE_NO_ASSERT
@ -779,7 +779,7 @@ Containers::Optional<Containers::Array<char>>
Implementation::ImageConverterOptionalButAlsoArray<char> Implementation::ImageConverterOptionalButAlsoArray<char>
#endif #endif
AbstractImageConverter::convertToData(const Containers::ArrayView<const CompressedImageView2D> imageLevels) { AbstractImageConverter::convertToData(const Containers::ArrayView<const CompressedImageView2D> imageLevels) {
CORRADE_ASSERT(features() >= ImageConverterFeature::ConvertCompressedLevels2DToData, CORRADE_ASSERT(features() >= ImageConverterFeature::Levels,
"Trade::AbstractImageConverter::convertToData(): multi-level compressed 2D image conversion not supported", {}); "Trade::AbstractImageConverter::convertToData(): multi-level compressed 2D image conversion not supported", {});
#ifndef CORRADE_NO_ASSERT #ifndef CORRADE_NO_ASSERT
@ -818,7 +818,7 @@ Containers::Optional<Containers::Array<char>>
Implementation::ImageConverterOptionalButAlsoArray<char> Implementation::ImageConverterOptionalButAlsoArray<char>
#endif #endif
AbstractImageConverter::convertToData(const Containers::ArrayView<const CompressedImageView3D> imageLevels) { AbstractImageConverter::convertToData(const Containers::ArrayView<const CompressedImageView3D> imageLevels) {
CORRADE_ASSERT(features() >= ImageConverterFeature::ConvertCompressedLevels3DToData, CORRADE_ASSERT(features() >= ImageConverterFeature::Levels,
"Trade::AbstractImageConverter::convertToData(): multi-level compressed 3D image conversion not supported", {}); "Trade::AbstractImageConverter::convertToData(): multi-level compressed 3D image conversion not supported", {});
#ifndef CORRADE_NO_ASSERT #ifndef CORRADE_NO_ASSERT
@ -868,7 +868,7 @@ bool AbstractImageConverter::doConvertToFile(const ImageView1D& image, const Con
/* Prefer to go through the ToFile variant instead of ToData assuming that /* Prefer to go through the ToFile variant instead of ToData assuming that
it could have a more memory-efficient implementation than having to it could have a more memory-efficient implementation than having to
materialize the whole output in memory first */ materialize the whole output in memory first */
if(features() >= ImageConverterFeature::ConvertLevels1DToFile) if(features() >= ImageConverterFeature::Levels)
return doConvertToFile(Containers::arrayView({image}), filename); return doConvertToFile(Containers::arrayView({image}), filename);
CORRADE_ASSERT(features() >= ImageConverterFeature::Convert1DToData, "Trade::AbstractImageConverter::convertToFile(): 1D image conversion advertised but not implemented", false); CORRADE_ASSERT(features() >= ImageConverterFeature::Convert1DToData, "Trade::AbstractImageConverter::convertToFile(): 1D image conversion advertised but not implemented", false);
@ -902,7 +902,7 @@ bool AbstractImageConverter::doConvertToFile(const ImageView2D& image, const Con
/* Prefer to go through the ToFile variant instead of ToData assuming that /* Prefer to go through the ToFile variant instead of ToData assuming that
it could have a more memory-efficient implementation than having to it could have a more memory-efficient implementation than having to
materialize the whole output in memory first */ materialize the whole output in memory first */
if(features() >= ImageConverterFeature::ConvertLevels2DToFile) if(features() >= ImageConverterFeature::Levels)
return doConvertToFile(Containers::arrayView({image}), filename); return doConvertToFile(Containers::arrayView({image}), filename);
CORRADE_ASSERT(features() >= ImageConverterFeature::Convert2DToData, "Trade::AbstractImageConverter::convertToFile(): 2D image conversion advertised but not implemented", false); CORRADE_ASSERT(features() >= ImageConverterFeature::Convert2DToData, "Trade::AbstractImageConverter::convertToFile(): 2D image conversion advertised but not implemented", false);
@ -942,7 +942,7 @@ bool AbstractImageConverter::doConvertToFile(const ImageView3D& image, const Con
/* Prefer to go through the ToFile variant instead of ToData assuming that /* Prefer to go through the ToFile variant instead of ToData assuming that
it could have a more memory-efficient implementation than having to it could have a more memory-efficient implementation than having to
materialize the whole output in memory first */ materialize the whole output in memory first */
if(features() >= ImageConverterFeature::ConvertLevels3DToFile) if(features() >= ImageConverterFeature::Levels)
return doConvertToFile(Containers::arrayView({image}), filename); return doConvertToFile(Containers::arrayView({image}), filename);
CORRADE_ASSERT(features() >= ImageConverterFeature::Convert3DToData, "Trade::AbstractImageConverter::convertToFile(): 3D image conversion advertised but not implemented", false); CORRADE_ASSERT(features() >= ImageConverterFeature::Convert3DToData, "Trade::AbstractImageConverter::convertToFile(): 3D image conversion advertised but not implemented", false);
@ -976,7 +976,7 @@ bool AbstractImageConverter::doConvertToFile(const CompressedImageView1D& image,
/* Prefer to go through the ToFile variant instead of ToData assuming that /* Prefer to go through the ToFile variant instead of ToData assuming that
it could have a more memory-efficient implementation than having to it could have a more memory-efficient implementation than having to
materialize the whole output in memory first */ materialize the whole output in memory first */
if(features() >= ImageConverterFeature::ConvertCompressedLevels1DToFile) if(features() >= ImageConverterFeature::Levels)
return doConvertToFile(Containers::arrayView({image}), filename); return doConvertToFile(Containers::arrayView({image}), filename);
CORRADE_ASSERT(features() >= ImageConverterFeature::ConvertCompressed1DToData, "Trade::AbstractImageConverter::convertToFile(): compressed 1D image conversion advertised but not implemented", false); CORRADE_ASSERT(features() >= ImageConverterFeature::ConvertCompressed1DToData, "Trade::AbstractImageConverter::convertToFile(): compressed 1D image conversion advertised but not implemented", false);
@ -1010,7 +1010,7 @@ bool AbstractImageConverter::doConvertToFile(const CompressedImageView2D& image,
/* Prefer to go through the ToFile variant instead of ToData assuming that /* Prefer to go through the ToFile variant instead of ToData assuming that
it could have a more memory-efficient implementation than having to it could have a more memory-efficient implementation than having to
materialize the whole output in memory first */ materialize the whole output in memory first */
if(features() >= ImageConverterFeature::ConvertCompressedLevels2DToFile) if(features() >= ImageConverterFeature::Levels)
return doConvertToFile(Containers::arrayView({image}), filename); return doConvertToFile(Containers::arrayView({image}), filename);
CORRADE_ASSERT(features() >= ImageConverterFeature::ConvertCompressed2DToData, "Trade::AbstractImageConverter::convertToFile(): compressed 2D image conversion advertised but not implemented", false); CORRADE_ASSERT(features() >= ImageConverterFeature::ConvertCompressed2DToData, "Trade::AbstractImageConverter::convertToFile(): compressed 2D image conversion advertised but not implemented", false);
@ -1050,7 +1050,7 @@ bool AbstractImageConverter::doConvertToFile(const CompressedImageView3D& image,
/* Prefer to go through the ToFile variant instead of ToData assuming that /* Prefer to go through the ToFile variant instead of ToData assuming that
it could have a more memory-efficient implementation than having to it could have a more memory-efficient implementation than having to
materialize the whole output in memory first */ materialize the whole output in memory first */
if(features() >= ImageConverterFeature::ConvertCompressedLevels3DToFile) if(features() >= ImageConverterFeature::Levels)
return doConvertToFile(Containers::arrayView({image}), filename); return doConvertToFile(Containers::arrayView({image}), filename);
CORRADE_ASSERT(features() >= ImageConverterFeature::ConvertCompressed3DToData, "Trade::AbstractImageConverter::convertToFile(): compressed 3D image conversion advertised but not implemented", false); CORRADE_ASSERT(features() >= ImageConverterFeature::ConvertCompressed3DToData, "Trade::AbstractImageConverter::convertToFile(): compressed 3D image conversion advertised but not implemented", false);
@ -1086,7 +1086,7 @@ bool AbstractImageConverter::convertToFile(const ImageData3D& image, const Conta
} }
bool AbstractImageConverter::convertToFile(const Containers::ArrayView<const ImageView1D> imageLevels, const Containers::StringView filename) { bool AbstractImageConverter::convertToFile(const Containers::ArrayView<const ImageView1D> imageLevels, const Containers::StringView filename) {
CORRADE_ASSERT(features() & ImageConverterFeature::ConvertLevels1DToFile, CORRADE_ASSERT(features() >= (ImageConverterFeature::Convert1DToFile|ImageConverterFeature::Levels),
"Trade::AbstractImageConverter::convertToFile(): multi-level 1D image conversion not supported", {}); "Trade::AbstractImageConverter::convertToFile(): multi-level 1D image conversion not supported", {});
#ifndef CORRADE_NO_ASSERT #ifndef CORRADE_NO_ASSERT
@ -1103,7 +1103,7 @@ bool AbstractImageConverter::convertToFile(const std::initializer_list<ImageView
} }
bool AbstractImageConverter::doConvertToFile(const Containers::ArrayView<const ImageView1D> imageLevels, const Containers::StringView filename) { bool AbstractImageConverter::doConvertToFile(const Containers::ArrayView<const ImageView1D> imageLevels, const Containers::StringView filename) {
CORRADE_ASSERT(features() >= ImageConverterFeature::ConvertLevels1DToData, "Trade::AbstractImageConverter::convertToFile(): multi-level 1D image conversion advertised but not implemented", false); CORRADE_ASSERT(features() >= ImageConverterFeature::Convert1DToData, "Trade::AbstractImageConverter::convertToFile(): multi-level 1D image conversion advertised but not implemented", false);
const Containers::Optional<Containers::Array<char>> data = doConvertToData(imageLevels); const Containers::Optional<Containers::Array<char>> data = doConvertToData(imageLevels);
/* No deleter checks as it doesn't matter here */ /* No deleter checks as it doesn't matter here */
@ -1118,7 +1118,7 @@ bool AbstractImageConverter::doConvertToFile(const Containers::ArrayView<const I
} }
bool AbstractImageConverter::convertToFile(const Containers::ArrayView<const ImageView2D> imageLevels, const Containers::StringView filename) { bool AbstractImageConverter::convertToFile(const Containers::ArrayView<const ImageView2D> imageLevels, const Containers::StringView filename) {
CORRADE_ASSERT(features() & ImageConverterFeature::ConvertLevels2DToFile, CORRADE_ASSERT(features() >= (ImageConverterFeature::Convert2DToFile|ImageConverterFeature::Levels),
"Trade::AbstractImageConverter::convertToFile(): multi-level 2D image conversion not supported", {}); "Trade::AbstractImageConverter::convertToFile(): multi-level 2D image conversion not supported", {});
#ifndef CORRADE_NO_ASSERT #ifndef CORRADE_NO_ASSERT
@ -1135,7 +1135,7 @@ bool AbstractImageConverter::convertToFile(const std::initializer_list<ImageView
} }
bool AbstractImageConverter::doConvertToFile(const Containers::ArrayView<const ImageView2D> imageLevels, const Containers::StringView filename) { bool AbstractImageConverter::doConvertToFile(const Containers::ArrayView<const ImageView2D> imageLevels, const Containers::StringView filename) {
CORRADE_ASSERT(features() >= ImageConverterFeature::ConvertLevels2DToData, "Trade::AbstractImageConverter::convertToFile(): multi-level 2D image conversion advertised but not implemented", false); CORRADE_ASSERT(features() >= ImageConverterFeature::Convert2DToData, "Trade::AbstractImageConverter::convertToFile(): multi-level 2D image conversion advertised but not implemented", false);
const Containers::Optional<Containers::Array<char>> data = doConvertToData(imageLevels); const Containers::Optional<Containers::Array<char>> data = doConvertToData(imageLevels);
/* No deleter checks as it doesn't matter here */ /* No deleter checks as it doesn't matter here */
@ -1150,7 +1150,7 @@ bool AbstractImageConverter::doConvertToFile(const Containers::ArrayView<const I
} }
bool AbstractImageConverter::convertToFile(const Containers::ArrayView<const ImageView3D> imageLevels, const Containers::StringView filename) { bool AbstractImageConverter::convertToFile(const Containers::ArrayView<const ImageView3D> imageLevels, const Containers::StringView filename) {
CORRADE_ASSERT(features() & ImageConverterFeature::ConvertLevels3DToFile, CORRADE_ASSERT(features() >= (ImageConverterFeature::Convert3DToFile|ImageConverterFeature::Levels),
"Trade::AbstractImageConverter::convertToFile(): multi-level 3D image conversion not supported", {}); "Trade::AbstractImageConverter::convertToFile(): multi-level 3D image conversion not supported", {});
#ifndef CORRADE_NO_ASSERT #ifndef CORRADE_NO_ASSERT
@ -1167,7 +1167,7 @@ bool AbstractImageConverter::convertToFile(const std::initializer_list<ImageView
} }
bool AbstractImageConverter::doConvertToFile(const Containers::ArrayView<const ImageView3D> imageLevels, const Containers::StringView filename) { bool AbstractImageConverter::doConvertToFile(const Containers::ArrayView<const ImageView3D> imageLevels, const Containers::StringView filename) {
CORRADE_ASSERT(features() >= ImageConverterFeature::ConvertLevels3DToData, "Trade::AbstractImageConverter::convertToFile(): multi-level 3D image conversion advertised but not implemented", false); CORRADE_ASSERT(features() >= ImageConverterFeature::Convert3DToData, "Trade::AbstractImageConverter::convertToFile(): multi-level 3D image conversion advertised but not implemented", false);
const Containers::Optional<Containers::Array<char>> data = doConvertToData(imageLevels); const Containers::Optional<Containers::Array<char>> data = doConvertToData(imageLevels);
/* No deleter checks as it doesn't matter here */ /* No deleter checks as it doesn't matter here */
@ -1182,7 +1182,7 @@ bool AbstractImageConverter::doConvertToFile(const Containers::ArrayView<const I
} }
bool AbstractImageConverter::convertToFile(const Containers::ArrayView<const CompressedImageView1D> imageLevels, const Containers::StringView filename) { bool AbstractImageConverter::convertToFile(const Containers::ArrayView<const CompressedImageView1D> imageLevels, const Containers::StringView filename) {
CORRADE_ASSERT(features() & ImageConverterFeature::ConvertCompressedLevels1DToFile, CORRADE_ASSERT(features() >= (ImageConverterFeature::ConvertCompressed1DToFile|ImageConverterFeature::Levels),
"Trade::AbstractImageConverter::convertToFile(): multi-level compressed 1D image conversion not supported", {}); "Trade::AbstractImageConverter::convertToFile(): multi-level compressed 1D image conversion not supported", {});
#ifndef CORRADE_NO_ASSERT #ifndef CORRADE_NO_ASSERT
@ -1199,7 +1199,7 @@ bool AbstractImageConverter::convertToFile(const std::initializer_list<Compresse
} }
bool AbstractImageConverter::doConvertToFile(const Containers::ArrayView<const CompressedImageView1D> imageLevels, Containers::StringView filename) { bool AbstractImageConverter::doConvertToFile(const Containers::ArrayView<const CompressedImageView1D> imageLevels, Containers::StringView filename) {
CORRADE_ASSERT(features() >= ImageConverterFeature::ConvertCompressedLevels1DToData, "Trade::AbstractImageConverter::convertToFile(): multi-level compressed 1D image conversion advertised but not implemented", false); CORRADE_ASSERT(features() >= ImageConverterFeature::ConvertCompressed1DToData, "Trade::AbstractImageConverter::convertToFile(): multi-level compressed 1D image conversion advertised but not implemented", false);
const Containers::Optional<Containers::Array<char>> data = doConvertToData(imageLevels); const Containers::Optional<Containers::Array<char>> data = doConvertToData(imageLevels);
/* No deleter checks as it doesn't matter here */ /* No deleter checks as it doesn't matter here */
@ -1214,7 +1214,7 @@ bool AbstractImageConverter::doConvertToFile(const Containers::ArrayView<const C
} }
bool AbstractImageConverter::convertToFile(const Containers::ArrayView<const CompressedImageView2D> imageLevels, const Containers::StringView filename) { bool AbstractImageConverter::convertToFile(const Containers::ArrayView<const CompressedImageView2D> imageLevels, const Containers::StringView filename) {
CORRADE_ASSERT(features() & ImageConverterFeature::ConvertCompressedLevels2DToFile, CORRADE_ASSERT(features() >= (ImageConverterFeature::ConvertCompressed2DToFile|ImageConverterFeature::Levels),
"Trade::AbstractImageConverter::convertToFile(): multi-level compressed 2D image conversion not supported", {}); "Trade::AbstractImageConverter::convertToFile(): multi-level compressed 2D image conversion not supported", {});
#ifndef CORRADE_NO_ASSERT #ifndef CORRADE_NO_ASSERT
@ -1231,7 +1231,7 @@ bool AbstractImageConverter::convertToFile(const std::initializer_list<Compresse
} }
bool AbstractImageConverter::doConvertToFile(const Containers::ArrayView<const CompressedImageView2D> imageLevels, Containers::StringView filename) { bool AbstractImageConverter::doConvertToFile(const Containers::ArrayView<const CompressedImageView2D> imageLevels, Containers::StringView filename) {
CORRADE_ASSERT(features() >= ImageConverterFeature::ConvertCompressedLevels2DToData, "Trade::AbstractImageConverter::convertToFile(): multi-level compressed 2D image conversion advertised but not implemented", false); CORRADE_ASSERT(features() >= ImageConverterFeature::ConvertCompressed2DToData, "Trade::AbstractImageConverter::convertToFile(): multi-level compressed 2D image conversion advertised but not implemented", false);
const Containers::Optional<Containers::Array<char>> data = doConvertToData(imageLevels); const Containers::Optional<Containers::Array<char>> data = doConvertToData(imageLevels);
/* No deleter checks as it doesn't matter here */ /* No deleter checks as it doesn't matter here */
@ -1246,7 +1246,7 @@ bool AbstractImageConverter::doConvertToFile(const Containers::ArrayView<const C
} }
bool AbstractImageConverter::convertToFile(const Containers::ArrayView<const CompressedImageView3D> imageLevels, const Containers::StringView filename) { bool AbstractImageConverter::convertToFile(const Containers::ArrayView<const CompressedImageView3D> imageLevels, const Containers::StringView filename) {
CORRADE_ASSERT(features() & ImageConverterFeature::ConvertCompressedLevels3DToFile, CORRADE_ASSERT(features() >= (ImageConverterFeature::ConvertCompressed3DToFile|ImageConverterFeature::Levels),
"Trade::AbstractImageConverter::convertToFile(): multi-level compressed 3D image conversion not supported", {}); "Trade::AbstractImageConverter::convertToFile(): multi-level compressed 3D image conversion not supported", {});
#ifndef CORRADE_NO_ASSERT #ifndef CORRADE_NO_ASSERT
@ -1263,7 +1263,7 @@ bool AbstractImageConverter::convertToFile(const std::initializer_list<Compresse
} }
bool AbstractImageConverter::doConvertToFile(const Containers::ArrayView<const CompressedImageView3D> imageLevels, Containers::StringView filename) { bool AbstractImageConverter::doConvertToFile(const Containers::ArrayView<const CompressedImageView3D> imageLevels, Containers::StringView filename) {
CORRADE_ASSERT(features() >= ImageConverterFeature::ConvertCompressedLevels3DToData, "Trade::AbstractImageConverter::convertToFile(): multi-level compressed 3D image conversion advertised but not implemented", false); CORRADE_ASSERT(features() >= ImageConverterFeature::ConvertCompressed3DToData, "Trade::AbstractImageConverter::convertToFile(): multi-level compressed 3D image conversion advertised but not implemented", false);
const Containers::Optional<Containers::Array<char>> data = doConvertToData(imageLevels); const Containers::Optional<Containers::Array<char>> data = doConvertToData(imageLevels);
/* No deleter checks as it doesn't matter here */ /* No deleter checks as it doesn't matter here */
@ -1278,6 +1278,13 @@ bool AbstractImageConverter::doConvertToFile(const Containers::ArrayView<const C
} }
Debug& operator<<(Debug& debug, const ImageConverterFeature value) { Debug& operator<<(Debug& debug, const ImageConverterFeature value) {
#ifdef MAGNUM_BUILD_DEPRECATED
/* If printing a deprecated flag combination, make it look like the enum
set */
if((value & ImageConverterFeature::Levels) && (value & ~ImageConverterFeature::Levels))
return debug << (value & ~ImageConverterFeature::Levels) << Debug::nospace << "|Trade::ImageConverterFeature::Levels";
#endif
debug << "Trade::ImageConverterFeature" << Debug::nospace; debug << "Trade::ImageConverterFeature" << Debug::nospace;
switch(value) { switch(value) {
@ -1301,20 +1308,29 @@ Debug& operator<<(Debug& debug, const ImageConverterFeature value) {
_c(ConvertCompressed1DToData) _c(ConvertCompressed1DToData)
_c(ConvertCompressed2DToData) _c(ConvertCompressed2DToData)
_c(ConvertCompressed3DToData) _c(ConvertCompressed3DToData)
_c(ConvertLevels1DToFile) _c(Levels)
_c(ConvertLevels2DToFile)
_c(ConvertLevels3DToFile)
_c(ConvertCompressedLevels1DToFile)
_c(ConvertCompressedLevels2DToFile)
_c(ConvertCompressedLevels3DToFile)
_c(ConvertLevels1DToData)
_c(ConvertLevels2DToData)
_c(ConvertLevels3DToData)
_c(ConvertCompressedLevels1DToData)
_c(ConvertCompressedLevels2DToData)
_c(ConvertCompressedLevels3DToData)
#undef _c #undef _c
/* LCOV_EXCL_STOP */ /* LCOV_EXCL_STOP */
#ifdef MAGNUM_BUILD_DEPRECATED
/* LCOV_EXCL_START */
CORRADE_IGNORE_DEPRECATED_PUSH
case ImageConverterFeature::ConvertLevels1DToData:
case ImageConverterFeature::ConvertLevels2DToData:
case ImageConverterFeature::ConvertLevels3DToData:
case ImageConverterFeature::ConvertCompressedLevels1DToData:
case ImageConverterFeature::ConvertCompressedLevels2DToData:
case ImageConverterFeature::ConvertCompressedLevels3DToData:
case ImageConverterFeature::ConvertLevels1DToFile:
case ImageConverterFeature::ConvertLevels2DToFile:
case ImageConverterFeature::ConvertLevels3DToFile:
case ImageConverterFeature::ConvertCompressedLevels1DToFile:
case ImageConverterFeature::ConvertCompressedLevels2DToFile:
case ImageConverterFeature::ConvertCompressedLevels3DToFile:
CORRADE_INTERNAL_ASSERT_UNREACHABLE();
CORRADE_IGNORE_DEPRECATED_POP
/* LCOV_EXCL_STOP */
#endif
} }
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(UnsignedInt(value)) << Debug::nospace << ")"; return debug << "(" << Debug::nospace << reinterpret_cast<void*>(UnsignedInt(value)) << Debug::nospace << ")";
@ -1328,22 +1344,6 @@ Debug& operator<<(Debug& debug, const ImageConverterFeatures value) {
ImageConverterFeature::ConvertCompressed1D, ImageConverterFeature::ConvertCompressed1D,
ImageConverterFeature::ConvertCompressed2D, ImageConverterFeature::ConvertCompressed2D,
ImageConverterFeature::ConvertCompressed3D, ImageConverterFeature::ConvertCompressed3D,
ImageConverterFeature::ConvertLevels1DToData,
ImageConverterFeature::ConvertLevels2DToData,
ImageConverterFeature::ConvertLevels3DToData,
ImageConverterFeature::ConvertCompressedLevels1DToData,
ImageConverterFeature::ConvertCompressedLevels2DToData,
ImageConverterFeature::ConvertCompressedLevels3DToData,
/* These 6 are implied by Convert[Compressed]LevelsToData, so have to
be after */
ImageConverterFeature::ConvertLevels1DToFile,
ImageConverterFeature::ConvertLevels2DToFile,
ImageConverterFeature::ConvertLevels3DToFile,
ImageConverterFeature::ConvertCompressedLevels1DToFile,
ImageConverterFeature::ConvertCompressedLevels2DToFile,
ImageConverterFeature::ConvertCompressedLevels3DToFile,
/* These 12 are implied by Convert[Compressed]LevelsTo{File,Data}, so
have to be after */
ImageConverterFeature::Convert1DToData, ImageConverterFeature::Convert1DToData,
ImageConverterFeature::Convert2DToData, ImageConverterFeature::Convert2DToData,
ImageConverterFeature::Convert3DToData, ImageConverterFeature::Convert3DToData,
@ -1357,7 +1357,8 @@ Debug& operator<<(Debug& debug, const ImageConverterFeatures value) {
ImageConverterFeature::Convert3DToFile, ImageConverterFeature::Convert3DToFile,
ImageConverterFeature::ConvertCompressed1DToFile, ImageConverterFeature::ConvertCompressed1DToFile,
ImageConverterFeature::ConvertCompressed2DToFile, ImageConverterFeature::ConvertCompressed2DToFile,
ImageConverterFeature::ConvertCompressed3DToFile}); ImageConverterFeature::ConvertCompressed3DToFile,
ImageConverterFeature::Levels});
} }
Debug& operator<<(Debug& debug, const ImageConverterFlag value) { Debug& operator<<(Debug& debug, const ImageConverterFlag value) {

525
src/Magnum/Trade/AbstractImageConverter.h
Unescape View File

@ -242,112 +242,126 @@ enum class ImageConverterFeature: UnsignedInt {
ConvertCompressed3DToData = ConvertCompressed3DToFile|(1 << 13), ConvertCompressed3DToData = ConvertCompressed3DToFile|(1 << 13),
/** /**
* Convert a set of 1D image levels to a file with * Convert multiple image levels with
* @ref AbstractImageConverter::convertToFile(Containers::ArrayView<const ImageView1D>, Containers::StringView). * @ref AbstractImageConverter::convertToFile(Containers::ArrayView<const ImageView1D>, Containers::StringView) /
* Implies @ref ImageConverterFeature::Convert1DToFile. * @ref AbstractImageConverter::convertToFile(Containers::ArrayView<const CompressedImageView1D>, Containers::StringView)
* if @ref ImageConverterFeature::Convert1DToFile /
* @relativeref{ImageConverterFeature,ConvertCompressed1DToFile} is also
* supported; with
* @ref AbstractImageConverter::convertToFile(Containers::ArrayView<const ImageView2D>, Containers::StringView) /
* @ref AbstractImageConverter::convertToFile(Containers::ArrayView<const CompressedImageView2D>, Containers::StringView)
* if @ref ImageConverterFeature::Convert2DToFile /
* @relativeref{ImageConverterFeature,ConvertCompressed2DToFile} is also
* supported; with
* @ref AbstractImageConverter::convertToFile(Containers::ArrayView<const ImageView3D>, Containers::StringView) /
* @ref AbstractImageConverter::convertToFile(Containers::ArrayView<const CompressedImageView3D>, Containers::StringView)
* if @ref ImageConverterFeature::Convert3DToFile /
* @relativeref{ImageConverterFeature,ConvertCompressed3DToFile} is also
* supported; with
* @ref AbstractImageConverter::convertToData(Containers::ArrayView<const ImageView1D>) /
* @ref AbstractImageConverter::convertToData(Containers::ArrayView<const CompressedImageView1D>)
* if @ref ImageConverterFeature::Convert1DToData /
* @relativeref{ImageConverterFeature,ConvertCompressed1DToData} is also
* supported; with
* @ref AbstractImageConverter::convertToData(Containers::ArrayView<const ImageView2D>) /
* @ref AbstractImageConverter::convertToData(Containers::ArrayView<const CompressedImageView2D>)
* if @ref ImageConverterFeature::Convert2DToData /
* @relativeref{ImageConverterFeature,ConvertCompressed2DToData} is also
* supported; with
* @ref AbstractImageConverter::convertToData(Containers::ArrayView<const ImageView3D>) /
* @ref AbstractImageConverter::convertToData(Containers::ArrayView<const CompressedImageView3D>)
* if @ref ImageConverterFeature::Convert3DToData /
* @relativeref{ImageConverterFeature,ConvertCompressed3DToData} is also
* supported.
* @m_since_latest * @m_since_latest
*/ */
ConvertLevels1DToFile = Convert1DToFile|(1 << 14), Levels = 1 << 14,
#ifdef MAGNUM_BUILD_DEPRECATED
/** /**
* Convert a set of 2D image levels to a file with * @m_deprecated_since_latest Use
* @ref AbstractImageConverter::convertToFile(Containers::ArrayView<const ImageView2D>, Containers::StringView). * @ref ImageConverterFeature::Convert1DToFile together with
* Implies @ref ImageConverterFeature::Convert2DToFile. * @relativeref{ImageConverterFeature,Levels} instead.
* @m_since_latest
*/ */
ConvertLevels2DToFile = Convert2DToFile|(1 << 14), ConvertLevels1DToFile CORRADE_DEPRECATED_ENUM("use Convert1DToFile together with Levels instead") = Convert1DToFile|Levels,
/** /**
* Convert a set of 3D image levels to a file with * @m_deprecated_since_latest Use
* @ref AbstractImageConverter::convertToFile(Containers::ArrayView<const ImageView1D>, Containers::StringView). * @ref ImageConverterFeature::Convert2DToFile together with
* Implies @ref ImageConverterFeature::Convert3DToFile. * @relativeref{ImageConverterFeature,Levels} instead.
* @m_since_latest
*/ */
ConvertLevels3DToFile = Convert3DToFile|(1 << 14), ConvertLevels2DToFile CORRADE_DEPRECATED_ENUM("use Convert2DToFile together with Levels instead") = Convert2DToFile|Levels,
/** /**
* Convert a set of compressed 1D image levels to a file with * @m_deprecated_since_latest Use
* @ref AbstractImageConverter::convertToFile(Containers::ArrayView<const CompressedImageView1D>, Containers::StringView). * @ref ImageConverterFeature::Convert3DToFile together with
* Implies @ref ImageConverterFeature::ConvertCompressed1DToFile. * @relativeref{ImageConverterFeature,Levels} instead.
* @m_since_latest
*/ */
ConvertCompressedLevels1DToFile = ConvertCompressed1DToFile|(1 << 14), ConvertLevels3DToFile CORRADE_DEPRECATED_ENUM("use Convert3DToFile together with Levels instead") = Convert3DToFile|Levels,
/** /**
* Convert a set of compressed 2D image levels to a file with * @m_deprecated_since_latest Use
* @ref AbstractImageConverter::convertToFile(Containers::ArrayView<const CompressedImageView2D>, Containers::StringView). * @ref ImageConverterFeature::ConvertCompressed1DToFile together with
* Implies @ref ImageConverterFeature::ConvertCompressed2DToFile. * @relativeref{ImageConverterFeature,Levels} instead.
* @m_since_latest
*/ */
ConvertCompressedLevels2DToFile = ConvertCompressed2DToFile|(1 << 14), ConvertCompressedLevels1DToFile CORRADE_DEPRECATED_ENUM("use ConvertCompressed1DToFile together with Levels instead") = ConvertCompressed1DToFile|Levels,
/** /**
* Convert a set of compressed 3D image levels to a file with * @m_deprecated_since_latest Use
* @ref AbstractImageConverter::convertToFile(Containers::ArrayView<const CompressedImageView3D>, Containers::StringView). * @ref ImageConverterFeature::ConvertCompressed2DToFile together with
* Implies @ref ImageConverterFeature::ConvertCompressed3DToFile. * @relativeref{ImageConverterFeature,Levels} instead.
* @m_since_latest
*/ */
ConvertCompressedLevels3DToFile = ConvertCompressed3DToFile|(1 << 14), ConvertCompressedLevels2DToFile CORRADE_DEPRECATED_ENUM("use ConvertCompressed2DToFile together with Levels instead") = ConvertCompressed2DToFile|Levels,
/** /**
* Convert a set of 1D image levels to raw data with * @m_deprecated_since_latest Use
* @ref AbstractImageConverter::convertToData(Containers::ArrayView<const ImageView1D>). * @ref ImageConverterFeature::ConvertCompressed3DToFile together with
* Implies @ref ImageConverterFeature::ConvertLevels1DToFile and * @relativeref{ImageConverterFeature,Levels} instead.
* @relativeref{ImageConverterFeature,Convert1DToData}, which implies also
* @relativeref{ImageConverterFeature,Convert1DToFile}.
* @m_since_latest
*/ */
ConvertLevels1DToData = ConvertLevels1DToFile|Convert1DToData|(1 << 14), ConvertCompressedLevels3DToFile CORRADE_DEPRECATED_ENUM("use ConvertCompressed3DToFile together with Levels instead") = ConvertCompressed3DToFile|Levels,
/** /**
* Convert a set of 2D image levels to raw data with * @m_deprecated_since_latest Use
* @ref AbstractImageConverter::convertToData(Containers::ArrayView<const ImageView2D>). * @ref ImageConverterFeature::Convert1DToData together with
* Implies @ref ImageConverterFeature::ConvertLevels2DToFile and * @relativeref{ImageConverterFeature,Levels} instead.
* @relativeref{ImageConverterFeature,Convert2DToData}, which implies also
* @relativeref{ImageConverterFeature,Convert2DToFile}.
* @m_since_latest
*/ */
ConvertLevels2DToData = ConvertLevels2DToFile|Convert2DToData|(1 << 14), ConvertLevels1DToData CORRADE_DEPRECATED_ENUM("use Convert1DToData together with Levels instead") = Convert1DToData|Levels,
/** /**
* Convert a set of 3D image levels to raw data with * @m_deprecated_since_latest Use
* @ref AbstractImageConverter::convertToData(Containers::ArrayView<const ImageView3D>). * @ref ImageConverterFeature::Convert2DToData together with
* Implies @ref ImageConverterFeature::ConvertLevels3DToFile and * @relativeref{ImageConverterFeature,Levels} instead.
* @relativeref{ImageConverterFeature,Convert3DToData}, which implies also
* @relativeref{ImageConverterFeature,Convert3DToFile}.
* @m_since_latest
*/ */
ConvertLevels3DToData = ConvertLevels3DToFile|Convert3DToData|(1 << 14), ConvertLevels2DToData CORRADE_DEPRECATED_ENUM("use Convert2DToData together with Levels instead") = Convert2DToData|Levels,
/** /**
* Convert a set of compressed 1D image levels to raw data with * @m_deprecated_since_latest Use
* @ref AbstractImageConverter::convertToData(Containers::ArrayView<const CompressedImageView1D>). * @ref ImageConverterFeature::Convert3DToData together with
* Implies @ref ImageConverterFeature::ConvertCompressedLevels1DToFile and * @relativeref{ImageConverterFeature,Levels} instead.
* @relativeref{ImageConverterFeature,ConvertCompressed1DToData}, which
* implies also @relativeref{ImageConverterFeature,ConvertCompressed1DToFile}.
* @m_since_latest
*/ */
ConvertCompressedLevels1DToData = ConvertCompressedLevels1DToFile|ConvertCompressed1DToData|(1 << 14), ConvertLevels3DToData CORRADE_DEPRECATED_ENUM("use Convert3DToData together with Levels instead") = Convert3DToData|Levels,
/** /**
* Convert a set of compressed 2D image levels to raw data with * @m_deprecated_since_latest Use
* @ref AbstractImageConverter::convertToData(Containers::ArrayView<const CompressedImageView2D>). * @ref ImageConverterFeature::ConvertCompressed1DToData together with
* Implies @ref ImageConverterFeature::ConvertCompressedLevels2DToFile and * @relativeref{ImageConverterFeature,Levels} instead.
* @relativeref{ImageConverterFeature,ConvertCompressed2DToData}, which
* implies also @relativeref{ImageConverterFeature,ConvertCompressed2DToFile}.
* @m_since_latest
*/ */
ConvertCompressedLevels2DToData = ConvertCompressedLevels2DToFile|ConvertCompressed2DToData|(1 << 14), ConvertCompressedLevels1DToData CORRADE_DEPRECATED_ENUM("use ConvertCompressed1DToData together with Levels instead") = ConvertCompressed1DToData|Levels,
/** /**
* Convert a set of compressed 3D image levels to raw data with * @m_deprecated_since_latest Use
* @ref AbstractImageConverter::convertToData(Containers::ArrayView<const CompressedImageView3D>). * @ref ImageConverterFeature::ConvertCompressed2DToData together with
* Implies @ref ImageConverterFeature::ConvertCompressedLevels3DToFile and * @relativeref{ImageConverterFeature,Levels} instead.
* @relativeref{ImageConverterFeature,ConvertCompressed3DToData}, which */
* implies also @relativeref{ImageConverterFeature,ConvertCompressed3DToFile}. ConvertCompressedLevels2DToData CORRADE_DEPRECATED_ENUM("use ConvertCompressed2DToData together with Levels instead") = ConvertCompressed2DToData|Levels,
* @m_since_latest
/**
* @m_deprecated_since_latest Use
* @ref ImageConverterFeature::ConvertCompressed3DToData together with
* @relativeref{ImageConverterFeature,Levels} instead.
*/ */
ConvertCompressedLevels3DToData = ConvertCompressedLevels3DToFile|ConvertCompressed3DToData|(1 << 14) ConvertCompressedLevels3DToData CORRADE_DEPRECATED_ENUM("use ConvertCompressed3DToData together with Levels instead") = ConvertCompressed3DToData|Levels
#endif
}; };
/** /**
@ -454,20 +468,9 @@ commonly advertising support for a subset of them via @ref features():
- Saving a set of (compressed) 1D/2D/3D image levels to a file / data using - Saving a set of (compressed) 1D/2D/3D image levels to a file / data using
@ref convertToFile() / @ref convertToData(). Common use case is to save @ref convertToFile() / @ref convertToData(). Common use case is to save
already pregenerated levels instead of having to create them during load. already pregenerated levels instead of having to create them during load.
Advertised with @ref ImageConverterFeature::ConvertLevels1DToFile / Advertised with @ref ImageConverterFeature::Levels in addition to the
@relativeref{ImageConverterFeature,ConvertLevels2DToFile} / single-image feature. Note that if a plugin advertises multi-level support,
@relativeref{ImageConverterFeature,ConvertLevels3DToFile} or it's also capable of saving single images --- in that case the single-image
@ref ImageConverterFeature::ConvertLevels1DToData /
@relativeref{ImageConverterFeature,ConvertLevels2DToData} /
@relativeref{ImageConverterFeature,ConvertLevels3DToData} and
@ref ImageConverterFeature::ConvertCompressedLevels1DToFile /
@relativeref{ImageConverterFeature,ConvertCompressedLevels2DToFile} /
@relativeref{ImageConverterFeature,ConvertCompressedLevels3DToFile} or
@ref ImageConverterFeature::ConvertCompressedLevels1DToData
@relativeref{ImageConverterFeature,ConvertCompressedLevels2DToData} /
@relativeref{ImageConverterFeature,ConvertCompressedLevels3DToData} for
compressed input images. Note that if a plugin advertises those, it's also
capable of saving single images --- in that case the single-image
@ref convertToFile() / @ref convertToData() delegates to the multi-level @ref convertToFile() / @ref convertToData() delegates to the multi-level
variant with just a single image. variant with just a single image.
- Performing an operation on the image data itself using @ref convert(), from - Performing an operation on the image data itself using @ref convert(), from
@ -576,39 +579,9 @@ checked by the implementation:
if @ref ImageConverterFeature::Convert2DToData "ImageConverterFeature::Convert*ToData" if @ref ImageConverterFeature::Convert2DToData "ImageConverterFeature::Convert*ToData"
or @ref ImageConverterFeature::Convert2DToFile "Convert*ToFile" is or @ref ImageConverterFeature::Convert2DToFile "Convert*ToFile" is
supported supported
- The @ref doConvert(const ImageView2D&) function is called only if - The @ref doConvert(), @ref doConvertToData() and @ref doConvertToFile()
@ref ImageConverterFeature::Convert2D is supported; equivalently for the functions are called only if a corresponding @ref ImageConverterFeature is
1D and 3D case. supported
- The @ref doConvert(const CompressedImageView2D&) function is called only if
@ref ImageConverterFeature::ConvertCompressed2D is supported; equivalently
for the 1D and 3D case.
- The @ref doConvertToData(const ImageView2D&) function is called only if
@ref ImageConverterFeature::Convert2DToData is supported; equivalently
for the 1D and 3D case.
- The @ref doConvertToData(Containers::ArrayView<const ImageView2D>) function
is called only if @ref ImageConverterFeature::ConvertLevels2DToData is
supported; equivalently for the 1D and 3D case.
- The @ref doConvertToData(const CompressedImageView2D&) function is called
only if @ref ImageConverterFeature::ConvertCompressed2DToData is supported;
equivalently for the 1D and 3D case.
- The @ref doConvertToData(Containers::ArrayView<const CompressedImageView2D>)
function is called only if
@ref ImageConverterFeature::ConvertCompressedLevels2DToData is supported;
equivalently for the 1D and 3D case.
- The @ref doConvertToFile(const ImageView2D&, Containers::StringView)
function is called only if @ref ImageConverterFeature::Convert2DToFile is
supported; equivalently for the 1D and 3D case.
- The @ref doConvertToFile(Containers::ArrayView<const ImageView2D>, Containers::StringView)
function is called only if @ref ImageConverterFeature::ConvertLevels2DToFile
is supported; equivalently for the 1D and 3D case.
- The @ref doConvertToFile(const CompressedImageView2D&, Containers::StringView)
function is called only if
@ref ImageConverterFeature::ConvertCompressed2DToFile is supported;
equivalently for the 1D and 3D case.
- The @ref doConvertToFile(Containers::ArrayView<const CompressedImageView2D>, Containers::StringView)
function is called only if
@ref ImageConverterFeature::ConvertCompressedLevels2DToFile is supported;
equivalently for the 1D and 3D case.
- All @ref doConvertToData() and @ref doConvertToFile() functions taking a - All @ref doConvertToData() and @ref doConvertToFile() functions taking a
single (compressed) image are called only if the image has a non-zero size single (compressed) image are called only if the image has a non-zero size
in all dimensions and the view is not @cpp nullptr @ce. Note that this does in all dimensions and the view is not @cpp nullptr @ce. Note that this does
@ -918,10 +891,9 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
* @brief Convert a 1D image to a raw data * @brief Convert a 1D image to a raw data
* @m_since_latest * @m_since_latest
* *
* Available only if @ref ImageConverterFeature::Convert1DToData or * Available only if @ref ImageConverterFeature::Convert1DToData is
* @ref ImageConverterFeature::ConvertLevels1DToData is supported. The * supported. The image view is expected to not be @cpp nullptr @ce and
* image view is expected to not be @cpp nullptr @ce and to have a * to have a non-zero size. On failure prints a message to
* non-zero size. On failure prints a message to
* @relativeref{Magnum,Error} and returns @ref Containers::NullOpt. * @relativeref{Magnum,Error} and returns @ref Containers::NullOpt.
* @see @ref features(), @ref convertToData(const CompressedImageView1D&), * @see @ref features(), @ref convertToData(const CompressedImageView1D&),
* @ref convertToData(const ImageData1D&), @ref convert(), * @ref convertToData(const ImageData1D&), @ref convert(),
@ -938,11 +910,11 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
* @brief Convert a 2D image to a raw data * @brief Convert a 2D image to a raw data
* @m_since_latest * @m_since_latest
* *
* Available only if @ref ImageConverterFeature::Convert2DToData or * Available only if @ref ImageConverterFeature::Convert2DToData is
* @ref ImageConverterFeature::ConvertLevels2DToData is supported. The * supported. The image view is expected to not be @cpp nullptr @ce and
* image view is expected to not be @cpp nullptr @ce and to have a * to have a non-zero size in all dimensions. On failure prints a
* non-zero size in all dimensions. On failure prints a message to * message to @relativeref{Magnum,Error} and returns
* @relativeref{Magnum,Error} and returns @ref Containers::NullOpt. * @ref Containers::NullOpt.
* @see @ref features(), @ref convertToData(const CompressedImageView2D&), * @see @ref features(), @ref convertToData(const CompressedImageView2D&),
* @ref convertToData(const ImageData2D&), @ref convert(), * @ref convertToData(const ImageData2D&), @ref convert(),
* @ref convertToFile() * @ref convertToFile()
@ -967,11 +939,11 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
* @brief Convert a 3D image to a raw data * @brief Convert a 3D image to a raw data
* @m_since_latest * @m_since_latest
* *
* Available only if @ref ImageConverterFeature::Convert3DToData or * Available only if @ref ImageConverterFeature::Convert3DToData is
* @ref ImageConverterFeature::ConvertLevels3DToData is supported. The * supported. The image view is expected to not be @cpp nullptr @ce and
* image view is expected to not be @cpp nullptr @ce and to have a * to have a non-zero size in all dimensions. On failure prints a
* non-zero size in all dimensions. On failure prints a message to * message to @relativeref{Magnum,Error} and returns
* @relativeref{Magnum,Error} and returns @ref Containers::NullOpt. * @ref Containers::NullOpt.
* @see @ref features(), @ref convertToData(const CompressedImageView3D&), * @see @ref features(), @ref convertToData(const CompressedImageView3D&),
* @ref convertToData(const ImageData3D&), @ref convert(), * @ref convertToData(const ImageData3D&), @ref convert(),
* @ref convertToFile() * @ref convertToFile()
@ -988,9 +960,8 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
* @m_since_latest * @m_since_latest
* *
* Available only if @ref ImageConverterFeature::ConvertCompressed1DToData * Available only if @ref ImageConverterFeature::ConvertCompressed1DToData
* or @ref ImageConverterFeature::ConvertCompressedLevels1DToData is * is supported. The image view is expected to not be @cpp nullptr @ce
* supported. The image view is expected to not be @cpp nullptr @ce and * and to have a non-zero size. On failure prints a message to
* to have a non-zero size. On failure prints a message to
* @relativeref{Magnum,Error} and returns @ref Containers::NullOpt. * @relativeref{Magnum,Error} and returns @ref Containers::NullOpt.
* @see @ref features(), @ref convertToData(const ImageView1D&), * @see @ref features(), @ref convertToData(const ImageView1D&),
* @ref convertToData(const ImageData1D&), @ref convert(), * @ref convertToData(const ImageData1D&), @ref convert(),
@ -1008,9 +979,8 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
* @m_since_latest * @m_since_latest
* *
* Available only if @ref ImageConverterFeature::ConvertCompressed2DToData * Available only if @ref ImageConverterFeature::ConvertCompressed2DToData
* or @ref ImageConverterFeature::ConvertCompressedLevels2DToData is * is supported. The image view is expected to not be @cpp nullptr @ce
* supported. The image view is expected to not be @cpp nullptr @ce and * and to have a non-zero size in all dimensions. On failure prints a
* to have a non-zero size in all dimensions. On failure prints a
* message to @relativeref{Magnum,Error} and returns * message to @relativeref{Magnum,Error} and returns
* @ref Containers::NullOpt. * @ref Containers::NullOpt.
* @see @ref features(), @ref convertToData(const ImageView2D&), * @see @ref features(), @ref convertToData(const ImageView2D&),
@ -1038,9 +1008,8 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
* @m_since_latest * @m_since_latest
* *
* Available only if @ref ImageConverterFeature::ConvertCompressed3DToData * Available only if @ref ImageConverterFeature::ConvertCompressed3DToData
* or @ref ImageConverterFeature::ConvertCompressedLevels3DToData is * is supported. The image view is expected to not be @cpp nullptr @ce
* supported. The image view is expected to not be @cpp nullptr @ce and * and to have a non-zero size in all dimensions. On failure prints a
* to have a non-zero size in all dimensions. On failure prints a
* message to @relativeref{Magnum,Error} and returns * message to @relativeref{Magnum,Error} and returns
* @ref Containers::NullOpt. * @ref Containers::NullOpt.
* @see @ref features(), @ref convertToData(const ImageView3D&), * @see @ref features(), @ref convertToData(const ImageView3D&),
@ -1118,14 +1087,15 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
* @brief Convert a set of 1D image levels to a raw data * @brief Convert a set of 1D image levels to a raw data
* @m_since_latest * @m_since_latest
* *
* Available only if @ref ImageConverterFeature::ConvertLevels1DToData * Available only if @ref ImageConverterFeature::Levels together with
* is supported. The function expects at least one image to be passed, * @relativeref{ImageConverterFeature,Convert1DToData} is supported.
* with each view expected to not be @cpp nullptr @ce, to have a * The function expects at least one image to be passed, with each view
* non-zero size, and all of them sharing the same pixel format and * expected to not be @cpp nullptr @ce, to have a non-zero size, and
* layout flags. Note that certain converters may impose additional * all of them sharing the same pixel format and layout flags. Note
* size and order restrictions on the images, see documentation of a * that certain converters may impose additional size and order
* particular plugin for more information. On failure prints a message * restrictions on the images, see documentation of a particular plugin
* to @relativeref{Magnum,Error} and returns @ref Containers::NullOpt. * for more information. On failure prints a message to
* @relativeref{Magnum,Error} and returns @ref Containers::NullOpt.
* @see @ref features(), @ref convertToData(Containers::ArrayView<const CompressedImageView1D>), * @see @ref features(), @ref convertToData(Containers::ArrayView<const CompressedImageView1D>),
* @ref convert(), @ref convertToFile() * @ref convert(), @ref convertToFile()
*/ */
@ -1150,15 +1120,15 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
* @brief Convert a set of 2D image levels to a raw data * @brief Convert a set of 2D image levels to a raw data
* @m_since_latest * @m_since_latest
* *
* Available only if @ref ImageConverterFeature::ConvertLevels2DToData * Available only if @ref ImageConverterFeature::Levels together with
* is supported. The function expects at least one image to be passed, * @relativeref{ImageConverterFeature,Convert2DToData} is supported.
* with each view expected to not be @cpp nullptr @ce, to have a * The function expects at least one image to be passed, with each view
* non-zero size in all dimensions, and all views sharing the same * expected to not be @cpp nullptr @ce, to have a non-zero size in all
* pixel format and layout flags. Note that certain converters may * dimensions, and all views sharing the same pixel format and layout
* impose additional size and order restrictions on the images, see * flags. Note that certain converters may impose additional size and
* documentation of a particular plugin for more information. On * order restrictions on the images, see documentation of a particular
* failure prints a message to @relativeref{Magnum,Error} and returns * plugin for more information. On failure prints a message to
* @ref Containers::NullOpt. * @relativeref{Magnum,Error} and returns @ref Containers::NullOpt.
* @see @ref features(), @ref convertToData(Containers::ArrayView<const CompressedImageView2D>), * @see @ref features(), @ref convertToData(Containers::ArrayView<const CompressedImageView2D>),
* @ref convert(), @ref convertToFile() * @ref convert(), @ref convertToFile()
*/ */
@ -1183,15 +1153,15 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
* @brief Convert a set of 3D image levels to a raw data * @brief Convert a set of 3D image levels to a raw data
* @m_since_latest * @m_since_latest
* *
* Available only if @ref ImageConverterFeature::ConvertLevels3DToData * Available only if @ref ImageConverterFeature::Levels together with
* is supported. The function expects at least one image to be passed, * @relativeref{ImageConverterFeature,Convert3DToData} is supported.
* with each view expected to not be @cpp nullptr @ce, to have a * The function expects at least one image to be passed, with each view
* non-zero size in all dimensions, and all views sharing the same * expected to not be @cpp nullptr @ce, to have a non-zero size in all
* pixel format and layout flags. Note that certain converters may * dimensions, and all views sharing the same pixel format and layout
* impose additional size and order restrictions on the images, see * flags. Note that certain converters may impose additional size and
* documentation of a particular plugin for more information. On * order restrictions on the images, see documentation of a particular
* failure prints a message to @relativeref{Magnum,Error} and returns * plugin for more information. On failure prints a message to
* @ref Containers::NullOpt. * @relativeref{Magnum,Error} and returns @ref Containers::NullOpt.
* @see @ref features(), @ref convertToData(Containers::ArrayView<const CompressedImageView3D>), * @see @ref features(), @ref convertToData(Containers::ArrayView<const CompressedImageView3D>),
* @ref convert(), @ref convertToFile() * @ref convert(), @ref convertToFile()
*/ */
@ -1216,8 +1186,9 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
* @brief Convert a set of compressed 1D image levels to a raw data * @brief Convert a set of compressed 1D image levels to a raw data
* @m_since_latest * @m_since_latest
* *
* Available only if @ref ImageConverterFeature::ConvertCompressedLevels1DToData * Available only if @ref ImageConverterFeature::Levels together with
* is supported. The function expects at least one image to be passed, * @relativeref{ImageConverterFeature,ConvertCompressed1DToData} is
* supported. The function expects at least one image to be passed,
* with each view expected to not be @cpp nullptr @ce, to have a * with each view expected to not be @cpp nullptr @ce, to have a
* non-zero size, and all views sharing the same pixel format and * non-zero size, and all views sharing the same pixel format and
* layout flags. Note that certain converters may impose additional * layout flags. Note that certain converters may impose additional
@ -1248,8 +1219,9 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
* @brief Convert a set of compressed 2D image levels to a raw data * @brief Convert a set of compressed 2D image levels to a raw data
* @m_since_latest * @m_since_latest
* *
* Available only if @ref ImageConverterFeature::ConvertCompressedLevels2DToData * Available only if @ref ImageConverterFeature::Levels together with
* is supported. The function expects at least one image to be passed, * @relativeref{ImageConverterFeature,ConvertCompressed2DToData} is
* supported. The function expects at least one image to be passed,
* with each view expected to not be @cpp nullptr @ce, to have a * with each view expected to not be @cpp nullptr @ce, to have a
* non-zero size in all dimensions, and all views sharing the same * non-zero size in all dimensions, and all views sharing the same
* pixel format and layout flags. Note that certain converters may * pixel format and layout flags. Note that certain converters may
@ -1281,8 +1253,8 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
* @brief Convert a set of compressed 3D image levels to a raw data * @brief Convert a set of compressed 3D image levels to a raw data
* @m_since_latest * @m_since_latest
* *
* Available only if @ref ImageConverterFeature::ConvertCompressedLevels3DToData * Available only if @ref ImageConverterFeature::Levels together with
* is supported. The function expects at least one image to be passed, * @relativeref{ImageConverterFeature,ConvertCompressed3DToData} is supported. The function expects at least one image to be passed,
* with each view expected to not be @cpp nullptr @ce, to have a * with each view expected to not be @cpp nullptr @ce, to have a
* non-zero size in all dimensions, and all views sharing the same * non-zero size in all dimensions, and all views sharing the same
* pixel format and layout flags. Note that certain converters may * pixel format and layout flags. Note that certain converters may
@ -1314,11 +1286,10 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
* @brief Convert a 1D image to a file * @brief Convert a 1D image to a file
* @m_since_latest * @m_since_latest
* *
* Available only if @ref ImageConverterFeature::Convert1DToFile or * Available only if @ref ImageConverterFeature::Convert1DToFile is
* @ref ImageConverterFeature::Convert1DToData is supported. The image * supported. The image view is expected to not be @cpp nullptr @ce and
* view is expected to not be @cpp nullptr @ce and to have a non-zero * to have a non-zero size. On failure prints a message to
* size. On failure prints a message to @relativeref{Magnum,Error} and * @relativeref{Magnum,Error} and returns @cpp false @ce.
* returns @cpp false @ce.
* @see @ref features(), @ref convertToFile(const CompressedImageView1D&, Containers::StringView), * @see @ref features(), @ref convertToFile(const CompressedImageView1D&, Containers::StringView),
* @ref convertToFile(const ImageData1D&, Containers::StringView), * @ref convertToFile(const ImageData1D&, Containers::StringView),
* @ref convert(), @ref convertToData() * @ref convert(), @ref convertToData()
@ -1329,11 +1300,10 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
* @brief Convert a 2D image to a file * @brief Convert a 2D image to a file
* @m_since_latest * @m_since_latest
* *
* Available only if @ref ImageConverterFeature::Convert2DToFile or * Available only if @ref ImageConverterFeature::Convert2DToFile is
* @ref ImageConverterFeature::Convert2DToData is supported. The image * supported. The image view is expected to not be @cpp nullptr @ce and
* view is expected to not be @cpp nullptr @ce and to have a non-zero * to have a non-zero size in all dimensions. Returns @cpp true @ce on
* size in all dimensions. Returns @cpp true @ce on success, * success, @cpp false @ce otherwise.
* @cpp false @ce otherwise.
* @see @ref features(), @ref convertToFile(const CompressedImageView2D&, Containers::StringView), * @see @ref features(), @ref convertToFile(const CompressedImageView2D&, Containers::StringView),
* @ref convertToFile(const ImageData2D&, Containers::StringView), * @ref convertToFile(const ImageData2D&, Containers::StringView),
* @ref convert(), @ref convertToData() * @ref convert(), @ref convertToData()
@ -1354,11 +1324,10 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
* @brief Convert a 3D image to a file * @brief Convert a 3D image to a file
* @m_since_latest * @m_since_latest
* *
* Available only if @ref ImageConverterFeature::Convert3DToFile or * Available only if @ref ImageConverterFeature::Convert3DToFile is
* @ref ImageConverterFeature::Convert3DToData is supported. The image * supported. The image view is expected to not be @cpp nullptr @ce and
* view is expected to not be @cpp nullptr @ce and to have a non-zero * to have a non-zero size. On failure prints a message to
* size. On failure prints a message to @relativeref{Magnum,Error} and * @relativeref{Magnum,Error} and returns @cpp false @ce.
* returns @cpp false @ce.
* @see @ref features(), @ref convertToFile(const CompressedImageView3D&, Containers::StringView), * @see @ref features(), @ref convertToFile(const CompressedImageView3D&, Containers::StringView),
* @ref convertToFile(const ImageData3D&, Containers::StringView), * @ref convertToFile(const ImageData3D&, Containers::StringView),
* @ref convert(), @ref convertToData() * @ref convert(), @ref convertToData()
@ -1370,9 +1339,8 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
* @m_since_latest * @m_since_latest
* *
* Available only if @ref ImageConverterFeature::ConvertCompressed1DToFile * Available only if @ref ImageConverterFeature::ConvertCompressed1DToFile
* or @ref ImageConverterFeature::ConvertCompressed1DToData is * is supported. The image view is expected to not be @cpp nullptr @ce
* supported. The image view is expected to not be @cpp nullptr @ce and * and to have a non-zero size in all dimensions. On failure prints a
* to have a non-zero size in all dimensions. On failure prints a
* message to @relativeref{Magnum,Error} and returns @cpp false @ce. * message to @relativeref{Magnum,Error} and returns @cpp false @ce.
* @see @ref features(), @ref convertToFile(const ImageView1D&, Containers::StringView), * @see @ref features(), @ref convertToFile(const ImageView1D&, Containers::StringView),
* @ref convertToFile(const ImageData1D&, Containers::StringView), * @ref convertToFile(const ImageData1D&, Containers::StringView),
@ -1385,9 +1353,8 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
* @m_since_latest * @m_since_latest
* *
* Available only if @ref ImageConverterFeature::ConvertCompressed2DToFile * Available only if @ref ImageConverterFeature::ConvertCompressed2DToFile
* or @ref ImageConverterFeature::ConvertCompressed2DToData is * is supported. The image view is expected to not be @cpp nullptr @ce
* supported. The image view is expected to not be @cpp nullptr @ce and * and to have a non-zero size in all dimensions. On failure prints a
* to have a non-zero size in all dimensions. On failure prints a
* message to @relativeref{Magnum,Error} and returns @cpp false @ce. * message to @relativeref{Magnum,Error} and returns @cpp false @ce.
* @see @ref features(), @ref convertToFile(const ImageView2D&, Containers::StringView), * @see @ref features(), @ref convertToFile(const ImageView2D&, Containers::StringView),
* @ref convertToFile(const ImageData2D&, Containers::StringView), * @ref convertToFile(const ImageData2D&, Containers::StringView),
@ -1410,9 +1377,8 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
* @m_since_latest * @m_since_latest
* *
* Available only if @ref ImageConverterFeature::ConvertCompressed3DToFile * Available only if @ref ImageConverterFeature::ConvertCompressed3DToFile
* or @ref ImageConverterFeature::ConvertCompressed3DToData is * is supported. The image view is expected to not be @cpp nullptr @ce
* supported. The image view is expected to not be @cpp nullptr @ce and * and to have a non-zero size in all dimensions. On failure prints a
* to have a non-zero size in all dimensions. On failure prints a
* message to @relativeref{Magnum,Error} and returns @cpp false @ce. * message to @relativeref{Magnum,Error} and returns @cpp false @ce.
* @see @ref features(), @ref convertToFile(const ImageView3D&, Containers::StringView), * @see @ref features(), @ref convertToFile(const ImageView3D&, Containers::StringView),
* @ref convertToFile(const ImageData3D&, Containers::StringView), * @ref convertToFile(const ImageData3D&, Containers::StringView),
@ -1482,13 +1448,14 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
* @brief Convert a set of 1D image levels to a file * @brief Convert a set of 1D image levels to a file
* @m_since_latest * @m_since_latest
* *
* Available only if @ref ImageConverterFeature::ConvertLevels1DToFile * Available only if @ref ImageConverterFeature::Levels together with
* is supported. The function expects at least one image to be passed, * @relativeref{ImageConverterFeature,Convert1DToFile} is supported.
* with each view expected to not be @cpp nullptr @ce, to have a * The function expects at least one image to be passed, with each view
* non-zero size, and all views sharing the same pixel format. Note * expected to not be @cpp nullptr @ce, to have a non-zero size, and
* that certain converters may impose additional size and order * all views sharing the same pixel format and layout flags. Note that
* restrictions on the images, see documentation of a particular plugin * certain converters may impose additional size and order restrictions
* for more information. On failure prints a message to * on the images, see documentation of a particular plugin for more
* information. On failure prints a message to
* @relativeref{Magnum,Error} and returns @cpp false @ce. * @relativeref{Magnum,Error} and returns @cpp false @ce.
* @see @ref features(), @ref convertToFile(Containers::ArrayView<const CompressedImageView1D>, Containers::StringView), * @see @ref features(), @ref convertToFile(Containers::ArrayView<const CompressedImageView1D>, Containers::StringView),
* @ref convert(), @ref convertToData() * @ref convert(), @ref convertToData()
@ -1504,15 +1471,15 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
* @brief Convert a set of 2D image levels to a file * @brief Convert a set of 2D image levels to a file
* @m_since_latest * @m_since_latest
* *
* Available only if @ref ImageConverterFeature::ConvertLevels2DToFile * Available only if @ref ImageConverterFeature::Levels together with
* is supported. The function expects at least one image to be passed, * @relativeref{ImageConverterFeature,Convert2DToFile} is supported.
* with each view expected to not be @cpp nullptr @ce, to have a * The function expects at least one image to be passed, with each view
* non-zero size in all dimensions, and all views sharing the same * expected to not be @cpp nullptr @ce, to have a non-zero size in all
* pixel format and layout flags. Note that certain converters may * dimensions, and all views sharing the same pixel format and layout
* impose additional size and order restrictions on the images, see * flags. Note that certain converters may impose additional size and
* documentation of a particular plugin for more information. On * order restrictions on the images, see documentation of a particular
* failure prints a message to @relativeref{Magnum,Error} and returns * plugin for more information. On failure prints a message to
* @cpp false @ce. * @relativeref{Magnum,Error} and returns @cpp false @ce.
* @see @ref features(), @ref convertToFile(Containers::ArrayView<const CompressedImageView2D>, Containers::StringView), * @see @ref features(), @ref convertToFile(Containers::ArrayView<const CompressedImageView2D>, Containers::StringView),
* @ref convert(), @ref convertToData() * @ref convert(), @ref convertToData()
*/ */
@ -1527,15 +1494,15 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
* @brief Convert a set of 3D image levels to a file * @brief Convert a set of 3D image levels to a file
* @m_since_latest * @m_since_latest
* *
* Available only if @ref ImageConverterFeature::ConvertLevels3DToFile * Available only if @ref ImageConverterFeature::Levels together with
* is supported. The function expects at least one image to be passed, * @relativeref{ImageConverterFeature,Convert3DToFile} is supported.
* with each view expected to not be @cpp nullptr @ce, to have a * The function expects at least one image to be passed, with each view
* non-zero size in all dimensions, and all views sharing the same * expected to not be @cpp nullptr @ce, to have a non-zero size in all
* pixel format and layout flags. Note that certain converters may * dimensions, and all views sharing the same pixel format and layout
* impose additional size and order restrictions on the images, see * flags. Note that certain converters may impose additional size and
* documentation of a particular plugin for more information. On * order restrictions on the images, see documentation of a particular
* failure prints a message to @relativeref{Magnum,Error} and returns * plugin for more information. On failure prints a message to
* @cpp false @ce. * @relativeref{Magnum,Error} and returns @cpp false @ce.
* @see @ref features(), @ref convertToFile(Containers::ArrayView<const CompressedImageView3D>, Containers::StringView), * @see @ref features(), @ref convertToFile(Containers::ArrayView<const CompressedImageView3D>, Containers::StringView),
* @ref convert(), @ref convertToData() * @ref convert(), @ref convertToData()
*/ */
@ -1550,8 +1517,9 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
* @brief Convert a set of compressed 1D image levels to a file * @brief Convert a set of compressed 1D image levels to a file
* @m_since_latest * @m_since_latest
* *
* Available only if @ref ImageConverterFeature::ConvertCompressedLevels1DToFile * Available only if @ref ImageConverterFeature::Levels together with
* is supported. The function expects at least one image to be passed, * @relativeref{ImageConverterFeature,ConvertCompressed1DToFile} is
* supported. The function expects at least one image to be passed,
* with each view expected to not be @cpp nullptr @ce, to have a * with each view expected to not be @cpp nullptr @ce, to have a
* non-zero size, and all views sharing the same pixel format and * non-zero size, and all views sharing the same pixel format and
* layout flags. Note that certain converters may impose additional * layout flags. Note that certain converters may impose additional
@ -1572,8 +1540,9 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
* @brief Convert a set of compressed 2D image levels to a file * @brief Convert a set of compressed 2D image levels to a file
* @m_since_latest * @m_since_latest
* *
* Available only if @ref ImageConverterFeature::ConvertCompressedLevels2DToFile * Available only if @ref ImageConverterFeature::Levels together with
* is supported. The function expects at least one image to be passed, * @relativeref{ImageConverterFeature,ConvertCompressed2DToFile} is
* supported. The function expects at least one image to be passed,
* with each view expected to not be @cpp nullptr @ce, to have a * with each view expected to not be @cpp nullptr @ce, to have a
* non-zero size in all dimensions, and all views sharing the same * non-zero size in all dimensions, and all views sharing the same
* pixel format and layout flags. Note that certain converters may * pixel format and layout flags. Note that certain converters may
@ -1595,8 +1564,9 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
* @brief Convert a set of compressed 3D image levels to a file * @brief Convert a set of compressed 3D image levels to a file
* @m_since_latest * @m_since_latest
* *
* Available only if @ref ImageConverterFeature::ConvertCompressedLevels3DToFile * Available only if @ref ImageConverterFeature::Levels together with
* is supported. The function expects at least one image to be passed, * @relativeref{ImageConverterFeature,ConvertCompressed3DToFile} is
* supported. The function expects at least one image to be passed,
* with each view expected to not be @cpp nullptr @ce, to have a * with each view expected to not be @cpp nullptr @ce, to have a
* non-zero size in all dimensions, and all views sharing the same * non-zero size in all dimensions, and all views sharing the same
* pixel format and layout flags. Note that certain converters may * pixel format and layout flags. Note that certain converters may
@ -1619,9 +1589,8 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
* @brief Implementation for @ref convertToFile(const ImageView1D&, Containers::StringView) * @brief Implementation for @ref convertToFile(const ImageView1D&, Containers::StringView)
* @m_since_latest * @m_since_latest
* *
* If @ref ImageConverterFeature::ConvertLevels1DToFile is supported, * If @ref ImageConverterFeature::Levels is supported, default
* default implementation calls * implementation calls @ref doConvertToFile(Containers::ArrayView<const ImageView1D>, Containers::StringView)
* @ref doConvertToFile(Containers::ArrayView<const ImageView1D>, Containers::StringView)
* with just the single @p image. Otherwise, if * with just the single @p image. Otherwise, if
* @ref ImageConverterFeature::Convert1DToData is supported, default * @ref ImageConverterFeature::Convert1DToData is supported, default
* implementation calls @ref doConvertToData(const ImageView1D&) and * implementation calls @ref doConvertToData(const ImageView1D&) and
@ -1635,9 +1604,8 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
* @brief Implementation for @ref convertToFile(const ImageView2D&, Containers::StringView) * @brief Implementation for @ref convertToFile(const ImageView2D&, Containers::StringView)
* @m_since_latest * @m_since_latest
* *
* If @ref ImageConverterFeature::ConvertLevels2DToFile is supported, * If @ref ImageConverterFeature::Levels is supported, default
* default implementation calls * implementation calls @ref doConvertToFile(Containers::ArrayView<const ImageView2D>, Containers::StringView)
* @ref doConvertToFile(Containers::ArrayView<const ImageView2D>, Containers::StringView)
* with just the single @p image. Otherwise, if * with just the single @p image. Otherwise, if
* @ref ImageConverterFeature::Convert2DToData is supported, default * @ref ImageConverterFeature::Convert2DToData is supported, default
* implementation calls @ref doConvertToData(const ImageView2D&) and * implementation calls @ref doConvertToData(const ImageView2D&) and
@ -1651,9 +1619,8 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
* @brief Implementation for @ref convertToFile(const ImageView3D&, Containers::StringView) * @brief Implementation for @ref convertToFile(const ImageView3D&, Containers::StringView)
* @m_since_latest * @m_since_latest
* *
* If @ref ImageConverterFeature::ConvertLevels3DToFile is supported, * If @ref ImageConverterFeature::Levels is supported, default
* default implementation calls * implementation calls @ref doConvertToFile(Containers::ArrayView<const ImageView3D>, Containers::StringView)
* @ref doConvertToFile(Containers::ArrayView<const ImageView3D>, Containers::StringView)
* with just the single @p image. Otherwise, if * with just the single @p image. Otherwise, if
* @ref ImageConverterFeature::Convert3DToData is supported, default * @ref ImageConverterFeature::Convert3DToData is supported, default
* implementation calls @ref doConvertToData(const ImageView3D&) and * implementation calls @ref doConvertToData(const ImageView3D&) and
@ -1667,9 +1634,8 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
* @brief Implementation for @ref convertToFile(const CompressedImageView1D&, Containers::StringView) * @brief Implementation for @ref convertToFile(const CompressedImageView1D&, Containers::StringView)
* @m_since_latest * @m_since_latest
* *
* If @ref ImageConverterFeature::ConvertCompressedLevels1DToFile is * If @ref ImageConverterFeature::Levels is supported, default
* supported, default implementation calls * implementation calls @ref doConvertToFile(Containers::ArrayView<const CompressedImageView1D>, Containers::StringView)
* @ref doConvertToFile(Containers::ArrayView<const CompressedImageView1D>, Containers::StringView)
* with just the single @p image. Otherwise, if * with just the single @p image. Otherwise, if
* @ref ImageConverterFeature::ConvertCompressed1DToData is supported, * @ref ImageConverterFeature::ConvertCompressed1DToData is supported,
* default implementation calls @ref doConvertToData(const CompressedImageView1D&) * default implementation calls @ref doConvertToData(const CompressedImageView1D&)
@ -1684,9 +1650,8 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
* @brief Implementation for @ref convertToFile(const CompressedImageView2D&, Containers::StringView) * @brief Implementation for @ref convertToFile(const CompressedImageView2D&, Containers::StringView)
* @m_since_latest * @m_since_latest
* *
* If @ref ImageConverterFeature::ConvertCompressedLevels2DToFile is * If @ref ImageConverterFeature::Levels is supported, default
* supported, default implementation calls * implementation calls @ref doConvertToFile(Containers::ArrayView<const CompressedImageView2D>, Containers::StringView)
* @ref doConvertToFile(Containers::ArrayView<const CompressedImageView2D>, Containers::StringView)
* with just the single @p image. Otherwise, if * with just the single @p image. Otherwise, if
* @ref ImageConverterFeature::ConvertCompressed2DToData is supported, * @ref ImageConverterFeature::ConvertCompressed2DToData is supported,
* default implementation calls @ref doConvertToData(const CompressedImageView2D&) * default implementation calls @ref doConvertToData(const CompressedImageView2D&)
@ -1701,9 +1666,8 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
* @brief Implementation for @ref convertToFile(const CompressedImageView3D&, Containers::StringView) * @brief Implementation for @ref convertToFile(const CompressedImageView3D&, Containers::StringView)
* @m_since_latest * @m_since_latest
* *
* If @ref ImageConverterFeature::ConvertCompressedLevels3DToFile is * If @ref ImageConverterFeature::Levels is supported, default
* supported, default implementation calls * implementation calls @ref doConvertToFile(Containers::ArrayView<const CompressedImageView3D>, Containers::StringView)
* @ref doConvertToFile(Containers::ArrayView<const CompressedImageView3D>, Containers::StringView)
* with just the single @p image. Otherwise, if * with just the single @p image. Otherwise, if
* @ref ImageConverterFeature::ConvertCompressed3DToData is supported, * @ref ImageConverterFeature::ConvertCompressed3DToData is supported,
* default implementation calls @ref doConvertToData(const CompressedImageView3D&) * default implementation calls @ref doConvertToData(const CompressedImageView3D&)
@ -1718,12 +1682,12 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
* @brief Implementation for @ref convertToFile(Containers::ArrayView<const ImageView1D>, Containers::StringView) * @brief Implementation for @ref convertToFile(Containers::ArrayView<const ImageView1D>, Containers::StringView)
* @m_since_latest * @m_since_latest
* *
* If @ref ImageConverterFeature::ConvertLevels1DToData is supported, * If @ref ImageConverterFeature::Convert1DToData is supported, default
* default implementation calls * implementation calls @ref doConvertToData(Containers::ArrayView<const ImageView1D>)
* @ref doConvertToData(Containers::ArrayView<const ImageView1D>) and * and saves the result to given file. It is allowed to call this
* saves the result to given file. It is allowed to call this function * function from your @ref doConvertToFile() implementation, for
* from your @ref doConvertToFile() implementation, for example when * example when you only need to do format detection based on file
* you only need to do format detection based on file extension. * extension.
*/ */
virtual bool doConvertToFile(Containers::ArrayView<const ImageView1D> imageLevels, Containers::StringView filename); virtual bool doConvertToFile(Containers::ArrayView<const ImageView1D> imageLevels, Containers::StringView filename);
@ -1731,12 +1695,12 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
* @brief Implementation for @ref convertToFile(Containers::ArrayView<const ImageView2D>, Containers::StringView) * @brief Implementation for @ref convertToFile(Containers::ArrayView<const ImageView2D>, Containers::StringView)
* @m_since_latest * @m_since_latest
* *
* If @ref ImageConverterFeature::ConvertLevels1DToData is supported, * If @ref ImageConverterFeature::Convert2DToData is supported, default
* default implementation calls * implementation calls @ref doConvertToData(Containers::ArrayView<const ImageView2D>)
* @ref doConvertToData(Containers::ArrayView<const ImageView2D>) and * and saves the result to given file. It is allowed to call this
* saves the result to given file. It is allowed to call this function * function from your @ref doConvertToFile() implementation, for
* from your @ref doConvertToFile() implementation, for example when * example when you only need to do format detection based on file
* you only need to do format detection based on file extension. * extension.
*/ */
virtual bool doConvertToFile(Containers::ArrayView<const ImageView2D> imageLevels, Containers::StringView filename); virtual bool doConvertToFile(Containers::ArrayView<const ImageView2D> imageLevels, Containers::StringView filename);
@ -1744,12 +1708,12 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
* @brief Implementation for @ref convertToFile(Containers::ArrayView<const ImageView3D>, Containers::StringView) * @brief Implementation for @ref convertToFile(Containers::ArrayView<const ImageView3D>, Containers::StringView)
* @m_since_latest * @m_since_latest
* *
* If @ref ImageConverterFeature::ConvertLevels1DToData is supported, * If @ref ImageConverterFeature::Convert3DToData is supported, default
* default implementation calls * implementation calls @ref doConvertToData(Containers::ArrayView<const ImageView3D>)
* @ref doConvertToData(Containers::ArrayView<const ImageView3D>) and * and saves the result to given file. It is allowed to call this
* saves the result to given file. It is allowed to call this function * function from your @ref doConvertToFile() implementation, for
* from your @ref doConvertToFile() implementation, for example when * example when you only need to do format detection based on file
* you only need to do format detection based on file extension. * extension.
*/ */
virtual bool doConvertToFile(Containers::ArrayView<const ImageView3D> imageLevels, Containers::StringView filename); virtual bool doConvertToFile(Containers::ArrayView<const ImageView3D> imageLevels, Containers::StringView filename);
@ -1757,7 +1721,7 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
* @brief Implementation for @ref convertToFile(Containers::ArrayView<const CompressedImageView1D>, Containers::StringView) * @brief Implementation for @ref convertToFile(Containers::ArrayView<const CompressedImageView1D>, Containers::StringView)
* @m_since_latest * @m_since_latest
* *
* If @ref ImageConverterFeature::ConvertCompressedLevels1DToData is * If @ref ImageConverterFeature::ConvertCompressed1DToData is
* supported, default implementation calls * supported, default implementation calls
* @ref doConvertToData(Containers::ArrayView<const CompressedImageView1D>) * @ref doConvertToData(Containers::ArrayView<const CompressedImageView1D>)
* and saves the result to given file. It is allowed to call this * and saves the result to given file. It is allowed to call this
@ -1771,7 +1735,7 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
* @brief Implementation for @ref convertToFile(Containers::ArrayView<const CompressedImageView2D>, Containers::StringView) * @brief Implementation for @ref convertToFile(Containers::ArrayView<const CompressedImageView2D>, Containers::StringView)
* @m_since_latest * @m_since_latest
* *
* If @ref ImageConverterFeature::ConvertCompressedLevels2DToData is * If @ref ImageConverterFeature::ConvertCompressed2DToData is
* supported, default implementation calls @ref doConvertToData(Containers::ArrayView<const CompressedImageView2D>) * supported, default implementation calls @ref doConvertToData(Containers::ArrayView<const CompressedImageView2D>)
* and saves the result to given file. It is allowed to call this * and saves the result to given file. It is allowed to call this
* function from your @ref doConvertToFile() implementation, for * function from your @ref doConvertToFile() implementation, for
@ -1784,7 +1748,7 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
* @brief Implementation for @ref convertToFile(Containers::ArrayView<const CompressedImageView3D>, Containers::StringView) * @brief Implementation for @ref convertToFile(Containers::ArrayView<const CompressedImageView3D>, Containers::StringView)
* @m_since_latest * @m_since_latest
* *
* If @ref ImageConverterFeature::ConvertCompressedLevels3DToData is * If @ref ImageConverterFeature::ConvertCompressed3DToData is
* supported, default implementation calls @ref doConvertToData(Containers::ArrayView<const CompressedImageView3D>) * supported, default implementation calls @ref doConvertToData(Containers::ArrayView<const CompressedImageView3D>)
* and saves the result to given file. It is allowed to call this * and saves the result to given file. It is allowed to call this
* function from your @ref doConvertToFile() implementation, for * function from your @ref doConvertToFile() implementation, for
@ -1869,8 +1833,8 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
* @brief Implementation for @ref convertToData(const ImageView1D&) * @brief Implementation for @ref convertToData(const ImageView1D&)
* @m_since_latest * @m_since_latest
* *
* If @ref ImageConverterFeature::ConvertLevels1DToData is supported, * If @ref ImageConverterFeature::Levels is supported, default
* default implementation calls @ref doConvertToData(Containers::ArrayView<const ImageView1D>) * implementation calls @ref doConvertToData(Containers::ArrayView<const ImageView1D>)
* with just the single @p image and propagates the result back. * with just the single @p image and propagates the result back.
*/ */
virtual Containers::Optional<Containers::Array<char>> doConvertToData(const ImageView1D& image); virtual Containers::Optional<Containers::Array<char>> doConvertToData(const ImageView1D& image);
@ -1879,8 +1843,8 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
* @brief Implementation for @ref convertToData(const ImageView2D&) * @brief Implementation for @ref convertToData(const ImageView2D&)
* @m_since_latest * @m_since_latest
* *
* If @ref ImageConverterFeature::ConvertLevels2DToData is supported, * If @ref ImageConverterFeature::Levels is supported, default
* default implementation calls @ref doConvertToData(Containers::ArrayView<const ImageView2D>) * implementation calls @ref doConvertToData(Containers::ArrayView<const ImageView2D>)
* with just the single @p image and propagates the result back. * with just the single @p image and propagates the result back.
*/ */
virtual Containers::Optional<Containers::Array<char>> doConvertToData(const ImageView2D& image); virtual Containers::Optional<Containers::Array<char>> doConvertToData(const ImageView2D& image);
@ -1889,8 +1853,8 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
* @brief Implementation for @ref convertToData(const ImageView3D&) * @brief Implementation for @ref convertToData(const ImageView3D&)
* @m_since_latest * @m_since_latest
* *
* If @ref ImageConverterFeature::ConvertLevels3DToData is supported, * If @ref ImageConverterFeature::Levels is supported, default
* default implementation calls @ref doConvertToData(Containers::ArrayView<const ImageView3D>) * implementation calls @ref doConvertToData(Containers::ArrayView<const ImageView3D>)
* with just the single @p image and propagates the result back. * with just the single @p image and propagates the result back.
*/ */
virtual Containers::Optional<Containers::Array<char>> doConvertToData(const ImageView3D& image); virtual Containers::Optional<Containers::Array<char>> doConvertToData(const ImageView3D& image);
@ -1899,9 +1863,8 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
* @brief Implementation for @ref convertToData(const CompressedImageView1D&) * @brief Implementation for @ref convertToData(const CompressedImageView1D&)
* @m_since_latest * @m_since_latest
* *
* If @ref ImageConverterFeature::ConvertCompressedLevels1DToData is * If @ref ImageConverterFeature::Levels is supported, default
* supported, default implementation calls * implementation calls @ref doConvertToData(Containers::ArrayView<const CompressedImageView1D>)
* @ref doConvertToData(Containers::ArrayView<const CompressedImageView1D>)
* with just the single @p image and propagates the result back. * with just the single @p image and propagates the result back.
*/ */
virtual Containers::Optional<Containers::Array<char>> doConvertToData(const CompressedImageView1D& image); virtual Containers::Optional<Containers::Array<char>> doConvertToData(const CompressedImageView1D& image);
@ -1910,9 +1873,8 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
* @brief Implementation for @ref convertToData(const CompressedImageView2D&) * @brief Implementation for @ref convertToData(const CompressedImageView2D&)
* @m_since_latest * @m_since_latest
* *
* If @ref ImageConverterFeature::ConvertCompressedLevels2DToData is * If @ref ImageConverterFeature::Levels is supported, default
* supported, default implementation calls * implementation calls @ref doConvertToData(Containers::ArrayView<const CompressedImageView2D>)
* @ref doConvertToData(Containers::ArrayView<const CompressedImageView2D>)
* with just the single @p image and propagates the result back. * with just the single @p image and propagates the result back.
*/ */
virtual Containers::Optional<Containers::Array<char>> doConvertToData(const CompressedImageView2D& image); virtual Containers::Optional<Containers::Array<char>> doConvertToData(const CompressedImageView2D& image);
@ -1921,9 +1883,8 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract
* @brief Implementation for @ref convertToData(const CompressedImageView3D&) * @brief Implementation for @ref convertToData(const CompressedImageView3D&)
* @m_since_latest * @m_since_latest
* *
* If @ref ImageConverterFeature::ConvertCompressedLevels3DToData is * If @ref ImageConverterFeature::Levels is supported, default
* supported, default implementation calls * implementation calls @ref doConvertToData(Containers::ArrayView<const CompressedImageView3D>)
* @ref doConvertToData(Containers::ArrayView<const CompressedImageView3D>)
* with just the single @p image and propagates the result back. * with just the single @p image and propagates the result back.
*/ */
virtual Containers::Optional<Containers::Array<char>> doConvertToData(const CompressedImageView3D& image); virtual Containers::Optional<Containers::Array<char>> doConvertToData(const CompressedImageView3D& image);

488
src/Magnum/Trade/Test/AbstractImageConverterTest.cpp
View File

File diff suppressed because it is too large Load Diff

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

@ -1021,10 +1021,8 @@ no -C / --converter is specified, AnyImageConverter is used.)")
Trade::ImageConverterFeature::ConvertCompressed3DToFile : Trade::ImageConverterFeature::ConvertCompressed3DToFile :
Trade::ImageConverterFeature::Convert3DToFile; Trade::ImageConverterFeature::Convert3DToFile;
} else CORRADE_INTERNAL_ASSERT_UNREACHABLE(); } else CORRADE_INTERNAL_ASSERT_UNREACHABLE();
/** @todo use a sane flag once the feature enum is ... sane */ if(outputIsMultiLevel)
constexpr Trade::ImageConverterFeatures ImageConverterFeatureLevels = expectedFeatures |= Trade::ImageConverterFeature::Levels;
Trade::ImageConverterFeature::ConvertLevels1DToFile & ~Trade::ImageConverterFeature::Convert1DToFile;
if(outputIsMultiLevel) expectedFeatures |= ImageConverterFeatureLevels;
if(!(converter->features() >= expectedFeatures)) { if(!(converter->features() >= expectedFeatures)) {
Error err; Error err;
err << converterName << "doesn't support"; err << converterName << "doesn't support";

7
src/MagnumPlugins/AnyImageConverter/AnyImageConverter.cpp
Unescape View File

@ -54,12 +54,7 @@ ImageConverterFeatures AnyImageConverter::doFeatures() const {
ImageConverterFeature::ConvertCompressed1DToFile| ImageConverterFeature::ConvertCompressed1DToFile|
ImageConverterFeature::ConvertCompressed2DToFile| ImageConverterFeature::ConvertCompressed2DToFile|
ImageConverterFeature::ConvertCompressed3DToFile| ImageConverterFeature::ConvertCompressed3DToFile|
ImageConverterFeature::ConvertLevels1DToFile| ImageConverterFeature::Levels;
ImageConverterFeature::ConvertLevels2DToFile|
ImageConverterFeature::ConvertLevels3DToFile|
ImageConverterFeature::ConvertCompressedLevels1DToFile|
ImageConverterFeature::ConvertCompressedLevels2DToFile|
ImageConverterFeature::ConvertCompressedLevels3DToFile;
} }
bool AnyImageConverter::doConvertToFile(const ImageView1D& image, const Containers::StringView filename) { bool AnyImageConverter::doConvertToFile(const ImageView1D& image, const Containers::StringView filename) {

Write Preview
Loading…
Cancel
Save