Fix non-DXT image channels

All Plasma image data, other than DXT, is stored as BGR in plMipmap
H-uru · Aug 21, 2018 · 1845165 · 1845165
1 parent fd8c6c2
commit 1845165
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/PrpShop/PRP/Surface/QMipmap.cpp b/src/PrpShop/PRP/Surface/QMipmap.cpp
@@ -84,7 +84,7 @@ void QTextureBox::setTexture(plMipmap* tex, int level)
     fImageData = new unsigned char[size];
     tex->DecompressImage(level, fImageData, size);
 
-    if (tex->getCompressionType() != plMipmap::kUncompressed) {
+    if (tex->getCompressionType() == plMipmap::kDirectXCompression) {
         // Manipulate the data from RGBA to BGRA
         unsigned int* dp = (unsigned int*)fImageData;
         for (size_t i=0; i<size; i += 4) {
@@ -372,9 +372,9 @@ static void makeJColorSurface(const plMipmap* tex, hsStream* S)
     dds.fLinearSize = dds.fHeight * dds.fWidth * 3;
     dds.fPixelFormat.fFlags = plDDSurface::DDPF_RGB;
     dds.fPixelFormat.fBitDepth = 24;
-    dds.fPixelFormat.fRBitMask = 0xFF0000;
+    dds.fPixelFormat.fRBitMask = 0x0000FF;
     dds.fPixelFormat.fGBitMask = 0x00FF00;
-    dds.fPixelFormat.fBBitMask = 0x0000FF;
+    dds.fPixelFormat.fBBitMask = 0xFF0000;
 
     // Strip down data to 24 bit color
     unsigned char* data = new unsigned char[dds.fLinearSize];
@@ -427,9 +427,9 @@ static bool getJColorSurface(const plDDSurface& dds, plMipmap* tex)
     }
     if ((dds.fPixelFormat.fFlags & plDDSurface::DDPF_RGB) == 0 ||
         (dds.fPixelFormat.fBitDepth != 24) ||
-        (dds.fPixelFormat.fRBitMask != 0xFF0000) ||
+        (dds.fPixelFormat.fRBitMask != 0x0000FF) ||
         (dds.fPixelFormat.fGBitMask != 0x00FF00) ||
-        (dds.fPixelFormat.fBBitMask != 0x0000FF)) {
+        (dds.fPixelFormat.fBBitMask != 0xFF0000)) {
         QMessageBox::critical(NULL, QObject::tr("Error importing JPEG"),
                               QObject::tr("DDS file should be in RGB888 format"));
         return false;