mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-20 04:20:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug in fixup_image_transparent_colors(): reading pixels out of bounds

Browse Source
This commit is contained in:
David Capello 2013-12-29 21:19:32 -03:00
parent f8e8657093
commit 0fa2842e40
1 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/raster/algorithm/resize_image.cpp
View File

@ -150,7 +150,7 @@ void resize_image(const Image* src, Image* dst, ResizeMethod method, const Palet
void fixup_image_transparent_colors(Image* image)
{
int x, y, u, v;
int x, y;
switch (image->getPixelFormat()) {
@ -168,20 +168,17 @@ void fixup_image_transparent_colors(Image* image)
count = 0;
r = g = b = 0;
LockImageBits<RgbTraits>::iterator it2 =
bits.begin_area(gfx::Rect(x-1, y-1, 3, 3));
gfx::Rect area = gfx::Rect(x-1, y-1, 3, 3).createIntersect(image->getBounds());
LockImageBits<RgbTraits>::iterator it2 = bits.begin_area(area);
LockImageBits<RgbTraits>::iterator end2 = bits.end_area(area);
for (v=y-1; v<=y+1; ++v) {
for (u=x-1; u<=x+1; ++u, ++it2) {
if ((u >= 0) && (v >= 0) && (u < image->getWidth()) && (v < image->getHeight())) {
c = *it2;
if (rgba_geta(c) > 0) {
r += rgba_getr(c);
g += rgba_getg(c);
b += rgba_getb(c);
++count;
}
}
for (; it2 != end2; ++it2) {
c = *it2;
if (rgba_geta(c) > 0) {
r += rgba_getr(c);
g += rgba_getg(c);
b += rgba_getb(c);
++count;
}
}
@ -211,18 +208,15 @@ void fixup_image_transparent_colors(Image* image)
count = 0;
k = 0;
LockImageBits<GrayscaleTraits>::iterator it2 =
bits.begin_area(gfx::Rect(x-1, y-1, 3, 3));
gfx::Rect area = gfx::Rect(x-1, y-1, 3, 3).createIntersect(image->getBounds());
LockImageBits<GrayscaleTraits>::iterator it2 = bits.begin_area(area);
LockImageBits<GrayscaleTraits>::iterator end2 = bits.end_area(area);
for (v=y-1; v<=y+1; ++v) {
for (u=x-1; u<=x+1; ++u, ++it2) {
if ((u >= 0) && (v >= 0) && (u < image->getWidth()) && (v < image->getHeight())) {
c = *it2;
if (graya_geta(c) > 0) {
k += graya_getv(c);
++count;
}
}
for (; it2 != end2; ++it2) {
c = *it2;
if (graya_geta(c) > 0) {
k += graya_getv(c);
++count;
}
}