浏览代码

Fixed loading 8-bit BMP exported by Gimp with RGB masks

Sam Lantinga 2 年之前
父节点
当前提交
33d025d35a
共有 1 个文件被更改,包括 2 次插入3 次删除
  1. 2 3
      src/video/SDL_pixels.c

+ 2 - 3
src/video/SDL_pixels.c

@@ -309,14 +309,13 @@ Uint32 SDL_GetPixelFormatEnumForMasks(int bpp, Uint32 Rmask, Uint32 Gmask, Uint3
         /* SDL defaults to MSB ordering */
         /* SDL defaults to MSB ordering */
         return SDL_PIXELFORMAT_INDEX4MSB;
         return SDL_PIXELFORMAT_INDEX4MSB;
     case 8:
     case 8:
-        if (Rmask == 0) {
-            return SDL_PIXELFORMAT_INDEX8;
-        }
         if (Rmask == 0xE0 &&
         if (Rmask == 0xE0 &&
             Gmask == 0x1C &&
             Gmask == 0x1C &&
             Bmask == 0x03 &&
             Bmask == 0x03 &&
             Amask == 0x00) {
             Amask == 0x00) {
             return SDL_PIXELFORMAT_RGB332;
             return SDL_PIXELFORMAT_RGB332;
+        } else {
+            return SDL_PIXELFORMAT_INDEX8;
         }
         }
         break;
         break;
     case 12:
     case 12: