summaryrefslogtreecommitdiff
path: root/src/resources/image.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-07-02 04:36:59 +0300
committerAndrei Karas <akaras@inbox.ru>2011-07-02 04:37:42 +0300
commitca58a3cced99fc2a8989da0155c1927bc0f08b6f (patch)
treec8fc16ac2c5c0a9184c17c2920266b96934ed28f /src/resources/image.cpp
parentd4dd89e72f8b1e2c0517981f7e3ffac4a040f9fa (diff)
downloadmv-ca58a3cced99fc2a8989da0155c1927bc0f08b6f.tar.gz
mv-ca58a3cced99fc2a8989da0155c1927bc0f08b6f.tar.bz2
mv-ca58a3cced99fc2a8989da0155c1927bc0f08b6f.tar.xz
mv-ca58a3cced99fc2a8989da0155c1927bc0f08b6f.zip
Replace some getters to direct member access in Image class.
Diffstat (limited to 'src/resources/image.cpp')
-rw-r--r--src/resources/image.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index ec74630ff..2d3676304 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -386,8 +386,10 @@ Image* Image::SDLmerge(Image *image, int x, int y)
SDL_LockSurface(mSDLSurface);
const int x0 = (y * getWidth()) + x;
- const int maxX = std::min(image->getWidth(), getWidth() - x);
- const int maxY = std::min(image->getHeight(), getHeight() - y);
+ const int maxX = std::min(image->mBounds.w,
+ static_cast<Uint16>(mBounds.w - x));
+ const int maxY = std::min(image->mBounds.w,
+ static_cast<Uint16>(mBounds.h - y));
// for each pixel lines of a source image
for (offset_x = (x > 0 ? 0 : -x); offset_x < maxX; offset_x++)