commit 1447f36c23120aa190ac13e474619cf41e70bc5a
author Ryan C. Gordon <icculus@icculus.org> Thu Sep 14 08:37:27 2017 -0400
committer Ryan C. Gordon <icculus@icculus.org> Thu Sep 14 08:37:27 2017 -0400
tree b97d0a84126f7f24294eed91731e558acac04ae9
parent e02dfdf9f2dee84225944a038dfbe20c96f6d950

surface: Make sure SDL_ConvertSurface() deals with palettes (thanks, Sylvain!).

Fixes Bugzilla #3826.
Fixes Bugzilla #2979.

src/video/SDL_pixels.c

diff --git a/src/video/SDL_pixels.c b/src/video/SDL_pixels.c
index 13cd75a..649303c 100644
--- a/src/video/SDL_pixels.c
+++ b/src/video/SDL_pixels.c
@@ -658,7 +658,7 @@
         return SDL_SetError("SDL_SetPixelFormatPalette() passed NULL format");
     }
 
-    if (palette && palette->ncolors != (1 << format->BitsPerPixel)) {
+    if (palette && palette->ncolors > (1 << format->BitsPerPixel)) {
         return SDL_SetError("SDL_SetPixelFormatPalette() passed a palette that doesn't match the format");
     }
 

src/video/SDL_surface.c

diff --git a/src/video/SDL_surface.c b/src/video/SDL_surface.c
index 678fdc2..600056f 100644
--- a/src/video/SDL_surface.c
+++ b/src/video/SDL_surface.c
@@ -998,6 +998,11 @@
                                    surface->format->Gmask, surface->format->Bmask,
                                    surface->format->Amask);
 
+            /* Share the palette, if any */
+            if (surface->format->palette) {
+                SDL_SetSurfacePalette(tmp, surface->format->palette);
+            }
+            
             SDL_FillRect(tmp, NULL, surface->map->info.colorkey);
 
             tmp->map->info.flags &= ~SDL_COPY_COLORKEY;