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

Add colormap2rgba() helper function in gif_format.cpp

Browse Source
This commit is contained in:
David Capello 2015-09-24 23:45:10 -03:00
parent e47fa9f045
commit 8db6693136
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,6 +155,13 @@ static void process_disposal_method(const Image* previous,
}
}
static inline doc::color_t colormap2rgba(ColorMapObject* colormap, int i) {
return doc::rgba(
colormap->Colors[i].Red,
colormap->Colors[i].Green,
colormap->Colors[i].Blue, 255);
}
// Decodes a GIF file trying to keep the image in Indexed format. If
// it's not possible to handle it as Indexed (e.g. it contains more
// than 256 colors), the file will be automatically converted to RGB.
@ -511,6 +518,7 @@ private:
continue;
int j = -1;
if (m_frameNum > 0) {
j = oldPalette.findExactMatch(
colormap->Colors[i].Red,
@ -521,11 +529,7 @@ private:
if (j < 0) {
j = base++;
palette->setEntry(
j, rgba(
colormap->Colors[i].Red,
colormap->Colors[i].Green,
colormap->Colors[i].Blue, 255));
palette->setEntry(j, colormap2rgba(colormap, i));
}
m_remap.map(i, j);
}
@ -691,10 +695,7 @@ private:
Palette newPalette(0, colormap->ColorCount);
for (int i=0; i<colormap->ColorCount; ++i) {
newPalette.setEntry(
i, rgba(colormap->Colors[i].Red,
colormap->Colors[i].Green,
colormap->Colors[i].Blue, 255));
newPalette.setEntry(i, colormap2rgba(colormap, i));;
}
Remap remap = create_remap_to_change_palette(