[Scummvm-git-logs] scummvm master -> 23a9742eac438ee5957eee976961a5f91ed2628a

dwatteau noreply at scummvm.org
Wed Apr 12 07:51:31 UTC 2023


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:
23a9742eac STARK: Fix MSVC C4245 signed/unsigned warning


Commit: 23a9742eac438ee5957eee976961a5f91ed2628a
    https://github.com/scummvm/scummvm/commit/23a9742eac438ee5957eee976961a5f91ed2628a
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2023-04-12T09:50:57+02:00

Commit Message:
STARK: Fix MSVC C4245 signed/unsigned warning

Changed paths:
    engines/stark/formats/xmg.cpp


diff --git a/engines/stark/formats/xmg.cpp b/engines/stark/formats/xmg.cpp
index 43f42e1442c..9f9fb270c9c 100644
--- a/engines/stark/formats/xmg.cpp
+++ b/engines/stark/formats/xmg.cpp
@@ -212,7 +212,7 @@ XMGDecoder::Block XMGDecoder::processRGB() {
 	color = _stream->readUint16LE();
 	color += _stream->readByte() << 16;
 	if (color != _transColor)
-		color += 255 << 24;
+		color += 255u << 24;
 	else
 		color = 0;
 	block.a1 = color;
@@ -220,7 +220,7 @@ XMGDecoder::Block XMGDecoder::processRGB() {
 	color = _stream->readUint16LE();
 	color += _stream->readByte() << 16;
 	if (color != _transColor)
-		color += 255 << 24;
+		color += 255u << 24;
 	else
 		color = 0;
 	block.a2 = color;
@@ -228,7 +228,7 @@ XMGDecoder::Block XMGDecoder::processRGB() {
 	color = _stream->readUint16LE();
 	color += _stream->readByte() << 16;
 	if (color != _transColor)
-		color += 255 << 24;
+		color += 255u << 24;
 	else
 		color = 0;
 	block.b1 = color;
@@ -236,7 +236,7 @@ XMGDecoder::Block XMGDecoder::processRGB() {
 	color = _stream->readUint16LE();
 	color += _stream->readByte() << 16;
 	if (color != _transColor)
-		color += 255 << 24;
+		color += 255u << 24;
 	else
 		color = 0;
 	block.b2 = color;




More information about the Scummvm-git-logs mailing list