rvandegrift
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

evas - gif loader - handle missing colormap 

follow on from dd90b6afad - this handled
if a gif file has no colormap (it'll decode as blank now as a colormap
of all 0's is used instead).

@fix
This commit is contained in:
Carsten Haitzler 2016-04-04 09:51:12 +09:00
parent 8fb153cf8c
commit db4ff548d3
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/modules/evas/image_loaders/gif/evas_image_load_gif.c
View File

@ -128,11 +128,16 @@ _fill_frame(DATA32 *data, int rowpix, GifFileType *gif, Frame_Info *finfo,
else cmap = gif->SColorMap;
bg = gif->SBackGroundColor;
// fill in local color table of guaranteed 256 entires with cmap & pad
for (cnum = 0; cnum < cmap->ColorCount; cnum++)
colors[cnum] = cmap->Colors[cnum];
for (cnum = cmap->ColorCount; cnum < 256; cnum++)
colors[cnum] = cmap->Colors[0];
if (cmap)
{
// fill in local color table of guaranteed 256 with cmap & pad
for (cnum = 0; cnum < cmap->ColorCount; cnum++)
colors[cnum] = cmap->Colors[cnum];
for (cnum = cmap->ColorCount; cnum < 256; cnum++)
colors[cnum] = cmap->Colors[0];
}
else
memset(colors, 0, sizeof(colors));
// and do the fill
_fill_image
(data, rowpix,
@ -258,11 +263,16 @@ _decode_image(GifFileType *gif, DATA32 *data, int rowpix, int xin, int yin,
if (gif->Image.ColorMap) cmap = gif->Image.ColorMap;
else cmap = gif->SColorMap;
// fill in local color table of guaranteed 256 entires with cmap & pad
for (cnum = 0; cnum < cmap->ColorCount; cnum++)
colors[cnum] = cmap->Colors[cnum];
for (cnum = cmap->ColorCount; cnum < 256; cnum++)
colors[cnum] = cmap->Colors[0];
if (cmap)
{
// fill in local color table of guaranteed 256 entires with cmap & pad
for (cnum = 0; cnum < cmap->ColorCount; cnum++)
colors[cnum] = cmap->Colors[cnum];
for (cnum = cmap->ColorCount; cnum < 256; cnum++)
colors[cnum] = cmap->Colors[0];
}
else
memset(colors, 0, sizeof(colors));
// if we need to deal with transparent pixels at all...
if (transparent >= 0)
{