[Scummvm-cvs-logs] SF.net SVN: scummvm:[49384] scummvm/trunk/backends/platform/iphone/ osys_video.cpp

[fingolfin at users.sourceforge.net]

Revision: 49384
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49384&view=rev
Author:   fingolfin
Date:     2010-06-01 22:29:55 +0000 (Tue, 01 Jun 2010)

Log Message:
-----------
Fix bug #2999153: "IPHONE: No grabPalette() implementation"

Modified Paths:
--------------
    scummvm/trunk/backends/platform/iphone/osys_video.cpp

Modified: scummvm/trunk/backends/platform/iphone/osys_video.cpp
===================================================================
--- scummvm/trunk/backends/platform/iphone/osys_video.cpp	2010-06-01 22:28:24 UTC (rev 49383)
+++ scummvm/trunk/backends/platform/iphone/osys_video.cpp	2010-06-01 22:29:55 UTC (rev 49384)
@@ -86,7 +86,7 @@
 }
 
 void OSystem_IPHONE::setPalette(const byte *colors, uint start, uint num) {
-	//printf("setPalette()\n");
+	assert(start + num <= 256);
 	const byte *b = colors;
 
 	for (uint i = start; i < start + num; ++i) {
@@ -98,7 +98,14 @@
 }
 
 void OSystem_IPHONE::grabPalette(byte *colors, uint start, uint num) {
-	//printf("grabPalette()\n");
+	assert(start + num <= 256);
+	byte *b = colors;
+
+	for (uint i = start; i < start + num; ++i) {
+		Graphics::colorToRGB<Graphics::ColorMasks<565> >(_palette[i], b[0], b[1], b[2]);
+		b[3] = 0xFF;
+		b += 4;
+	}
 }
 
 void OSystem_IPHONE::copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.