[Scummvm-git-logs] scummvm master -> 7cf5cefb069124b6eefe07e91676faa765eaaa63

[criezy]

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

Summary:
d43d86f3c0 IPHONE: Fix transparency with RGB cursors using a key color
7cf5cefb06 IOS7: Fix transparency with RGB cursors using a key color


Commit: d43d86f3c0c59db8c462288897b873b5791c00c4
    https://github.com/scummvm/scummvm/commit/d43d86f3c0c59db8c462288897b873b5791c00c4
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2020-10-11T03:55:32+01:00

Commit Message:
IPHONE: Fix transparency with RGB cursors using a key color

Changed paths:
    backends/platform/iphone/osys_video.mm


diff --git a/backends/platform/iphone/osys_video.mm b/backends/platform/iphone/osys_video.mm
index 07fc93ce8d..f31e7b233b 100644
--- a/backends/platform/iphone/osys_video.mm
+++ b/backends/platform/iphone/osys_video.mm
@@ -491,19 +491,17 @@ void OSystem_IPHONE::updateMouseTexture() {
 	} else {
 		if (crossBlit((byte *)mouseTexture.getPixels(), (const byte *)_mouseBuffer.getPixels(), mouseTexture.pitch,
 			          _mouseBuffer.pitch, _mouseBuffer.w, _mouseBuffer.h, mouseTexture.format, _mouseBuffer.format)) {
-			if (!_mouseBuffer.format.aBits()) {
-				// Apply color keying since the original cursor had no alpha channel.
-				const uint16 *src = (const uint16 *)_mouseBuffer.getPixels();
-				uint8 *dstRaw = (uint8 *)mouseTexture.getPixels();
-
-				for (uint y = 0; y < _mouseBuffer.h; ++y, dstRaw += mouseTexture.pitch) {
-					uint16 *dst = (uint16 *)dstRaw;
-					for (uint x = 0; x < _mouseBuffer.w; ++x, ++dst) {
-						if (*src++ == _mouseKeyColor)
-							*dst &= ~1;
-						else
-							*dst |= 1;
-					}
+			// Apply color keying since the original cursor had no alpha channel.
+			const uint16 *src = (const uint16 *)_mouseBuffer.getPixels();
+			uint8 *dstRaw = (uint8 *)mouseTexture.getPixels();
+
+			for (uint y = 0; y < _mouseBuffer.h; ++y, dstRaw += mouseTexture.pitch) {
+				uint16 *dst = (uint16 *)dstRaw;
+				for (uint x = 0; x < _mouseBuffer.w; ++x, ++dst) {
+					if (*src++ == _mouseKeyColor)
+						*dst &= ~1;
+					else
+						*dst |= 1;
 				}
 			}
 		} else {


Commit: 7cf5cefb069124b6eefe07e91676faa765eaaa63
    https://github.com/scummvm/scummvm/commit/7cf5cefb069124b6eefe07e91676faa765eaaa63
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2020-10-11T03:56:11+01:00

Commit Message:
IOS7: Fix transparency with RGB cursors using a key color

Changed paths:
    backends/platform/ios7/ios7_osys_video.mm


diff --git a/backends/platform/ios7/ios7_osys_video.mm b/backends/platform/ios7/ios7_osys_video.mm
index 7ebbf6b49c..8de628a901 100644
--- a/backends/platform/ios7/ios7_osys_video.mm
+++ b/backends/platform/ios7/ios7_osys_video.mm
@@ -577,19 +577,17 @@ void OSystem_iOS7::updateMouseTexture() {
 	} else {
 		if (crossBlit((byte *)mouseTexture.getPixels(), (const byte *)_mouseBuffer.getPixels(), mouseTexture.pitch,
 			          _mouseBuffer.pitch, _mouseBuffer.w, _mouseBuffer.h, mouseTexture.format, _mouseBuffer.format)) {
-			if (!_mouseBuffer.format.aBits()) {
-				// Apply color keying since the original cursor had no alpha channel.
-				const uint16 *src = (const uint16 *)_mouseBuffer.getPixels();
-				uint8 *dstRaw = (uint8 *)mouseTexture.getPixels();
-
-				for (uint y = 0; y < _mouseBuffer.h; ++y, dstRaw += mouseTexture.pitch) {
-					uint16 *dst = (uint16 *)dstRaw;
-					for (uint x = 0; x < _mouseBuffer.w; ++x, ++dst) {
-						if (*src++ == _mouseKeyColor)
-							*dst &= ~1;
-						else
-							*dst |= 1;
-					}
+			// Apply color keying since the original cursor had no alpha channel.
+			const uint16 *src = (const uint16 *)_mouseBuffer.getPixels();
+			uint8 *dstRaw = (uint8 *)mouseTexture.getPixels();
+
+			for (uint y = 0; y < _mouseBuffer.h; ++y, dstRaw += mouseTexture.pitch) {
+				uint16 *dst = (uint16 *)dstRaw;
+				for (uint x = 0; x < _mouseBuffer.w; ++x, ++dst) {
+					if (*src++ == _mouseKeyColor)
+						*dst &= ~1;
+					else
+						*dst |= 1;
 				}
 			}
 		} else {