Set the alpha channel for less than 32-bit ICO/CUR images

Fixes #532 (cherry picked from commit d415332)
libsdl-org · Mar 3, 2025 · f1e4fff · f1e4fff
1 parent b146dff
commit f1e4fff
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,3 +1,6 @@
+2.8.8:
+ * Fixed alpha in less than 32-bit ICO and CUR images
+
 2.8.6:
  * Fixed partial alpha in ICO and CUR images
 

diff --git a/src/IMG_bmp.c b/src/IMG_bmp.c
@@ -307,6 +307,11 @@ LoadICOCUR_RW(SDL_RWops * src, int type, int freesrc)
         }
         for (i = 0; i < (int) biClrUsed; ++i) {
             SDL_RWread(src, &palette[i], 4, 1);
+
+            /* Since biSize == 40, we know alpha is reserved and should be zero, meaning opaque */
+            if ((palette[i] & 0xFF000000) == 0) {
+                palette[i] |= 0xFF000000;
+            }
         }
     }
 
@@ -361,7 +366,7 @@ LoadICOCUR_RW(SDL_RWops * src, int type, int freesrc)
                 Uint32 pixel;
                 Uint8 channel;
                 for (i = 0; i < surface->w; ++i) {
-                    pixel = 0;
+                    pixel = 0xFF000000;
                     for (j = 0; j < 3; ++j) {
                         /* Load each color channel into pixel */
                         if (!SDL_RWread(src, &channel, 1, 1)) {