[Scummvm-cvs-logs] SF.net SVN: scummvm:[50605] scummvm/trunk/graphics/scaler/thumbnail_intern. cpp

[lordhoto at users.sourceforge.net]

Revision: 50605
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50605&view=rev
Author:   lordhoto
Date:     2010-07-02 22:38:42 +0000 (Fri, 02 Jul 2010)

Log Message:
-----------
Fix long standing regression (introduced with r34053) in thumbnail scaling code for Hercules graphics.

Modified Paths:
--------------
    scummvm/trunk/graphics/scaler/thumbnail_intern.cpp

Modified: scummvm/trunk/graphics/scaler/thumbnail_intern.cpp
===================================================================
--- scummvm/trunk/graphics/scaler/thumbnail_intern.cpp	2010-07-02 21:27:36 UTC (rev 50604)
+++ scummvm/trunk/graphics/scaler/thumbnail_intern.cpp	2010-07-02 22:38:42 UTC (rev 50605)
@@ -148,8 +148,8 @@
 		Graphics::Surface newscreen;
 		newscreen.create(width, in.h, in.bytesPerPixel);
 
-		uint8 *dst = (uint8*)newscreen.getBasePtr((320 - in.w) / 2, 0);
-		const uint8 *src = (uint8*)in.getBasePtr(0, 0);
+		uint8 *dst = (uint8 *)newscreen.getBasePtr((320 - in.w) / 2, 0);
+		const uint8 *src = (const uint8 *)in.getBasePtr(0, 0);
 		uint16 height = in.h;
 
 		while (height--) {
@@ -173,8 +173,8 @@
 		Graphics::Surface newscreen;
 		newscreen.create(width, 400, in.bytesPerPixel);
 
-		uint8 *dst = (uint8*)in.getBasePtr(0, (400 - 240) / 2);
-		const uint8 *src = (uint8*)in.getBasePtr(41, 28);
+		uint8 *dst = (uint8 *)newscreen.getBasePtr(0, (400 - 240) / 2);
+		const uint8 *src = (const uint8 *)in.getBasePtr(41, 28);
 
 		for (int y = 0; y < 240; ++y) {
 			memcpy(dst, src, 640 * in.bytesPerPixel);


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