[Scummvm-cvs-logs] scummvm master -> b8850522b6a94a1375d110d58f34e1106b428e2e

eriktorbjorn eriktorbjorn at telia.com
Thu Aug 8 07:00:00 CEST 2013


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
b8850522b6 GRAPHICS: Fix incorrect parameter order for getBasePtr.


Commit: b8850522b6a94a1375d110d58f34e1106b428e2e
    https://github.com/scummvm/scummvm/commit/b8850522b6a94a1375d110d58f34e1106b428e2e
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2013-08-07T21:55:17-07:00

Commit Message:
GRAPHICS: Fix incorrect parameter order for getBasePtr.

This caused createThumbnail() to crash, e.g. when saving in the
Kyrandia engine. Probably other engines as well.

Changed paths:
    graphics/scaler/thumbnail_intern.cpp



diff --git a/graphics/scaler/thumbnail_intern.cpp b/graphics/scaler/thumbnail_intern.cpp
index e6e4a1a..c30fc3b 100644
--- a/graphics/scaler/thumbnail_intern.cpp
+++ b/graphics/scaler/thumbnail_intern.cpp
@@ -247,7 +247,7 @@ bool createThumbnail(Graphics::Surface *surf, const uint8 *pixels, int w, int h,
 			g = palette[pixels[y * w + x] * 3 + 1];
 			b = palette[pixels[y * w + x] * 3 + 2];
 
-			*((uint16 *)screen.getBasePtr(y, x)) = Graphics::RGBToColor<Graphics::ColorMasks<565> >(r, g, b);
+			*((uint16 *)screen.getBasePtr(x, y)) = Graphics::RGBToColor<Graphics::ColorMasks<565> >(r, g, b);
 		}
 	}
 






More information about the Scummvm-git-logs mailing list