m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix issue 496: Some animated GIF images don't load well. Also fixed the handling of transparency in preview (fileselector) and loading anim GIF as a brush loads first frame.

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1969 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Yves Rizoud
2012-07-12 22:27:49 +00:00
parent 2aa72730ad
commit 7613093df9
3 changed files with 42 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/fileformats.c
View File

@@ -2057,19 +2057,10 @@ void Load_GIF(T_IO_Context * context)
disposal_method = (GCE.Packed_fields >> 2) & 7;
last_delay = GCE.Delay_time;
context->Transparent_color= GCE.Transparent_color;
if (GCE.Packed_fields & 1)
{
if (number_LID == 0)
context->Background_transparent = 1;
}
else
{
if (number_LID == 0)
context->Background_transparent = 0;
}
is_transparent =
(previous_disposal_method==DISPOSAL_METHOD_DO_NOT_DISPOSE
||previous_disposal_method==DISPOSAL_METHOD_UNDEFINED);
is_transparent = GCE.Packed_fields & 1;
if (number_LID == 0)
context->Background_transparent = is_transparent;
is_transparent &= is_looping;
}
else
File_error=2;
@@ -2219,20 +2210,13 @@ void Load_GIF(T_IO_Context * context)
}
else
{
if (context->Type == CONTEXT_MAIN_IMAGE)
memset(
Main_backups->Pages->Image[Main_current_layer].Pixels,
LSDB.Backcol,
Main_backups->Pages->Width*Main_backups->Pages->Height);
Fill_canvas(context, LSDB.Backcol);
}
}
else
{
if (context->Type == CONTEXT_MAIN_IMAGE)
memset(
Main_backups->Pages->Image[Main_current_layer].Pixels,
LSDB.Backcol,
Main_backups->Pages->Width*Main_backups->Pages->Height);
// First frame/layer, fill canvas with backcolor
Fill_canvas(context, LSDB.Backcol);
}
// Duration was set in the previously loaded GCE
Set_frame_duration(context, last_delay*10);
@@ -2286,11 +2270,11 @@ void Load_GIF(T_IO_Context * context)
previous_width);
}
}
previous_height=IDB.Image_height;
previous_width=IDB.Image_width;
previous_pos_x=IDB.Pos_X;
previous_pos_y=IDB.Pos_Y;
}
previous_height=IDB.Image_height;
previous_width=IDB.Image_width;
previous_pos_x=IDB.Pos_X;
previous_pos_y=IDB.Pos_Y;
Palette_loaded(context);
@@ -2387,6 +2371,11 @@ void Load_GIF(T_IO_Context * context)
{
goto early_exit;
}
// Same with brush
if (context->Type == CONTEXT_BRUSH && is_looping)
{
goto early_exit;
}
} // Le fichier contenait un IDB
else