From f96adfdc3756350355c3081b2e4c5bd6b95387ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 31 Jul 2021 10:42:46 +0200 Subject: [PATCH] Doc++, updated changelog. --- doc/changelog.dox | 3 +++ src/MagnumPlugins/AnyImageImporter/AnyImageImporter.cpp | 1 + src/MagnumPlugins/AnyImageImporter/AnyImageImporter.h | 2 ++ .../AnyImageImporter/Test/AnyImageImporterTest.cpp | 3 ++- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/doc/changelog.dox b/doc/changelog.dox index 69c4ec781..27c88d2a0 100644 --- a/doc/changelog.dox +++ b/doc/changelog.dox @@ -345,6 +345,9 @@ See also: when the implementation only neeeds to do a format detection based on file extension - Recognizing BMP and TIFF file header magic in @relativeref{Trade,AnyImageImporter} +- 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)) - @ref Audio::AnyImporter "AnyAudioImporter", @relativeref{Trade,AnyImageImporter}, @relativeref{Trade,AnyImageConverter}, @relativeref{Trade,AnySceneImporter}, @relativeref{Trade,AnySceneConverter} diff --git a/src/MagnumPlugins/AnyImageImporter/AnyImageImporter.cpp b/src/MagnumPlugins/AnyImageImporter/AnyImageImporter.cpp index 5ea0e53a0..549126a91 100644 --- a/src/MagnumPlugins/AnyImageImporter/AnyImageImporter.cpp +++ b/src/MagnumPlugins/AnyImageImporter/AnyImageImporter.cpp @@ -3,6 +3,7 @@ Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Vladimír Vondruš + Copyright © 2021 Pablo Escobar Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/src/MagnumPlugins/AnyImageImporter/AnyImageImporter.h b/src/MagnumPlugins/AnyImageImporter/AnyImageImporter.h index 59c306756..6beb00d2f 100644 --- a/src/MagnumPlugins/AnyImageImporter/AnyImageImporter.h +++ b/src/MagnumPlugins/AnyImageImporter/AnyImageImporter.h @@ -74,6 +74,8 @@ tries to open the file with it. Supported formats: loaded with @ref JpegImporter or any other plugin that provides it - JPEG 2000 (`*.jp2`), loaded with any plugin that provides `Jpeg2000Importer` +- KTX2 (`*.ktx2` or data with corresponding signature), loaded with any + plugin that provides `KtxImporter` - Multiple-image Network Graphics (`*.mng`), loaded with any plugin that provides `MngImporter` - Portable Bitmap (`*.pbm`), loaded with any plugin that provides `PbmImporter` diff --git a/src/MagnumPlugins/AnyImageImporter/Test/AnyImageImporterTest.cpp b/src/MagnumPlugins/AnyImageImporter/Test/AnyImageImporterTest.cpp index db55ab2d9..a27da7e60 100644 --- a/src/MagnumPlugins/AnyImageImporter/Test/AnyImageImporterTest.cpp +++ b/src/MagnumPlugins/AnyImageImporter/Test/AnyImageImporterTest.cpp @@ -3,6 +3,7 @@ Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Vladimír Vondruš + Copyright © 2021 Pablo Escobar Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), @@ -91,7 +92,7 @@ constexpr struct { {"JPEG data", "gray.jpg", fileCallback, "JpegImporter"}, {"JPEG uppercase", "uppercase.JPG", nullptr, "JpegImporter"}, {"JPEG2000", "image.jp2", nullptr, "Jpeg2000Importer"}, - {"KTX", "image.ktx2", nullptr, "KtxImporter"}, + {"KTX2", "image.ktx2", nullptr, "KtxImporter"}, {"EXR", "image.exr", nullptr, "OpenExrImporter"}, {"EXR data", "image.exr", fileCallback, "OpenExrImporter"}, {"HDR", "rgb.hdr", nullptr, "HdrImporter"},