[Scummvm-git-logs] scummvm master -> d83e0df8f0167b6fa8583cf22dfe8b104d47436f

[digitall]

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:
d83e0df8f0 GRAPHICS: Fix MSVC Warning in Nine Patch


Commit: d83e0df8f0167b6fa8583cf22dfe8b104d47436f
    https://github.com/scummvm/scummvm/commit/d83e0df8f0167b6fa8583cf22dfe8b104d47436f
Author: D G Turner (digitall at scummvm.org)
Date: 2019-09-15T23:24:33+01:00

Commit Message:
GRAPHICS: Fix MSVC Warning in Nine Patch

Changed paths:
    graphics/nine_patch.cpp


diff --git a/graphics/nine_patch.cpp b/graphics/nine_patch.cpp
index ce82fff..d521df9 100644
--- a/graphics/nine_patch.cpp
+++ b/graphics/nine_patch.cpp
@@ -267,6 +267,8 @@ NinePatchBitmap::~NinePatchBitmap() {
 }
 
 void NinePatchBitmap::drawRegions(Graphics::Surface &target, int dx, int dy, int dw, int dh) {
+	uint color = TS_ARGB(255, 255, 255, 255);
+
 	/* draw each region */
 	for (uint i = 0; i < _v._m.size(); ++i) {
 		for (uint j = 0; j < _h._m.size(); ++j) {
@@ -274,7 +276,7 @@ void NinePatchBitmap::drawRegions(Graphics::Surface &target, int dx, int dy, int
 						_h._m[j]->offset + _h._m[j]->length, _v._m[i]->offset + _v._m[i]->length);
 
 			_bmp->blit(target, dx + _h._m[j]->dest_offset, dy + _v._m[i]->dest_offset,
-					Graphics::FLIP_NONE, &r, TS_ARGB(255, 255, 255, 255),
+					Graphics::FLIP_NONE, &r, color,
 					_h._m[j]->dest_length, _v._m[i]->dest_length);
 		}
 	}
@@ -302,6 +304,8 @@ void NinePatchBitmap::blitClip(Graphics::Surface &target, Common::Rect clip, int
 		_cached_dh = dh;
 	}
 
+	uint color = TS_ARGB(255, 255, 255, 255);
+
 	/* draw each region */
 	for (uint i = 0; i < _v._m.size(); ++i) {
 		for (uint j = 0; j < _h._m.size(); ++j) {
@@ -309,7 +313,7 @@ void NinePatchBitmap::blitClip(Graphics::Surface &target, Common::Rect clip, int
 				_h._m[j]->offset + _h._m[j]->length, _v._m[i]->offset + _v._m[i]->length);
 
 			_bmp->blitClip(target, clip, dx + _h._m[j]->dest_offset, dy + _v._m[i]->dest_offset,
-				Graphics::FLIP_NONE, &r, TS_ARGB(255, 255, 255, 255),
+				Graphics::FLIP_NONE, &r, color,
 				_h._m[j]->dest_length, _v._m[i]->dest_length);
 		}
 	}