[Scummvm-cvs-logs] SF.net SVN: scummvm: [25081] scummvm/trunk/backends/platform/PalmOS/Src

[chrilith at users.sourceforge.net]

Revision: 25081
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25081&view=rev
Author:   chrilith
Date:     2007-01-14 09:34:40 -0800 (Sun, 14 Jan 2007)

Log Message:
-----------
Added missing grabRawScreen to OS5 backend

Modified Paths:
--------------
    scummvm/trunk/backends/platform/PalmOS/Src/be_os5.h
    scummvm/trunk/backends/platform/PalmOS/Src/be_zodiac.h
    scummvm/trunk/backends/platform/PalmOS/Src/os5_gfx.cpp
    scummvm/trunk/backends/platform/PalmOS/Src/zodiac_gfx.cpp

Modified: scummvm/trunk/backends/platform/PalmOS/Src/be_os5.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/be_os5.h	2007-01-14 17:05:43 UTC (rev 25080)
+++ scummvm/trunk/backends/platform/PalmOS/Src/be_os5.h	2007-01-14 17:34:40 UTC (rev 25081)
@@ -147,6 +147,7 @@
 
 	void copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h);
 	void clearScreen();
+	bool grabRawScreen(Graphics::Surface *surf);
 
 	void setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, byte keycolor, int cursorTargetScale);
 	virtual void setCursorPalette(const byte *colors, uint start, uint num);

Modified: scummvm/trunk/backends/platform/PalmOS/Src/be_zodiac.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/be_zodiac.h	2007-01-14 17:05:43 UTC (rev 25080)
+++ scummvm/trunk/backends/platform/PalmOS/Src/be_zodiac.h	2007-01-14 17:34:40 UTC (rev 25081)
@@ -79,7 +79,6 @@
 	int getDefaultGraphicsMode() const;
 
 	void updateScreen();
-	bool grabRawScreen(Graphics::Surface *surf);
 
 	void setCursorPalette(const byte *colors, uint start, uint num);
 

Modified: scummvm/trunk/backends/platform/PalmOS/Src/os5_gfx.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/os5_gfx.cpp	2007-01-14 17:05:43 UTC (rev 25080)
+++ scummvm/trunk/backends/platform/PalmOS/Src/os5_gfx.cpp	2007-01-14 17:34:40 UTC (rev 25081)
@@ -23,6 +23,7 @@
  */
 
 #include "be_os5.h"
+#include "graphics/surface.h"
 #include <PenInputMgr.h>
 #include <palmOneResources.h>
 
@@ -246,6 +247,15 @@
 	}
 }
 
+bool OSystem_PalmOS5::grabRawScreen(Graphics::Surface *surf) {
+	assert(surf);
+
+	surf->create(_screenWidth, _screenHeight, 1);
+	MemMove(surf->pixels, _offScreenP, _screenWidth * _screenHeight);
+	
+	return true;
+}
+
 void OSystem_PalmOS5::int_updateScreen() {
 	RectangleType r;
 	PointType p;
@@ -267,7 +277,7 @@
 }
 
 void OSystem_PalmOS5::extras_palette(uint8 index, uint8 r, uint8 g, uint8 b) {
-	_nativePal[index] = gfxMakeDisplayRGB( r, g, b);
+	_nativePal[index] = gfxMakeDisplayRGB(r, g, b);
 }
 
 void OSystem_PalmOS5::draw_osd(UInt16 id, Int32 x, Int32 y, Boolean show, UInt8 color) {

Modified: scummvm/trunk/backends/platform/PalmOS/Src/zodiac_gfx.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/zodiac_gfx.cpp	2007-01-14 17:05:43 UTC (rev 25080)
+++ scummvm/trunk/backends/platform/PalmOS/Src/zodiac_gfx.cpp	2007-01-14 17:34:40 UTC (rev 25081)
@@ -24,7 +24,6 @@
 
 #include "be_zodiac.h"
 #include "common/config-manager.h"
-#include "graphics/surface.h"
 #include "rumble.h"
 
 #ifdef PALMOS_68K
@@ -268,17 +267,8 @@
 	undraw_mouse();
 }
 
-bool OSystem_PalmZodiac::grabRawScreen(Graphics::Surface *surf) {
-	assert(surf);
-	
-	surf->create(_screenWidth, _screenHeight, 1);
-	MemMove(surf->pixels, _offScreenP, _screenWidth * _screenHeight);
-	
-	return true;
-}
-
 void OSystem_PalmZodiac::extras_palette(uint8 index, uint8 r, uint8 g, uint8 b) {
-	_nativePal[index] = TwGfxMakeDisplayRGB( r, g, b);
+	_nativePal[index] = TwGfxMakeDisplayRGB(r, g, b);
 }
 
 void OSystem_PalmZodiac::draw_osd(UInt16 id, Int32 x, Int32 y, Boolean show, UInt8 color) {


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