LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-14 10:13:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix ImageData:paste optimization, missing dy and sy and check of sw and sh

Browse Source
This commit is contained in:
Bart van Strien
2012-02-26 18:24:14 +01:00
parent 0c9d8f3c41
commit 4ee7e780e7
1 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/image/ImageData.cpp
+29 -29
View File
@@ -24,38 +24,38 @@ namespace love
{
namespace image
{
void ImageData::paste(ImageData * src, int dx, int dy, int sx, int sy, int sw, int sh)
{
pixel * s = (pixel *)src->getData();
pixel * d = (pixel *)getData();
void ImageData::paste(ImageData * src, int dx, int dy, int sx, int sy, int sw, int sh)
{
pixel * s = (pixel *)src->getData();
pixel * d = (pixel *)getData();
// Check bounds; if the data ends up completely out of bounds, get out early.
if (sx >= src->getWidth() || sx + sw < 0 || sy >= src->getHeight() || sy + sh < 0
|| dx >= getWidth() || dx + sw < 0 || dy >= getHeight() || dy + sh < 0)
return;
// Check bounds; if the data ends up completely out of bounds, get out early.
if (sx >= src->getWidth() || sx + sw < 0 || sy >= src->getHeight() || sy + sh < 0
|| dx >= getWidth() || dx + sw < 0 || dy >= getHeight() || dy + sh < 0)
return;
// Normalize values to the inside of both images.
if (dx < 0) { sw += dx; sx -= dx; dx = 0; }
if (dy < 0) { sh += dy; sy -= dy; dy = 0; }
if (sx < 0) { sw += sx; dx -= sx; sx = 0; }
if (sy < 0) { sh += sy; dy -= sy; sy = 0; }
if (dx + sw > getWidth()) { sw = getWidth() - dx; }
if (dy + sh > getHeight()) { sh = getHeight() - dy; }
if (sx + sw > src->getWidth()) { sw = src->getWidth() - sx; }
if (sy + sh > src->getHeight()) { sh = src->getHeight() - sy; }
// Normalize values to the inside of both images.
if (dx < 0) { sw += dx; sx -= dx; dx = 0; }
if (dy < 0) { sh += dy; sy -= dy; dy = 0; }
if (sx < 0) { sw += sx; dx -= sx; sx = 0; }
if (sy < 0) { sh += sy; dy -= sy; sy = 0; }
if (dx + sw > getWidth()) { sw = getWidth() - dx; }
if (dy + sh > getHeight()) { sh = getHeight() - dy; }
if (sx + sw > src->getWidth()) { sw = src->getWidth() - sx; }
if (sy + sh > src->getHeight()) { sh = src->getHeight() - sy; }
// If the dimensions match up, copy the entire memory stream in one go
if (sw == getWidth() && getWidth() == src->getWidth()
&& sh == getHeight() && getHeight() == src->getHeight())
memcpy(d, s, sizeof(pixel) * sw * sh);
else // Otherwise, copy each row individually
{
for (int i = 0; i < sh; i++)
{
memcpy(d + dx + i * getWidth(), s + sx + i * src->getWidth(), sizeof(pixel) * sw);
}
}
}
// If the dimensions match up, copy the entire memory stream in one go
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
{
for (int i = 0; i < sh; i++)
{
memcpy(d + dx + (i + dy) * getWidth(), s + sx + (i + sy) * src->getWidth(), sizeof(pixel) * sw);
}
}
}
bool ImageData::inside(int x, int y) const
{