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

Do not call OSystem::grabPalette() for 16bit modes, when the result is not used anyway for those modes.

Browse source 
svn-id: r48733
This commit is contained in:
Andre Heider 2010-04-19 20:37:20 +00:00
parent 001bca2d6c
commit 64cba2878a
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
graphics/scaler/thumbnail_intern.cpp
View file

@ -102,12 +102,16 @@ static bool grabScreen565(Graphics::Surface *surf) {
assert(screen->bytesPerPixel == 1 || screen->bytesPerPixel == 2); assert(screen->bytesPerPixel == 1 || screen->bytesPerPixel == 2);
assert(screen->pixels != 0); assert(screen->pixels != 0);
byte palette[256 * 4]; Graphics::PixelFormat screenFormat = g_system->getScreenFormat();
g_system->grabPalette(&palette[0], 0, 256);
surf->create(screen->w, screen->h, 2); surf->create(screen->w, screen->h, 2);
Graphics::PixelFormat screenFormat = g_system->getScreenFormat(); byte *palette = 0;
if (screenFormat.bytesPerPixel == 1) {
palette = new byte[256 * 4];
assert(palette);
g_system->grabPalette(&palette[0], 0, 256);
}
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) {
@ -126,6 +130,8 @@ static bool grabScreen565(Graphics::Surface *surf) {
} }
} }
delete[] palette;
g_system->unlockScreen(); g_system->unlockScreen();
return true; return true;
} }