From b4ca71ef9bda2134bb08deb8a8a3227b2f70d1bd Mon Sep 17 00:00:00 2001 From: Squareys Date: Thu, 29 Aug 2019 11:34:39 +0200 Subject: [PATCH] AnyImageConverter: Delegate .basis files to BasisImageConverter Signed-off-by: Squareys --- src/MagnumPlugins/AnyImageConverter/AnyImageConverter.cpp | 2 ++ src/MagnumPlugins/AnyImageConverter/AnyImageConverter.h | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/MagnumPlugins/AnyImageConverter/AnyImageConverter.cpp b/src/MagnumPlugins/AnyImageConverter/AnyImageConverter.cpp index bdb165f66..638bd38d7 100644 --- a/src/MagnumPlugins/AnyImageConverter/AnyImageConverter.cpp +++ b/src/MagnumPlugins/AnyImageConverter/AnyImageConverter.cpp @@ -54,6 +54,8 @@ bool AnyImageConverter::doExportToFile(const ImageView2D& image, const std::stri std::string plugin; if(Utility::String::endsWith(normalized, ".bmp")) plugin = "BmpImageConverter"; + else if(Utility::String::endsWith(normalized, ".basis")) + plugin = "BasisImageConverter"; else if(Utility::String::endsWith(normalized, ".exr")) plugin = "OpenExrImageConverter"; else if(Utility::String::endsWith(normalized, ".hdr")) diff --git a/src/MagnumPlugins/AnyImageConverter/AnyImageConverter.h b/src/MagnumPlugins/AnyImageConverter/AnyImageConverter.h index a8d53f81a..507d37be0 100644 --- a/src/MagnumPlugins/AnyImageConverter/AnyImageConverter.h +++ b/src/MagnumPlugins/AnyImageConverter/AnyImageConverter.h @@ -66,10 +66,12 @@ target. See @ref building, @ref cmake and @ref plugins for more information. Supported formats for uncompressed data: -- OpenEXR (`*.exr`), converted with any plugin that provides - `OpenExrImageConverter` +- Basis Universal (`*.basis`), converted with @ref BasisImageConverter or any other + plugin that provides it - Windows Bitmap (`*.bmp`), converted with any plugin that provides `BmpImageConverter` +- OpenEXR (`*.exr`), converted with any plugin that provides + `OpenExrImageConverter` - Radiance HDR (`*.hdr`), converted with any plugin that provides `HdrImageConverter` - JPEG (`*.jpg`, `*.jpe`, `*.jpeg`), converted with @ref JpegImageConverter