[Scummvm-cvs-logs] scummvm master -> 21a8166922fb7e2b04734199944bb059a322e3b2

digitall dgturner at iee.org
Fri Nov 23 19:39:04 CET 2012


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:
21a8166922 N64: Remove remaining signed-unsigned compiler warning.


Commit: 21a8166922fb7e2b04734199944bb059a322e3b2
    https://github.com/scummvm/scummvm/commit/21a8166922fb7e2b04734199944bb059a322e3b2
Author: D G Turner (digitall at scummvm.org)
Date: 2012-11-23T10:37:07-08:00

Commit Message:
N64: Remove remaining signed-unsigned compiler warning.

Changed paths:
    backends/platform/n64/osys_n64_base.cpp



diff --git a/backends/platform/n64/osys_n64_base.cpp b/backends/platform/n64/osys_n64_base.cpp
index 7a70229..1e2aca9 100644
--- a/backends/platform/n64/osys_n64_base.cpp
+++ b/backends/platform/n64/osys_n64_base.cpp
@@ -725,7 +725,7 @@ void OSystem_N64::copyRectToOverlay(const void *buf, int pitch, int x, int y, in
 
 	uint16 *dst = _overlayBuffer + (y * _overlayWidth + x);
 
-	if (_overlayWidth == w && pitch == _overlayWidth * sizeof(uint16)) {
+	if (_overlayWidth == (uint16)w && (uint16)pitch == _overlayWidth * sizeof(uint16)) {
 		memcpy(dst, src, h * pitch);
 	} else {
 		do {






More information about the Scummvm-git-logs mailing list