[Scummvm-cvs-logs] SF.net SVN: scummvm:[41131] scummvm/trunk/graphics/scaler/thumbnail_intern. cpp
Kirben at users.sourceforge.net
Kirben at users.sourceforge.net
Wed Jun 3 02:31:50 CEST 2009
Revision: 41131
http://scummvm.svn.sourceforge.net/scummvm/?rev=41131&view=rev
Author: Kirben
Date: 2009-06-03 00:31:50 +0000 (Wed, 03 Jun 2009)
Log Message:
-----------
Revert last change, better to wait for 16bit backend support.
Modified Paths:
--------------
scummvm/trunk/graphics/scaler/thumbnail_intern.cpp
Modified: scummvm/trunk/graphics/scaler/thumbnail_intern.cpp
===================================================================
--- scummvm/trunk/graphics/scaler/thumbnail_intern.cpp 2009-06-03 00:01:07 UTC (rev 41130)
+++ scummvm/trunk/graphics/scaler/thumbnail_intern.cpp 2009-06-03 00:31:50 UTC (rev 41131)
@@ -23,7 +23,6 @@
*
*/
-#include "common/endian.h"
#include "common/scummsys.h"
#include "common/system.h"
@@ -99,7 +98,7 @@
if (!screen)
return false;
- assert(screen->pixels != 0);
+ assert(screen->bytesPerPixel == 1 && screen->pixels != 0);
byte palette[256 * 4];
g_system->grabPalette(&palette[0], 0, 256);
@@ -108,17 +107,11 @@
for (uint y = 0; y < screen->h; ++y) {
for (uint x = 0; x < screen->w; ++x) {
- 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];
- g = palette[((uint8*)screen->pixels)[y * screen->pitch + x] * 4 + 1];
- b = palette[((uint8*)screen->pixels)[y * screen->pitch + x] * 4 + 2];
- }
+ byte r, g, b;
+ r = palette[((uint8*)screen->pixels)[y * screen->pitch + x] * 4];
+ g = palette[((uint8*)screen->pixels)[y * screen->pitch + x] * 4 + 1];
+ 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);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list