mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-04 05:50:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce memory usage for RotSprite algorithm (fix #691)

Browse Source
This commit is contained in:
David Capello 2015-06-20 01:59:15 -03:00
parent 5b17f44526
commit 77fefa8ec0
2 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/doc/algorithm/rotate.cpp
View File

@ -40,11 +40,21 @@ static void image_scale_tpl(Image* dst, const Image* src, int x, int y, int w, i
int src_w = src->width();
int src_h = src->height();
for (int v=0; v<h; ++v) {
for (int u=0; u<w; ++u) {
color_t c = get_pixel_fast<ImageTraits>(src, src_w*u/w, src_h*v/h);
put_pixel_fast<ImageTraits>(dst, x+u, y+v,
blend(get_pixel_fast<ImageTraits>(dst, x+u, y+v), c));
gfx::Clip clip(x, y, 0, 0, w, h);
if (!clip.clip(dst->width(), dst->height(), src->width(), src->height()))
return;
typename LockImageBits<ImageTraits> dst_bits(dst, clip.dstBounds());
typename LockImageBits<ImageTraits>::iterator dst_it = dst_bits.begin();
for (int v=0; v<clip.size.h; ++v) {
for (int u=0; u<clip.size.w; ++u) {
color_t src_color =
get_pixel_fast<ImageTraits>(src,
src_w*(clip.src.x+u)/w,
src_h*(clip.src.y+v)/h);
*dst_it = blend(*dst_it, src_color);
++dst_it;
}
}
}

18
src/doc/algorithm/rotsprite.cpp
View File

@ -160,8 +160,15 @@ void rotsprite_image(Image* bmp, Image* spr,
if (!buf2) buf2.reset(new ImageBuffer(1));
if (!buf3) buf3.reset(new ImageBuffer(1));
int xmin = MIN(x1, MIN(x2, MIN(x3, x4)));
int xmax = MAX(x1, MAX(x2, MAX(x3, x4)));
int ymin = MIN(y1, MIN(y2, MIN(y3, y4)));
int ymax = MAX(y1, MAX(y2, MAX(y3, y4)));
int rot_width = xmax - xmin + 1;
int rot_height = ymax - ymin + 1;
int scale = 8;
base::UniquePtr<Image> bmp_copy(Image::create(bmp->pixelFormat(), bmp->width()*scale, bmp->height()*scale, buf1));
base::UniquePtr<Image> bmp_copy(Image::create(bmp->pixelFormat(), rot_width*scale, rot_height*scale, buf1));
base::UniquePtr<Image> tmp_copy(Image::create(spr->pixelFormat(), spr->width()*scale, spr->height()*scale, buf2));
base::UniquePtr<Image> spr_copy(Image::create(spr->pixelFormat(), spr->width()*scale, spr->height()*scale, buf3));
@ -181,12 +188,13 @@ void rotsprite_image(Image* bmp, Image* spr,
spr_copy->copy(tmp_copy, gfx::Clip(tmp_copy->bounds()));
}
doc::algorithm::parallelogram(bmp_copy, spr_copy,
x1*scale, y1*scale, x2*scale, y2*scale,
x3*scale, y3*scale, x4*scale, y4*scale);
doc::algorithm::parallelogram(
bmp_copy, spr_copy,
(x1-xmin)*scale, (y1-ymin)*scale, (x2-xmin)*scale, (y2-ymin)*scale,
(x3-xmin)*scale, (y3-ymin)*scale, (x4-xmin)*scale, (y4-ymin)*scale);
doc::algorithm::scale_image(bmp, bmp_copy,
0, 0, bmp->width(), bmp->height());
xmin, ymin, bmp_copy->width()/scale, bmp_copy->height()/scale);
}
} // namespace algorithm