AnyImageConverter: recognize KTX2 for basically all image types.

mosra · Dec 12, 2021 · 9fbc637 · 9fbc637
1 parent fe8681d
commit 9fbc637
Show file tree

Hide file tree

Showing 10 changed files with 1,123 additions and 154 deletions.
diff --git a/doc/changelog.dox b/doc/changelog.dox
@@ -402,6 +402,8 @@ See also:
 -   Recognizing KTX2 files and data in @relativeref{Trade,AnyImageImporter} and
     @relativeref{Trade,AnyImageConverter} (see also
     [mosra/magnum#529](https://github.com/mosra/magnum/pull/529))
+-   Recognizing KTX2 for (compressed) 1D/2D/3D and multi-level 1D/2D/3D images
+    in @relativeref{Trade,AnyImageConverter}
 -   @ref Audio::AnyImporter "AnyAudioImporter",
     @relativeref{Trade,AnyImageImporter}, @relativeref{Trade,AnyImageConverter},
     @relativeref{Trade,AnySceneImporter}, @relativeref{Trade,AnySceneConverter}

diff --git a/src/MagnumPlugins/AnyImageConverter/AnyImageConverter.cpp b/src/MagnumPlugins/AnyImageConverter/AnyImageConverter.cpp
diff --git a/src/MagnumPlugins/AnyImageConverter/AnyImageConverter.h b/src/MagnumPlugins/AnyImageConverter/AnyImageConverter.h
@@ -57,24 +57,28 @@ Detects file type based on file extension, loads corresponding plugin and then
 tries to convert the file with it. Supported formats for uncompressed data:
 
 -   Basis Universal (`*.basis`), converted with @ref BasisImageConverter or any
-    other plugin that provides it
+    other plugin that provides it. Only uncompressed 2D and multi-level 2D
+    images.
 -   Windows Bitmap (`*.bmp`), converted with any plugin that provides
-    `BmpImageConverter`
+    `BmpImageConverter`. Only uncompressed 2D images.
 -   OpenEXR (`*.exr`), converted with any plugin that provides
-    `OpenExrImageConverter`
+    `OpenExrImageConverter`. Only uncompressed 2D/3D and multi-level 2D/3D
+    images.
 -   Radiance HDR (`*.hdr`), converted with any plugin that provides
-    `HdrImageConverter`
+    `HdrImageConverter`. Only uncompressed 2D images.
 -   JPEG (`*.jpg`, `*.jpe`, `*.jpeg`), converted with @ref JpegImageConverter
-    or any other plugin that provides it
+    or any other plugin that provides it. Only uncompressed 2D images.
 -   KTX2 (`*.ktx2`), converted with @ref KtxImageConverter or any other plugin
-    that provides it
+    that provides it. Uncompressed, compressed, 1D/2D/3D and multi-level
+    1D/2D/3D images.
 -   Portable Network Graphics (`*.png`), converted with @ref PngImageConverter
-    or any other plugin that provides it
+    or any other plugin that provides it. Only uncompressed 2D images.
 -   Truevision TGA (`*.tga`, `*.vda`, `*.icb`, `*.vst`), converted with
-    @ref TgaImageConverter or any other plugin that provides it
+    @ref TgaImageConverter or any other plugin that provides it. Only
+    uncompressed 2D images.
 
-No supported formats for compressed data yet. Only exporting to files is
-supported.
+As the converter plugin is picked based on file extension, only saving to files
+is supported.
 
 @section Trade-AnyImageConverter-usage Usage