thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Common: Even more codestyle-fixes.

Browse source
This commit is contained in:
Einar Johan T. Sømåen 2011-05-16 15:24:56 +08:00 • committed by Pawel Kolodziejski
parent 8414593bfb
commit 259eb97cb0
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
engines/grim/bitmap.cpp
View file

@ -318,7 +318,7 @@ void BitmapData::convertToColorFormat(int num, int format){
char *newData = new char[_width * _height * 4]; char *newData = new char[_width * _height * 4];
char *to = newData; char *to = newData;
for (int i = 0; i< _height * _width; i++,bitmapData++,to+=4) { for (int i = 0; i< _height * _width; i++, bitmapData++, to += 4) {
uint pixel = *bitmapData; uint pixel = *bitmapData;
// Alpha, then 555 (BGR). // Alpha, then 555 (BGR).
blue = (pixel >> 10) & 0x1f; blue = (pixel >> 10) & 0x1f;
@ -328,7 +328,7 @@ void BitmapData::convertToColorFormat(int num, int format){
red = (pixel & 0x1f); red = (pixel & 0x1f);
to[0] = red << 3 | red >> 2; to[0] = red << 3 | red >> 2;
if(pixel>>15 & 1) if(pixel >> 15 & 1)
alpha = 255; alpha = 255;
else else
alpha = 0; alpha = 0;
@ -373,9 +373,9 @@ void BitmapData::convertToColorFormat(int num, int format){
char* newStore = new char[size/2]; char* newStore = new char[size/2];
uint16 *to = reinterpret_cast<uint16 *>(newStore); uint16 *to = reinterpret_cast<uint16 *>(newStore);
for(int j = 0; j < size;j += 4, to++){ for(int j = 0; j < size;j += 4, to++){
red=(tempStore[j] >> 3) & 0x1f; red = (tempStore[j] >> 3) & 0x1f;
green=(tempStore[j + 1] >> 2) & 0x3f; green = (tempStore[j + 1] >> 2) & 0x3f;
blue=(tempStore[j + 2] >> 3) &0x1f; blue = (tempStore[j + 2] >> 3) &0x1f;
*to = (red << 11) | (green << 5) | blue; *to = (red << 11) | (green << 5) | blue;
} }