IPHONE: Silence a few signed/unsigned integer comparison warnings.

scummvm · Feb 23, 2012 · e00fc73 · e00fc73
1 parent 99ffbfe
commit e00fc73
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/backends/platform/iphone/iphone_common.h b/backends/platform/iphone/iphone_common.h
@@ -57,16 +57,16 @@ enum GraphicsModes {
 
 struct VideoContext {
 	// Game screen state
-	int screenWidth, screenHeight;
+	uint screenWidth, screenHeight;
 
 	// Overlay state
 	bool overlayVisible;
-	int overlayWidth, overlayHeight;
+	uint overlayWidth, overlayHeight;
 
 	// Mouse cursor state
-	int mouseX, mouseY;
+	uint mouseX, mouseY;
 	int mouseHotspotX, mouseHotspotY;
-	int mouseWidth, mouseHeight;
+	uint mouseWidth, mouseHeight;
 	bool mouseIsVisible;
 
 	// Misc state

diff --git a/backends/platform/iphone/osys_video.mm b/backends/platform/iphone/osys_video.mm
@@ -137,11 +137,11 @@
 		y = 0;
 	}
 
-	if (w > _videoContext.screenWidth - x) {
+	if (w > (int)_videoContext.screenWidth - x) {
 		w = _videoContext.screenWidth - x;
 	}
 
-	if (h > _videoContext.screenHeight - y) {
+	if (h > (int)_videoContext.screenHeight - y) {
 		h = _videoContext.screenHeight - y;
 	}
 
@@ -154,7 +154,7 @@
 
 
 	byte *dst = _gameScreenRaw + y * _videoContext.screenWidth + x;
-	if (_videoContext.screenWidth == pitch && pitch == w)
+	if ((int)_videoContext.screenWidth == pitch && pitch == w)
 		memcpy(dst, buf, h * w);
 	else {
 		do {
@@ -300,10 +300,10 @@
 		y = 0;
 	}
 
-	if (w > _videoContext.overlayWidth - x)
+	if (w > (int)_videoContext.overlayWidth - x)
 		w = _videoContext.overlayWidth - x;
 
-	if (h > _videoContext.overlayHeight - y)
+	if (h > (int)_videoContext.overlayHeight - y)
 		h = _videoContext.overlayHeight - y;
 
 	if (w <= 0 || h <= 0)
@@ -314,7 +314,7 @@
 	}
 
 	OverlayColor *dst = _overlayBuffer + (y * _videoContext.overlayWidth + x);
-	if (_videoContext.overlayWidth == pitch && pitch == w)
+	if ((int)_videoContext.overlayWidth == pitch && pitch == w)
 		memcpy(dst, buf, h * w * sizeof(OverlayColor));
 	else {
 		do {