adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed bug in TFB_ColorMapToRGB()

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@37 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
gewlitys
2002-09-14 19:38:16 +00:00
parent f49c9869e0
commit 55edfcb894
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/libs/graphics/sdl/sdl_common.c
+12 -14
View File
@@ -247,28 +247,26 @@ int TFB_ColorMapToRGB (SDL_Color *cmap_rgb)
{ {
int i, n; int i, n;
UBYTE *colors; UBYTE *colors;
Uint32 c32k; DWORD c;
colors = current_colormap; colors = current_colormap;
n = current_colormap_size / 2; n = current_colormap_size / 2;
if (n > 256) if (n > 256)
n = 256; n = 256;
for (i = 0; i < n; ++i) for (i = 0; i < n;)
{ {
// FIXME: this has a rather nasty problem currently.. sometimes, c = MAKE_DWORD (MAKE_WORD (colors[3], colors[2]), MAKE_WORD (colors[1], colors[0]));
// green component's most significant bit is missing completely, colors += 4;
// for unknown reason, which leads to color corruption
c32k = (*(Uint32*)colors) >> 8; cmap_rgb[i].r = (Uint8)(((c >> 26) & 0x1f) << 3);
colors += 2; cmap_rgb[i].g = (Uint8)(((c >> 21) & 0x1f) << 3);
cmap_rgb[i++].b = (Uint8)(((c >> 16) & 0x1f) << 3);
cmap_rgb[i].r = (c32k & 0x7c00) >> 7; cmap_rgb[i].r = (Uint8)(((c >> 10) & 0x1f) << 3);
cmap_rgb[i].g = (c32k & 0x3e0 ) >> 2; cmap_rgb[i].g = (Uint8)(((c >> 5 ) & 0x1f) << 3);
cmap_rgb[i].b = (c32k & 0x1f ) << 3; cmap_rgb[i++].b = (Uint8)(((c >> 0 ) & 0x1f) << 3);
}
//printf("cmap %d: r %d g %d b %d, c32 %x\n", i, cmap_rgb[i].r, cmap_rgb[i].g, cmap_rgb[i].b, c32k);
}
return n; return n;
} }