From c0fa27beffa03ab16cea8eb60b1323c9c6182710 Mon Sep 17 00:00:00 2001 From: Wenzel Jakob Date: Fri, 4 Jan 2013 13:28:58 -0500 Subject: [PATCH] bugfix for the previous commit --- src/libcore/bitmap.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libcore/bitmap.cpp b/src/libcore/bitmap.cpp index 0419ff54..4c8d651a 100644 --- a/src/libcore/bitmap.cpp +++ b/src/libcore/bitmap.cpp @@ -448,7 +448,7 @@ void Bitmap::accumulate(const Bitmap *bitmap, Point2i sourceOffset, Vector2i sizeDecrease( std::max(0, std::max(sourceOffset.x + size.x - bitmap->getWidth(), targetOffset.x + size.x - getWidth())), - std::max(0, std::max(sourceOffset.y + size.y - bitmap->getWidth(), targetOffset.y + size.y - getWidth()))); + std::max(0, std::max(sourceOffset.y + size.y - bitmap->getHeight(), targetOffset.y + size.y - getHeight()))); size -= sizeDecrease;