diff --git a/src/Magnum/Trade/AbstractImageConverter.cpp b/src/Magnum/Trade/AbstractImageConverter.cpp index bfcc85b76..1c4c80795 100644 --- a/src/Magnum/Trade/AbstractImageConverter.cpp +++ b/src/Magnum/Trade/AbstractImageConverter.cpp @@ -272,6 +272,8 @@ Containers::Optional AbstractImageConverter::convert(const ImageDat #ifndef CORRADE_NO_ASSERT namespace { +/** @todo reuse from AbstractSceneConverter when both take ImageData and not + views */ template class View> bool checkImageValidity(const char* const messagePrefix, const View& image) { /* At some point there might be a file format that allows zero-sized images, but so far I don't know about any. When such format appears, @@ -539,6 +541,8 @@ AbstractImageConverter::convertToData(const ImageData3D& image) { #ifndef CORRADE_NO_ASSERT namespace { +/** @todo reuse from AbstractSceneConverter when both take ImageData and not + views */ template bool checkImageValidity(const char* const messagePrefix, const Containers::ArrayView> imageLevels) { CORRADE_ASSERT(!imageLevels.isEmpty(), messagePrefix << "at least one image has to be specified", false); @@ -562,6 +566,8 @@ template bool checkImageValidity(const char* const messa return true; } +/** @todo reuse from AbstractSceneConverter when both take ImageData and not + views */ template bool checkImageValidity(const char* const messagePrefix, const Containers::ArrayView> imageLevels) { CORRADE_ASSERT(!imageLevels.isEmpty(), messagePrefix << "at least one image has to be specified", false); diff --git a/src/Magnum/Trade/AbstractImageConverter.h b/src/Magnum/Trade/AbstractImageConverter.h index fce1d5e72..cc7205d3f 100644 --- a/src/Magnum/Trade/AbstractImageConverter.h +++ b/src/Magnum/Trade/AbstractImageConverter.h @@ -1015,6 +1015,8 @@ class MAGNUM_TRADE_EXPORT AbstractImageConverter: public PluginManager::Abstract #endif convertToData(const CompressedImageView3D& image); + /** @todo with extras, this all needs to take a Data */ + /** * @brief Convert a 1D image data to a raw data * @m_since_latest