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

Fix creation of local colormaps in GifFormat::onSave()

Browse Source
This commit is contained in:
David Capello 2015-07-17 12:45:59 -03:00
parent cb867b7f84
commit ae2f04f855
1 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -656,6 +656,18 @@ bool GifFormat::onLoad(FileOp* fop)
} }
#ifdef ENABLE_SAVE #ifdef ENABLE_SAVE
static int next_power_of_two(int color_map_size)
{
for (int i = 30; i >= 0; --i) {
if (color_map_size & (1 << i)) {
color_map_size = (1 << (i + (color_map_size & (1 << (i - 1)) ? 1: 0)));
break;
}
}
ASSERT(color_map_size > 0 && color_map_size <= 256);
return color_map_size;
}
bool GifFormat::onSave(FileOp* fop) bool GifFormat::onSave(FileOp* fop)
{ {
#if GIFLIB_MAJOR >= 5 #if GIFLIB_MAJOR >= 5
@ -686,15 +698,7 @@ bool GifFormat::onSave(FileOp* fop)
RgbMap rgbmap; RgbMap rgbmap;
// The color map must be a power of two. // The color map must be a power of two.
int color_map_size = current_palette.size(); int color_map_size = next_power_of_two(current_palette.size());
for (int i = 30; i >= 0; --i) {
if (color_map_size & (1 << i)) {
color_map_size = (1 << (i + (color_map_size & (1 << (i - 1)) ? 1: 0)));
break;
}
}
ASSERT(color_map_size > 0 && color_map_size <= 256);
ColorMapObject* color_map = NULL; ColorMapObject* color_map = NULL;
int bpp; int bpp;
@ -704,16 +708,16 @@ bool GifFormat::onSave(FileOp* fop)
if (color_map == NULL) if (color_map == NULL)
throw std::bad_alloc(); throw std::bad_alloc();
int i; for (int i = 0; i < color_map_size; ++i) {
for (i = 0; i < current_palette.size(); ++i) { color_t color;
color_map->Colors[i].Red = rgba_getr(current_palette.getEntry(i)); if (i < current_palette.size())
color_map->Colors[i].Green = rgba_getg(current_palette.getEntry(i)); color = current_palette.getEntry(i);
color_map->Colors[i].Blue = rgba_getb(current_palette.getEntry(i)); else
} color = rgba(0, 0, 0, 255);
for (; i < color_map_size; ++i) {
color_map->Colors[i].Red = 0; color_map->Colors[i].Red = rgba_getr(color);
color_map->Colors[i].Green = 0; color_map->Colors[i].Green = rgba_getg(color);
color_map->Colors[i].Blue = 0; color_map->Colors[i].Blue = rgba_getb(color);
} }
bpp = color_map->BitsPerPixel; bpp = color_map->BitsPerPixel;
@ -884,15 +888,22 @@ bool GifFormat::onSave(FileOp* fop)
if ((!color_map && frame_num == 0) || if ((!color_map && frame_num == 0) ||
(current_palette.countDiff(&previous_palette, NULL, NULL) > 0)) { (current_palette.countDiff(&previous_palette, NULL, NULL) > 0)) {
if (!image_color_map) { if (!image_color_map) {
image_color_map = GifMakeMapObject(current_palette.size(), NULL); color_map_size = next_power_of_two(current_palette.size());
image_color_map = GifMakeMapObject(color_map_size, NULL);
if (image_color_map == NULL) if (image_color_map == NULL)
throw std::bad_alloc(); throw std::bad_alloc();
} }
for (int i = 0; i < current_palette.size(); ++i) { for (int i = 0; i < color_map_size; ++i) {
image_color_map->Colors[i].Red = rgba_getr(current_palette.getEntry(i)); color_t color;
image_color_map->Colors[i].Green = rgba_getg(current_palette.getEntry(i)); if (i < current_palette.size())
image_color_map->Colors[i].Blue = rgba_getb(current_palette.getEntry(i)); color = current_palette.getEntry(i);
else
color = rgba(0, 0, 0, 255);
image_color_map->Colors[i].Red = rgba_getr(color);
image_color_map->Colors[i].Green = rgba_getg(color);
image_color_map->Colors[i].Blue = rgba_getb(color);
} }
current_palette.copyColorsTo(&previous_palette); current_palette.copyColorsTo(&previous_palette);