[Scummvm-cvs-logs] scummvm master -> 0a26f7084f8df9d0cb65a94a45942796ba5e4d56

lordhoto lordhoto at gmail.com
Wed Jun 20 17:32:11 CEST 2012


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:
0a26f7084f ANDROID: Fix compilation broken with changes to grabOverlay.


Commit: 0a26f7084f8df9d0cb65a94a45942796ba5e4d56
    https://github.com/scummvm/scummvm/commit/0a26f7084f8df9d0cb65a94a45942796ba5e4d56
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-06-20T08:31:10-07:00

Commit Message:
ANDROID: Fix compilation broken with changes to grabOverlay.

Changed paths:
    backends/platform/android/gfx.cpp



diff --git a/backends/platform/android/gfx.cpp b/backends/platform/android/gfx.cpp
index 44046cb..cd0fd88 100644
--- a/backends/platform/android/gfx.cpp
+++ b/backends/platform/android/gfx.cpp
@@ -642,7 +642,7 @@ void OSystem_Android::grabOverlay(void *buf, int pitch) {
 	GLTHREADCHECK;
 
 	const Graphics::Surface *surface = _overlay_texture->surface_const();
-	assert(surface->format.bytesPerPixel == sizeof(buf[0]));
+	assert(surface->format.bytesPerPixel == sizeof(uint16));
 
 	byte *dst = (byte *)buf;
 	const byte *src = (const byte *)surface->pixels;






More information about the Scummvm-git-logs mailing list