[Scummvm-git-logs] scummvm master -> abf9788d5178006af8226507658c6c2c925a204d

[digitall]

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:
eab82da166 3DS: Resolve leftover signedness issues
2a228ccfcd SWORD25: Resolve leftover signedness issues
abf9788d51 TITANIC: Resolve leftover signedness issues


Commit: eab82da1662cf0374cd1e31d12ab0cf235f9e108
    https://github.com/scummvm/scummvm/commit/eab82da1662cf0374cd1e31d12ab0cf235f9e108
Author: Michael Ball (ballm4788 at gmail.com)
Date: 2021-07-09T00:02:36+01:00

Commit Message:
3DS: Resolve leftover signedness issues

Resolves leftover signedness issues to conform to baccbedf50e8d2b08df508170e0c0a4b25b8b0b6.

Changed paths:
    backends/platform/3ds/osystem-graphics.cpp


diff --git a/backends/platform/3ds/osystem-graphics.cpp b/backends/platform/3ds/osystem-graphics.cpp
index 85c9cbd8fa..fe584522ac 100644
--- a/backends/platform/3ds/osystem-graphics.cpp
+++ b/backends/platform/3ds/osystem-graphics.cpp
@@ -769,7 +769,7 @@ void OSystem_3DS::setMouseCursor(const void *buf, uint w, uint h,
 	_cursorKeyColor = keycolor;
 	_pfCursor = !format ? Graphics::PixelFormat::createFormatCLUT8() : *format;
 
-	if (w != _cursor.w || h != _cursor.h || _cursor.format != _pfCursor) {
+	if (w != (uint)_cursor.w || h != (uint)_cursor.h || _cursor.format != _pfCursor) {
 		_cursor.create(w, h, _pfCursor);
 		_cursorTexture.create(w, h, &DEFAULT_MODE);
 	}
@@ -800,11 +800,11 @@ void applyKeyColor(Graphics::Surface *src, Graphics::Surface *dst, const SrcColo
 	assert(dst->format.bytesPerPixel == 4);
 	assert((dst->w >= src->w) && (dst->h >= src->h));
 
-	for (uint y = 0; y < src->h; ++y) {
+	for (uint y = 0; y < (uint)src->h; ++y) {
 		SrcColor *srcPtr = (SrcColor *)src->getBasePtr(0, y);
 		uint32 *dstPtr = (uint32 *)dst->getBasePtr(0, y);
 
-		for (uint x = 0; x < src->w; ++x) {
+		for (uint x = 0; x < (uint)src->w; ++x) {
 			const SrcColor color = *srcPtr++;
 
 			if (color == keyColor) {


Commit: 2a228ccfcd7715e5639748fb9eb5671f9bdc3e09
    https://github.com/scummvm/scummvm/commit/2a228ccfcd7715e5639748fb9eb5671f9bdc3e09
Author: Michael Ball (ballm4788 at gmail.com)
Date: 2021-07-09T00:02:36+01:00

Commit Message:
SWORD25: Resolve leftover signedness issues

Resolves leftover signedness issues to conform to baccbedf50e8d2b08df508170e0c0a4b25b8b0b6.

Changed paths:
    engines/sword25/gfx/screenshot.cpp


diff --git a/engines/sword25/gfx/screenshot.cpp b/engines/sword25/gfx/screenshot.cpp
index 7766d98a2e..918436da73 100644
--- a/engines/sword25/gfx/screenshot.cpp
+++ b/engines/sword25/gfx/screenshot.cpp
@@ -106,7 +106,7 @@ Common::SeekableReadStream *Screenshot::createThumbnail(Graphics::Surface *data)
 
 		// Move to next block
 		++x;
-		if (x == thumbnail.w) {
+		if (x == (uint)thumbnail.w) {
 			x = 0;
 			++y;
 		}


Commit: abf9788d5178006af8226507658c6c2c925a204d
    https://github.com/scummvm/scummvm/commit/abf9788d5178006af8226507658c6c2c925a204d
Author: Michael Ball (ballm4788 at gmail.com)
Date: 2021-07-09T00:02:36+01:00

Commit Message:
TITANIC: Resolve leftover signedness issues

Resolves leftover signedness issues to conform to baccbedf50e8d2b08df508170e0c0a4b25b8b0b6.

Changed paths:
    engines/titanic/support/avi_surface.cpp


diff --git a/engines/titanic/support/avi_surface.cpp b/engines/titanic/support/avi_surface.cpp
index 592c2de780..e0949de4e5 100644
--- a/engines/titanic/support/avi_surface.cpp
+++ b/engines/titanic/support/avi_surface.cpp
@@ -328,11 +328,11 @@ void AVISurface::copyMovieFrame(const Graphics::Surface &src, Graphics::ManagedS
 		assert(src.format.bytesPerPixel == 4 && dest.format.bytesPerPixel == 2);
 		uint16 transPixel = _videoSurface->getTransparencyColor();
 
-		for (int y = 0; y < MIN(src.h, dest.h); ++y) {
+		for (uint y = 0; y < (uint)MIN(src.h, dest.h); ++y) {
 			const uint32 *pSrc = (const uint32 *)src.getBasePtr(0, y);
 			uint16 *pDest = (uint16 *)dest.getBasePtr(0, y);
 
-			for (int x = 0; x < MIN(src.w, dest.w); ++x, ++pSrc, ++pDest) {
+			for (uint x = 0; x < (uint)MIN(src.w, dest.w); ++x, ++pSrc, ++pDest) {
 				src.format.colorToARGB(*pSrc, a, r, g, b);
 				assert(a == 0 || a == 0xff);