[Scummvm-cvs-logs] SF.net SVN: scummvm:[38727] scummvm/branches/branch-0-13-0/backends/ platform/wince/wince-sdl.cpp

knakos at users.sourceforge.net knakos at users.sourceforge.net
Sat Feb 21 20:02:26 CET 2009


Revision: 38727
          http://scummvm.svn.sourceforge.net/scummvm/?rev=38727&view=rev
Author:   knakos
Date:     2009-02-21 19:02:26 +0000 (Sat, 21 Feb 2009)

Log Message:
-----------
proper fix for random crashes with vga devices (sync)

Modified Paths:
--------------
    scummvm/branches/branch-0-13-0/backends/platform/wince/wince-sdl.cpp

Modified: scummvm/branches/branch-0-13-0/backends/platform/wince/wince-sdl.cpp
===================================================================
--- scummvm/branches/branch-0-13-0/backends/platform/wince/wince-sdl.cpp	2009-02-21 19:01:34 UTC (rev 38726)
+++ scummvm/branches/branch-0-13-0/backends/platform/wince/wince-sdl.cpp	2009-02-21 19:02:26 UTC (rev 38727)
@@ -1688,6 +1688,7 @@
 		// It can be drawn, scale it
 		uint32 srcPitch, dstPitch;
 		SDL_Surface *toolbarSurface;
+		ScalerProc *toolbarScaler;
 
 		if (_videoMode.screenHeight > 240) {
 			if (!_toolbarHighDrawn) {
@@ -1713,7 +1714,15 @@
 		SDL_LockSurface(_hwscreen);
 		srcPitch = toolbarSurface->pitch;
 		dstPitch = _hwscreen->pitch;
-		Normal2x((byte *)toolbarSurface->pixels, srcPitch, (byte *)_hwscreen->pixels + (_toolbarHandler.getOffset() * _scaleFactorYm / _scaleFactorYd * dstPitch), dstPitch, toolbar_rect[0].w, toolbar_rect[0].h);
+
+		toolbarScaler = _scalerProc;
+		if (_videoMode.scaleFactor == 2)
+			toolbarScaler = Normal2x;
+		else if (_videoMode.scaleFactor == 3)
+			toolbarScaler = Normal3x;
+		toolbarScaler((byte *)toolbarSurface->pixels, srcPitch, 
+					(byte *)_hwscreen->pixels + (_toolbarHandler.getOffset() * _scaleFactorYm / _scaleFactorYd * dstPitch), 
+					dstPitch, toolbar_rect[0].w, toolbar_rect[0].h);
 		SDL_UnlockSurface(toolbarSurface);
 		SDL_UnlockSurface(_hwscreen);
 


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