1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
# HG changeset patch
# User Ryan C. Gordon <icculus@icculus.org>
# Date 1516776276 18000
# Node ID 16772bbb1b094edcbd28a23979fa4089a9d560be
# Parent 3e1ebbbaba54e97a8da80f50c28f9e7cf5a5a56d
lbm: use correct variable to check color planes.
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++ )
{
|
