mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r5249) - Add code to copy the palette to a temporary byte aligned array when making a PCX screenshot, if the palette array is not byte aligned.

release/0.5
peter1138 2006-06-13 17:13:46 +00:00
parent 30c81ca9ac
commit 642a3b4b22
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
screenshot.c
View File

@ -285,6 +285,7 @@ static bool MakePCXImage(const char *name, ScreenshotCallback *callb, void *user
uint maxlines; uint maxlines;
uint y; uint y;
PcxHeader pcx; PcxHeader pcx;
bool success;
if (pixelformat != 8 || w == 0) if (pixelformat != 8 || w == 0)
return false; return false;
@ -388,14 +389,24 @@ static bool MakePCXImage(const char *name, ScreenshotCallback *callb, void *user
return false; return false;
} }
{assert_compile(sizeof(*palette) == 3);} if (sizeof(*palette) == 3) {
if (fwrite(palette, 256 * sizeof(*palette), 1, f) != 1) { success = fwrite(palette, 256 * sizeof(*palette), 1, f) == 1;
fclose(f); } else {
return false; /* If the palette is word-aligned, copy it to a temporary byte array */
byte *tmp = malloc(256 * 3);
uint i;
for (i = 0; i < 256; i++) {
tmp[i * 3 + 0] = palette[i].r;
tmp[i * 3 + 1] = palette[i].g;
tmp[i * 3 + 2] = palette[i].b;
}
success = fwrite(tmp, 256 * 3, 1, f) == 1;
free(tmp);
} }
fclose(f); fclose(f);
return true; return success;
} }
//************************************************ //************************************************