[Scummvm-cvs-logs] scummvm master -> 2c96073650013f982bf4e550fd32e45bfa9be0c3

[eriktorbjorn]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
5cae160ad7 GRAPHCIS: Remove unused variable
2c96073650 GRAPHICS: Fix GCC signed/unsigned warning


Commit: 5cae160ad74e16b6026eb2a55ba3519a21bee22d
    https://github.com/scummvm/scummvm/commit/5cae160ad74e16b6026eb2a55ba3519a21bee22d
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2016-05-29T22:54:44+02:00

Commit Message:
GRAPHCIS: Remove unused variable

Changed paths:
    graphics/nine_patch.cpp



diff --git a/graphics/nine_patch.cpp b/graphics/nine_patch.cpp
index fea0d8a..18237ff 100644
--- a/graphics/nine_patch.cpp
+++ b/graphics/nine_patch.cpp
@@ -61,11 +61,11 @@ NinePatchSide::~NinePatchSide() {
 bool NinePatchSide::init(Graphics::TransparentSurface *bmp, bool vertical) {
 	const int len = vertical ? bmp->h : bmp->w;
 	int i;
-	int s, t, n, z;
+	int s, t, z;
 
 	_m.clear();
 
-	for (i = 1, s = -1, t = 0, n = 0, z = -1; i < len; ++i) {
+	for (i = 1, s = -1, t = 0, z = -1; i < len; ++i) {
 		int zz;
 		uint8 r, g, b, a;
 		uint32 *color = vertical ? (uint32 *)bmp->getBasePtr(0, i) : (uint32 *)bmp->getBasePtr(i, 0);


Commit: 2c96073650013f982bf4e550fd32e45bfa9be0c3
    https://github.com/scummvm/scummvm/commit/2c96073650013f982bf4e550fd32e45bfa9be0c3
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2016-05-29T22:58:01+02:00

Commit Message:
GRAPHICS: Fix GCC signed/unsigned warning

Changed paths:
    graphics/nine_patch.cpp



diff --git a/graphics/nine_patch.cpp b/graphics/nine_patch.cpp
index 18237ff..a193200 100644
--- a/graphics/nine_patch.cpp
+++ b/graphics/nine_patch.cpp
@@ -59,8 +59,8 @@ NinePatchSide::~NinePatchSide() {
 
 
 bool NinePatchSide::init(Graphics::TransparentSurface *bmp, bool vertical) {
-	const int len = vertical ? bmp->h : bmp->w;
-	int i;
+	const uint len = vertical ? bmp->h : bmp->w;
+	uint i;
 	int s, t, z;
 
 	_m.clear();