Merge pull request #127 from Hoikas/bgra

Fix plJPEG image channels order
H-uru · Mar 6, 2024 · 82a6b6c · 82a6b6c
2 parents 1d29805 + 643ba2f
commit 82a6b6c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/core/PRP/Surface/plMipmap.h b/core/PRP/Surface/plMipmap.h
@@ -82,6 +82,7 @@ class HSPLASMA_EXPORT plMipmap : public plBitmap
     unsigned int getWidth() const { return fWidth; }
     unsigned int getHeight() const { return fHeight; }
     const void* getImageData() const { return fImageData; }
+    void* getImageData() { return fImageData; }
     size_t getTotalSize() const { return fTotalSize; }
     size_t getNumLevels() const { return fLevelData.size(); }
     unsigned int getLevelSize(size_t idx) const { return fLevelData[idx].fSize; }

diff --git a/core/Util/plJPEG.cpp b/core/Util/plJPEG.cpp
@@ -192,6 +192,18 @@ void plJPEG::DecompressJPEG(hsStream* S, void* buf, size_t size)
         offs += out_stride;
     }
 
+    // Data stored as RGB on disk but Plasma uses BGR
+    if (reinterpret_cast<uintptr_t>(buf) % alignof(uint32_t) != 0)
+        throw hsBadParamException(__FILE__, __LINE__, "buf should be aligned on a 32-bit boundary");
+
+    uint32_t* dp = reinterpret_cast<uint32_t*>(buf);
+    for (size_t i=0; i<size; i += 4) {
+        *dp = (*dp & 0xFF00FF00)
+            | (*dp & 0x00FF0000) >> 16
+            | (*dp & 0x000000FF) << 16;
+        dp++;
+    }
+
     jpeg_finish_decompress(&ji.dinfo);
 }