[Scummvm-cvs-logs] SF.net SVN: scummvm:[50420] scummvm/trunk/engines/sci/graphics

[fingolfin at users.sourceforge.net]

Revision: 50420
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50420&view=rev
Author:   fingolfin
Date:     2010-06-28 11:19:45 +0000 (Mon, 28 Jun 2010)

Log Message:
-----------
SCI: Make src param of GfxScreen::scale2x const

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/screen.cpp
    scummvm/trunk/engines/sci/graphics/screen.h

Modified: scummvm/trunk/engines/sci/graphics/screen.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/screen.cpp	2010-06-28 11:19:27 UTC (rev 50419)
+++ scummvm/trunk/engines/sci/graphics/screen.cpp	2010-06-28 11:19:45 UTC (rev 50420)
@@ -583,9 +583,9 @@
 	copyToScreen();
 }
 
-void GfxScreen::scale2x(byte *src, byte *dst, int16 srcWidth, int16 srcHeight) {
+void GfxScreen::scale2x(const byte *src, byte *dst, int16 srcWidth, int16 srcHeight) {
 	int newWidth = srcWidth * 2;
-	byte *srcPtr = src;
+	const byte *srcPtr = src;
 
 	for (int y = 0; y < srcHeight; y++) {
 		for (int x = 0; x < srcWidth; x++) {

Modified: scummvm/trunk/engines/sci/graphics/screen.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/screen.h	2010-06-28 11:19:27 UTC (rev 50419)
+++ scummvm/trunk/engines/sci/graphics/screen.h	2010-06-28 11:19:45 UTC (rev 50420)
@@ -50,7 +50,9 @@
 	GFX_SCREEN_MASK_ALL			= GFX_SCREEN_MASK_VISUAL|GFX_SCREEN_MASK_PRIORITY|GFX_SCREEN_MASK_CONTROL
 };
 
-#define SCI_SCREEN_UNDITHERMEMORIAL_SIZE 256
+enum {
+	SCI_SCREEN_UNDITHERMEMORIAL_SIZE = 256
+};
 
 /**
  * Screen class, actually creates 3 (4) screens internally - which is visual/display (for the user),
@@ -104,7 +106,7 @@
 
 	void setVerticalShakePos(uint16 shakePos);
 
-	void scale2x(byte *src, byte *dst, int16 srcWidth, int16 srcHeight);
+	void scale2x(const byte *src, byte *dst, int16 srcWidth, int16 srcHeight);
 
 	void adjustToUpscaledCoordinates(int16 &y, int16 &x);
 


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