fixup! BasisImageConverter

Signed-off-by: Squareys <squareys@googlemail.com>
mosra · Aug 30, 2019 · 9247d38 · 9247d38
1 parent ef1d074
commit 9247d38
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/src/MagnumPlugins/BasisImageConverter/BasisImageConverter.cpp b/src/MagnumPlugins/BasisImageConverter/BasisImageConverter.cpp
@@ -101,8 +101,21 @@ Containers::Array<char> BasisImageConverter::doExportToData(const ImageView2D& i
        basis image from existing data as it is based on a std::vector */
     params.m_source_images.emplace_back(image.size().x(), image.size().y());
     const Containers::ArrayView<const char> imageData = image.data();
-    auto& basisImage = params.m_source_images.back();
-    std::memcpy(basisImage.get_ptr(), imageData, imageData.size());
+    basisu::image& basisImage = params.m_source_images.back();
+
+    /* basis image is always RGBA, fill in alpha if necessary */
+    if (image.format() == PixelFormat::RGB8Unorm) {
+        int i = 0;
+        for (auto& c : basisImage.get_pixels()) {
+            c.r = imageData[i];
+            c.g = imageData[i+1];
+            c.b = imageData[i+2];
+            c.a = 255;
+            i += 3;
+        }
+    } else {
+        std::memcpy(basisImage.get_ptr(), imageData, imageData.size());
+    }
 
     basisu::basis_compressor basis;
     basis.init(params);
@@ -146,7 +159,7 @@ Containers::Array<char> BasisImageConverter::doExportToData(const ImageView2D& i
 
     const basisu::uint8_vec& out = basis.get_output_basis_file();
 
-    Containers::Array<char> fileData{out.size()};
+    Containers::Array<char> fileData{Containers::DefaultInit, out.size()};
     std::copy(out.begin(), out.end(), fileData.data());
     return fileData;
 }

diff --git a/src/MagnumPlugins/BasisImageConverter/Test/BasisImageConverterTest.cpp b/src/MagnumPlugins/BasisImageConverter/Test/BasisImageConverterTest.cpp
@@ -133,6 +133,7 @@ void BasisImageConverterTest::rgb() {
         CORRADE_SKIP("BasisImporter plugin not found, cannot test");
 
     Containers::Pointer<AbstractImporter> importer = _importerManager.instantiate("BasisImporter");
+    importer->configuration().setValue("format", "Etc2");
     CORRADE_VERIFY(importer->openData(data));
     Containers::Optional<Trade::ImageData2D> converted = importer->image2D(0);
     CORRADE_VERIFY(converted);