[Scummvm-cvs-logs] scummvm master -> 6f7b0311afbd4df63aa9ac7b8604758286b1ae71

eriktorbjorn eriktorbjorn at telia.com
Mon Mar 2 08:39:45 CET 2015


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:
6f7b0311af GRAPHICS: Fix GCC signed/unsigned warnings.


Commit: 6f7b0311afbd4df63aa9ac7b8604758286b1ae71
    https://github.com/scummvm/scummvm/commit/6f7b0311afbd4df63aa9ac7b8604758286b1ae71
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2015-03-02T08:38:33+01:00

Commit Message:
GRAPHICS: Fix GCC signed/unsigned warnings.

Changed paths:
    graphics/fonts/ttf.cpp



diff --git a/graphics/fonts/ttf.cpp b/graphics/fonts/ttf.cpp
index ba57613..7373a96 100644
--- a/graphics/fonts/ttf.cpp
+++ b/graphics/fonts/ttf.cpp
@@ -474,11 +474,11 @@ bool TTFFont::cacheGlyph(Glyph &glyph, uint32 chr) const {
 
 	switch (bitmap.pixel_mode) {
 	case FT_PIXEL_MODE_MONO:
-		for (int y = 0; y < bitmap.rows; ++y) {
+		for (uint y = 0; y < bitmap.rows; ++y) {
 			const uint8 *curSrc = src;
 			uint8 mask = 0;
 
-			for (int x = 0; x < bitmap.width; ++x) {
+			for (uint x = 0; x < bitmap.width; ++x) {
 				if ((x % 8) == 0)
 					mask = *curSrc++;
 
@@ -494,7 +494,7 @@ bool TTFFont::cacheGlyph(Glyph &glyph, uint32 chr) const {
 		break;
 
 	case FT_PIXEL_MODE_GRAY:
-		for (int y = 0; y < bitmap.rows; ++y) {
+		for (uint y = 0; y < bitmap.rows; ++y) {
 			memcpy(dst, src, bitmap.width);
 			dst += glyph.image.pitch;
 			src += srcPitch;






More information about the Scummvm-git-logs mailing list