[Scummvm-cvs-logs] CVS: scummvm/backends/sdl sdl.cpp,1.25,1.26 sdl_gl.cpp,1.24,1.25 sdl-common.h,1.18,1.19

Max Horn fingolfin at users.sourceforge.net
Fri Apr 25 13:04:34 CEST 2003


Update of /cvsroot/scummvm/scummvm/backends/sdl
In directory sc8-pr-cvs1:/tmp/cvs-serv20908/backends/sdl

Modified Files:
	sdl.cpp sdl_gl.cpp sdl-common.h 
Log Message:
cleanup; added comment

Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- sdl.cpp	18 Mar 2003 13:31:37 -0000	1.25
+++ sdl.cpp	25 Apr 2003 20:02:58 -0000	1.26
@@ -312,7 +312,7 @@
 
 						dst_y *= _scaleFactor;
 
-						_scaler_proc((byte *)_tmpscreen->pixels + (r->x * 2 + 2) + (r->y + 1) * srcPitch, srcPitch, NULL,
+						_scaler_proc((byte *)_tmpscreen->pixels + (r->x * 2 + 2) + (r->y + 1) * srcPitch, srcPitch,
 						(byte *)_hwscreen->pixels + r->x * 2 * _scaleFactor + dst_y * dstPitch, dstPitch, r->w, dst_h);
 				}
 			

Index: sdl_gl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl_gl.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- sdl_gl.cpp	18 Apr 2003 01:19:30 -0000	1.24
+++ sdl_gl.cpp	25 Apr 2003 20:02:59 -0000	1.25
@@ -437,7 +437,7 @@
 
 						dst_y *= _scaleFactor;
 
-						_scaler_proc((byte *)_tmpscreen->pixels + (r->x * 2 + 2) + (r->y + 1) * srcPitch, srcPitch, NULL,
+						_scaler_proc((byte *)_tmpscreen->pixels + (r->x * 2 + 2) + (r->y + 1) * srcPitch, srcPitch,
 						(byte *)_hwscreen->pixels + r->x * 2 * _scaleFactor + dst_y * dstPitch, dstPitch, r->w, dst_h);
 				}
 			

Index: sdl-common.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl-common.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- sdl-common.h	8 Mar 2003 06:52:44 -0000	1.18
+++ sdl-common.h	25 Apr 2003 20:03:00 -0000	1.19
@@ -124,7 +124,7 @@
 	static OSystem *create(int gfx_mode, bool full_screen);
 
 protected:
-	typedef void ScalerProc(uint8 *srcPtr, uint32 srcPitch, uint8 *deltaPtr,
+	typedef void ScalerProc(uint8 *srcPtr, uint32 srcPitch,
 								uint8 *dstPtr, uint32 dstPitch, int width, int height);
 
 	OSystem_SDL_Common();





More information about the Scummvm-git-logs mailing list