[Scummvm-cvs-logs] scummvm master -> 67791fa91641bbea12313e4aca4ef57bac24b853

[lordhoto]

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

Summary:
9fab467d58 ANDROID: Fix color key handling for 16bit mouse cursors.
98867825ba ANDROID: Make transparent cursor pixels all 0 in 16bit cursor mode.
67791fa916 Merge pull request #453 from lordhoto/android-16bit-cursor


Commit: 9fab467d58f627c704910a62f533c53e1674aee7
    https://github.com/scummvm/scummvm/commit/9fab467d58f627c704910a62f533c53e1674aee7
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-03-26T00:43:38+01:00

Commit Message:
ANDROID: Fix color key handling for 16bit mouse cursors.

This should fix a issue similarly to bug #6108:
"WII: Zak FM-TOWNS mouse cursor encased in blue box".

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



diff --git a/backends/platform/android/gfx.cpp b/backends/platform/android/gfx.cpp
index 9229349..23e29fb 100644
--- a/backends/platform/android/gfx.cpp
+++ b/backends/platform/android/gfx.cpp
@@ -759,8 +759,8 @@ void OSystem_Android::setMouseCursor(const void *buf, uint w, uint h,
 		uint16 *d = (uint16 *)tmp;
 		for (uint16 y = 0; y < h; ++y, d += pitch / 2 - w)
 			for (uint16 x = 0; x < w; ++x, d++)
-				if (*s++ != (keycolor & 0xffff))
-					*d |= 1;
+				if (*s++ == (keycolor & 0xffff))
+					*d &= ~1;
 
 		_mouse_texture->updateBuffer(0, 0, w, h, tmp, pitch);
 


Commit: 98867825bafee4580f646c74b10c269dc8ccb663
    https://github.com/scummvm/scummvm/commit/98867825bafee4580f646c74b10c269dc8ccb663
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-03-31T19:04:53+02:00

Commit Message:
ANDROID: Make transparent cursor pixels all 0 in 16bit cursor mode.

Since the Android backend uses glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA)
we need to make the transparent cursor pixels all 0 otherwise we might get
artifacts from blending.

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



diff --git a/backends/platform/android/gfx.cpp b/backends/platform/android/gfx.cpp
index 23e29fb..b71a983 100644
--- a/backends/platform/android/gfx.cpp
+++ b/backends/platform/android/gfx.cpp
@@ -760,7 +760,7 @@ void OSystem_Android::setMouseCursor(const void *buf, uint w, uint h,
 		for (uint16 y = 0; y < h; ++y, d += pitch / 2 - w)
 			for (uint16 x = 0; x < w; ++x, d++)
 				if (*s++ == (keycolor & 0xffff))
-					*d &= ~1;
+					*d = 0;
 
 		_mouse_texture->updateBuffer(0, 0, w, h, tmp, pitch);
 


Commit: 67791fa91641bbea12313e4aca4ef57bac24b853
    https://github.com/scummvm/scummvm/commit/67791fa91641bbea12313e4aca4ef57bac24b853
Author: Johannes Schickel (lordhoto at gmail.com)
Date: 2014-04-01T18:13:29+02:00

Commit Message:
Merge pull request #453 from lordhoto/android-16bit-cursor

ANDROID: Fix color key handling for 16bit mouse cursors.

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