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

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Sat Jan 16 20:25:12 CET 2010


Revision: 47329
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47329&view=rev
Author:   m_kiewitz
Date:     2010-01-16 19:25:09 +0000 (Sat, 16 Jan 2010)

Log Message:
-----------
SCI: view scaling - dont fill left-over bytes if there are no left-over bytes :P

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

Modified: scummvm/trunk/engines/sci/graphics/view.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/view.cpp	2010-01-16 19:21:06 UTC (rev 47328)
+++ scummvm/trunk/engines/sci/graphics/view.cpp	2010-01-16 19:25:09 UTC (rev 47329)
@@ -568,7 +568,8 @@
 		scaledPixel += scaleY;
 	}
 	scaledPixelNo++;
-	memset(&scalingY[scaledPixelNo], pixelNo - 1, scaledHeight - scaledPixelNo);
+	if (scaledPixelNo < scaledHeight)
+		memset(&scalingY[scaledPixelNo], pixelNo - 1, scaledHeight - scaledPixelNo);
 
 	// Create width scaling table
 	pixelNo = 0;
@@ -583,7 +584,8 @@
 		scaledPixel += scaleX;
 	}
 	scaledPixelNo++;
-	memset(&scalingX[scaledPixelNo], pixelNo - 1, scaledWidth - scaledPixelNo);
+	if (scaledPixelNo < scaledWidth)
+		memset(&scalingX[scaledPixelNo], pixelNo - 1, scaledWidth - scaledPixelNo);
 
 	scaledWidth = MIN(clipRect.width(), scaledWidth);
 	scaledHeight = MIN(clipRect.height(), scaledHeight);


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