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

(svn r18673) -Fix (r17943): Deja vu: 3 byte structs are padded to a word on ARM.

release/1.0
peter1138 2009-12-31 07:39:05 +00:00
parent 768bfa969d
commit 2d14ced236
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/screenshot.cpp
View File

@ -78,12 +78,6 @@ struct RgbQuad {
}; };
assert_compile(sizeof(RgbQuad) == 4); assert_compile(sizeof(RgbQuad) == 4);
/** Pixel data in 24bpp BMP */
struct RgbTriplet {
byte b, g, r;
};
assert_compile(sizeof(RgbTriplet) == 3);
/** /**
* Generic .BMP writer * Generic .BMP writer
* @param name file name including extension * @param name file name including extension
@ -182,11 +176,11 @@ static bool MakeBMPImage(const char *name, ScreenshotCallback *callb, void *user
/* Convert from 'native' 32bpp to BMP-like 24bpp. /* Convert from 'native' 32bpp to BMP-like 24bpp.
* Works for both big and little endian machines */ * Works for both big and little endian machines */
Colour *src = ((Colour *)buff) + n * w; Colour *src = ((Colour *)buff) + n * w;
RgbTriplet *dst = (RgbTriplet *)line; byte *dst = line;
for (uint i = 0; i < w; i++) { for (uint i = 0; i < w; i++) {
dst[i].r = src[i].r; dst[i * 3 ] = src[i].b;
dst[i].g = src[i].g; dst[i * 3 + 1] = src[i].g;
dst[i].b = src[i].b; dst[i * 3 + 2] = src[i].r;
} }
} }
/* Write to file */ /* Write to file */