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

Revert last change, better to wait for 16bit backend support.

Browse source 
svn-id: r41131
This commit is contained in:
Travis Howell 2009-06-03 00:31:50 +00:00
parent f82df1d1c4
commit fc4d1c0aff
1 changed files with 6 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
graphics/scaler/thumbnail_intern.cpp
View file

@ -23,7 +23,6 @@
* *
*/ */
#include "common/endian.h"
#include "common/scummsys.h" #include "common/scummsys.h"
#include "common/system.h" #include "common/system.h"
@ -99,7 +98,7 @@ static bool grabScreen565(Graphics::Surface *surf) {
if (!screen) if (!screen)
return false; return false;
assert(screen->pixels != 0); assert(screen->bytesPerPixel == 1 && screen->pixels != 0);
byte palette[256 * 4]; byte palette[256 * 4];
g_system->grabPalette(&palette[0], 0, 256); g_system->grabPalette(&palette[0], 0, 256);
@ -109,16 +108,10 @@ static bool grabScreen565(Graphics::Surface *surf) {
for (uint y = 0; y < screen->h; ++y) { for (uint y = 0; y < screen->h; ++y) {
for (uint x = 0; x < screen->w; ++x) { for (uint x = 0; x < screen->w; ++x) {
byte r, g, b; byte r, g, b;
if (screen->bytesPerPixel == 2) {
uint16 col = READ_LE_UINT16(screen->getBasePtr(x, y));
r = ((col >> 10) & 0x1F) << 3;
g = ((col >> 5) & 0x1F) << 3;
b = ((col >> 0) & 0x1F) << 3;
} else {
r = palette[((uint8*)screen->pixels)[y * screen->pitch + x] * 4]; r = palette[((uint8*)screen->pixels)[y * screen->pitch + x] * 4];
g = palette[((uint8*)screen->pixels)[y * screen->pitch + x] * 4 + 1]; g = palette[((uint8*)screen->pixels)[y * screen->pitch + x] * 4 + 1];
b = palette[((uint8*)screen->pixels)[y * screen->pitch + x] * 4 + 2]; b = palette[((uint8*)screen->pixels)[y * screen->pitch + x] * 4 + 2];
}
((uint16*)surf->pixels)[y * surf->w + x] = Graphics::RGBToColor<Graphics::ColorMasks<565> >(r, g, b); ((uint16*)surf->pixels)[y * surf->w + x] = Graphics::RGBToColor<Graphics::ColorMasks<565> >(r, g, b);
} }
} }