[Scummvm-git-logs] scummvm master -> 016152971ade687e7f250bbae262b80a50f19295

[aquadran]

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:
016152971a IOS: Fixed compiler warnings


Commit: 016152971ade687e7f250bbae262b80a50f19295
    https://github.com/scummvm/scummvm/commit/016152971ade687e7f250bbae262b80a50f19295
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2022-03-06T09:19:54+01:00

Commit Message:
IOS: Fixed compiler warnings

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 07083d78969..7171fc4bd3d 100644
--- a/backends/platform/ios7/ios7_osys_video.mm
+++ b/backends/platform/ios7/ios7_osys_video.mm
@@ -385,8 +385,8 @@ void OSystem_iOS7::clearOverlay() {
 
 void OSystem_iOS7::grabOverlay(Graphics::Surface &surface) {
 	//printf("grabOverlay()\n");
-	assert(surface.w >= _videoContext->overlayWidth);
-	assert(surface.h >= _videoContext->overlayHeight);
+	assert(surface.w >= (int16)_videoContext->overlayWidth);
+	assert(surface.h >= (int16)_videoContext->overlayHeight);
 	assert(surface.format.bytesPerPixel == sizeof(uint16));
 
 	const byte *src = (const byte *)_videoContext->overlayTexture.getPixels();
@@ -491,7 +491,7 @@ void OSystem_iOS7::setMouseCursor(const void *buf, uint w, uint h, int hotspotX,
 #endif
 	assert(pixelFormat.bytesPerPixel == 1 || pixelFormat.bytesPerPixel == 2 || pixelFormat.bytesPerPixel == 4);
 
-	if (_mouseBuffer.w != w || _mouseBuffer.h != h || _mouseBuffer.format != pixelFormat || !_mouseBuffer.getPixels())
+	if (_mouseBuffer.w != (int16)w || _mouseBuffer.h != (int16)h || _mouseBuffer.format != pixelFormat || !_mouseBuffer.getPixels())
 		_mouseBuffer.create(w, h, pixelFormat);
 
 	_videoContext->mouseWidth = w;
@@ -524,8 +524,8 @@ void OSystem_iOS7::setCursorPalette(const byte *colors, uint start, uint num) {
 }
 
 void OSystem_iOS7::updateMouseTexture() {
-	uint texWidth = getSizeNextPOT(_videoContext->mouseWidth);
-	uint texHeight = getSizeNextPOT(_videoContext->mouseHeight);
+	int texWidth = getSizeNextPOT(_videoContext->mouseWidth);
+	int texHeight = getSizeNextPOT(_videoContext->mouseHeight);
 
 	Graphics::Surface &mouseTexture = _videoContext->mouseTexture;
 	if (mouseTexture.w != texWidth || mouseTexture.h != texHeight)
@@ -557,9 +557,9 @@ void OSystem_iOS7::updateMouseTexture() {
 
 			uint8 *dstRaw = (uint8 *)mouseTexture.getPixels();
 
-			for (uint y = 0; y < _mouseBuffer.h; ++y, dstRaw += mouseTexture.pitch) {
+			for (int y = 0; y < _mouseBuffer.h; ++y, dstRaw += mouseTexture.pitch) {
 				uint16 *dst = (uint16 *)dstRaw;
-				for (uint x = 0; x < _mouseBuffer.w; ++x, ++dst, src += srcBpp) {
+				for (int x = 0; x < _mouseBuffer.w; ++x, ++dst, src += srcBpp) {
 					if (
 						(srcBpp == 2 && *((const uint16*)src) == _mouseKeyColor) ||
 						(srcBpp == 4 && *((const uint32*)src) == _mouseKeyColor)