mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-06 06:58:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

GifEncoder: replace get/put_pixe_fast with iterators

Browse Source
This commit is contained in:
David Capello 2017-09-26 17:58:55 -03:00
parent 9ca6f24027
commit e14b4caa78
1 changed files with 42 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/app/file/gif_format.cpp
View File

@ -578,29 +578,50 @@ private:
void compositeIndexedImageToIndexed(const gfx::Rect& frameBounds,
const Image* frameImage) {
const LockImageBits<IndexedTraits> srcBits(
frameImage, gfx::Rect(0, 0, frameBounds.w, frameBounds.h));
LockImageBits<IndexedTraits> dstBits(
m_currentImage.get(), frameBounds);
auto srcIt = srcBits.begin();
auto dstIt = dstBits.begin();
// Compose the frame image with the previous frame
for (int y=0; y<frameBounds.h; ++y) {
for (int x=0; x<frameBounds.w; ++x) {
color_t i = get_pixel_fast<IndexedTraits>(frameImage, x, y);
for (int x=0; x<frameBounds.w; ++x, ++srcIt, ++dstIt) {
ASSERT(srcIt != srcBits.end());
ASSERT(dstIt != dstBits.end());
color_t i = *srcIt;
if (int(i) == m_localTransparentIndex)
continue;
i = m_remap[i];
put_pixel_fast<IndexedTraits>(m_currentImage.get(),
frameBounds.x + x,
frameBounds.y + y, i);
*dstIt = i;
}
}
}
void compositeIndexedImageToRgb(const gfx::Rect& frameBounds,
const Image* frameImage) {
const LockImageBits<IndexedTraits> srcBits(
frameImage, gfx::Rect(0, 0, frameBounds.w, frameBounds.h));
LockImageBits<RgbTraits> dstBits(
m_currentImage.get(), frameBounds);
auto srcIt = srcBits.begin();
auto dstIt = dstBits.begin();
ColorMapObject* colormap = getFrameColormap();
// Compose the frame image with the previous frame
for (int y=0; y<frameBounds.h; ++y) {
for (int x=0; x<frameBounds.w; ++x) {
color_t i = get_pixel_fast<IndexedTraits>(frameImage, x, y);
for (int x=0; x<frameBounds.w; ++x, ++srcIt, ++dstIt) {
ASSERT(srcIt != srcBits.end());
ASSERT(dstIt != dstBits.end());
color_t i = *srcIt;
if (int(i) == m_localTransparentIndex)
continue;
@ -609,9 +630,7 @@ private:
colormap->Colors[i].Green,
colormap->Colors[i].Blue, 255);
put_pixel_fast<RgbTraits>(m_currentImage.get(),
frameBounds.x + x,
frameBounds.y + y, i);
*dstIt = i;
}
}
}
@ -1118,13 +1137,19 @@ private:
}
{
LockImageBits<RgbTraits> bits(m_currentImage, frameBounds);
auto it = bits.begin();
for (int y=0; y<frameBounds.h; ++y) {
for (int x=0; x<frameBounds.w; ++x, ++it) {
ASSERT(it != bits.end());
const LockImageBits<RgbTraits> srcBits(m_currentImage, frameBounds);
LockImageBits<IndexedTraits> dstBits(
frameImage.get(), gfx::Rect(0, 0, frameBounds.w, frameBounds.h));
color_t color = *it;
auto srcIt = srcBits.begin();
auto dstIt = dstBits.begin();
for (int y=0; y<frameBounds.h; ++y) {
for (int x=0; x<frameBounds.w; ++x, ++srcIt, ++dstIt) {
ASSERT(srcIt != srcBits.end());
ASSERT(dstIt != dstBits.end());
color_t color = *srcIt;
int i;
if (rgba_geta(color) >= 128) {
@ -1157,7 +1182,7 @@ private:
usedColors.resize(i+1);
usedColors[i] = true;
put_pixel_fast<IndexedTraits>(frameImage.get(), x, y, i);
*dstIt = i;
}
}
}