[Commits] SDL_image: lbm: use correct variable to check color planes.

libsdl.org revision control commits-owner at libsdl.org
Tue Jan 23 22:55:00 PST 2018


details:   https://hg.libsdl.org/SDL_image/rev/16772bbb1b09
changeset: 555:16772bbb1b09
user:      Ryan C. Gordon <icculus at icculus.org>
date:      Wed Jan 24 01:44:36 2018 -0500
description:
lbm: use correct variable to check color planes.

diffstat:

 IMG_lbm.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (32 lines):

diff -r 3e1ebbbaba54 -r 16772bbb1b09 IMG_lbm.c
--- a/IMG_lbm.c	Wed Jan 24 01:43:46 2018 -0500
+++ b/IMG_lbm.c	Wed Jan 24 01:44:36 2018 -0500
@@ -245,7 +245,7 @@
         goto done;
     }
 
-    if ( ( Image = SDL_CreateRGBSurface( SDL_SWSURFACE, width, bmhd.h, (bmhd.planes==24 || flagHAM==1)?24:8, 0, 0, 0, 0 ) ) == NULL )
+    if ( ( Image = SDL_CreateRGBSurface( SDL_SWSURFACE, width, bmhd.h, (nbplanes==24 || flagHAM==1)?24:8, 0, 0, 0, 0 ) ) == NULL )
        goto done;
 
     if ( bmhd.mask & 2 )               /* There is a transparent color */
@@ -272,7 +272,7 @@
         /* The 32 last colors are the same but divided by 2 */
         /* Some Amiga pictures save 64 colors with 32 last wrong colors, */
         /* they shouldn't !, and here we overwrite these 32 bad colors. */
-        if ( (nbcolors==32 || flagEHB ) && (1<<bmhd.planes)==64 )
+        if ( (nbcolors==32 || flagEHB ) && (1<<nbplanes)==64 )
         {
             nbcolors = 64;
             ptr = &colormap[0];
@@ -286,8 +286,8 @@
 
         /* If nbcolors < 2^nbplanes, repeat the colormap */
         /* This happens when pictures have a stencil mask */
-        if ( nbrcolorsfinal > (1<<bmhd.planes) ) {
-            nbrcolorsfinal = (1<<bmhd.planes);
+        if ( nbrcolorsfinal > (1<<nbplanes) ) {
+            nbrcolorsfinal = (1<<nbplanes);
         }
         for ( i=nbcolors; i < (Uint32)nbrcolorsfinal; i++ )
         {


More information about the commits mailing list