Merge default branch

--HG--
branch : minor
This commit is contained in:
vrld
2012-11-23 10:24:46 +01:00
8 changed files with 384 additions and 88 deletions
+1 -1
View File
@@ -145,7 +145,7 @@ void ImageData::paste(ImageData *src, int dx, int dy, int sx, int sy, int sw, in
if (sw == getWidth() && getWidth() == src->getWidth()
&& sh == getHeight() && getHeight() == src->getHeight())
memcpy(d, s, sizeof(pixel) * sw * sh);
else if (sw > 0 && sh > 0) // Otherwise, copy each row individually
else if (sw > 0) // Otherwise, copy each row individually
{
for (int i = 0; i < sh; i++)
{