diff options
| author | D G Turner | 2019-10-03 04:42:44 +0100 |
|---|---|---|
| committer | D G Turner | 2019-10-03 04:42:44 +0100 |
| commit | e97985e88719e734619857dc101646e135d6fd42 (patch) | |
| tree | 0d24b8d9710f06f1cb11998d2bf339ab42769f7a /graphics/nine_patch.cpp | |
| parent | e698625916cbdbb8a7d1a058923ee5cf618e45d9 (diff) | |
| download | scummvm-rg350-e97985e88719e734619857dc101646e135d6fd42.tar.gz scummvm-rg350-e97985e88719e734619857dc101646e135d6fd42.tar.bz2 scummvm-rg350-e97985e88719e734619857dc101646e135d6fd42.zip | |
GRAPHICS: Further Fix for MSVC Warnings in Nine Patch Code
Diffstat (limited to 'graphics/nine_patch.cpp')
| -rw-r--r-- | graphics/nine_patch.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/graphics/nine_patch.cpp b/graphics/nine_patch.cpp index 75f3a6e1e2..429247b4a4 100644 --- a/graphics/nine_patch.cpp +++ b/graphics/nine_patch.cpp @@ -271,8 +271,6 @@ 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) { @@ -280,7 +278,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, color, + Graphics::FLIP_NONE, &r, TS_ARGB((uint)255, (uint)255, (uint)255, (uint)255), _h._m[j]->dest_length, _v._m[i]->dest_length); } } @@ -308,8 +306,6 @@ 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) { @@ -317,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, color, + Graphics::FLIP_NONE, &r, TS_ARGB((uint)255, (uint)255, (uint)255, (uint)255), _h._m[j]->dest_length, _v._m[i]->dest_length); } } |