commit 7bf5557a9b38bafdfe0fc1a22e6a1a25173a9958
author Sylvain Becker <sylvain.becker@gmail.com> Wed Jan 30 17:16:08 2019 +0100
committer Sylvain Becker <sylvain.becker@gmail.com> Wed Jan 30 17:16:08 2019 +0100
tree 7714e457a870ee5e7c6bfc41b6b0d1c0b30c9baa
parent d2bf7b1eb7568e31253643947ffeb5e057acb0ac

Fix blit with blending (Blit_A) to RGB332 which has no palette

src/video/SDL_blit_A.c

diff --git a/src/video/SDL_blit_A.c b/src/video/SDL_blit_A.c
index 79ecc95..a04d1bc 100644
--- a/src/video/SDL_blit_A.c
+++ b/src/video/SDL_blit_A.c
@@ -1276,7 +1276,12 @@
         /* Per-pixel alpha blits */
         switch (df->BytesPerPixel) {
         case 1:
-            return BlitNto1PixelAlpha;
+            if (df->palette != NULL) {
+                return BlitNto1PixelAlpha;
+            } else {
+                /* RGB332 has no palette ! */
+                return BlitNtoNPixelAlpha;
+            }
 
         case 2:
                 if (sf->BytesPerPixel == 4 && sf->Amask == 0xff000000
@@ -1326,7 +1331,12 @@
             /* Per-surface alpha blits */
             switch (df->BytesPerPixel) {
             case 1:
-                return BlitNto1SurfaceAlpha;
+                if (df->palette != NULL) {
+                    return BlitNto1SurfaceAlpha;
+                } else {
+                    /* RGB332 has no palette ! */
+                    return BlitNtoNSurfaceAlpha;
+                }
 
             case 2:
                 if (surface->map->identity) {
@@ -1374,7 +1384,13 @@
     case SDL_COPY_COLORKEY | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND:
         if (sf->Amask == 0) {
             if (df->BytesPerPixel == 1) {
-                return BlitNto1SurfaceAlphaKey;
+
+                if (df->palette != NULL) {
+                    return BlitNto1SurfaceAlphaKey;
+                } else {
+                    /* RGB332 has no palette ! */
+                    return BlitNtoNSurfaceAlphaKey;
+                }
             } else {
                 return BlitNtoNSurfaceAlphaKey;
             }