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

Load_GIF() use "stop" for detecting end of image as well

Browse Source
This commit is contained in:
Thomas Bernard 2018-12-17 21:37:47 +01:00
parent 8691554a26
commit 2d45c5e68b
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/fileformats.c
View File

@ -4074,7 +4074,6 @@ typedef struct {
word pos_X; ///< Current coordinates word pos_X; ///< Current coordinates
word pos_Y; word pos_Y;
word interlaced; ///< interlaced flag word interlaced; ///< interlaced flag
word finished_interlaced_image; ///< interlaced flag finished loading
word pass; ///< current pass in interlaced decoding word pass; ///< current pass in interlaced decoding
word stop; ///< Stop flag (end of picture) word stop; ///< Stop flag (end of picture)
} T_GIF_context; } T_GIF_context;
@ -4132,7 +4131,11 @@ static void GIF_new_pixel(T_IO_Context * context, T_GIF_context * gif, T_GIF_IDB
gif->pos_X=0; gif->pos_X=0;
if (!gif->interlaced) if (!gif->interlaced)
{
gif->pos_Y++; gif->pos_Y++;
if (gif->pos_Y >= idb->Image_height)
gif->stop = 1;
}
else else
{ {
switch (gif->pass) switch (gif->pass)
@ -4155,7 +4158,7 @@ static void GIF_new_pixel(T_IO_Context * context, T_GIF_context * gif, T_GIF_IDB
break; break;
case 3 : gif->pos_Y=1; case 3 : gif->pos_Y=1;
break; break;
case 4 : gif->finished_interlaced_image=1; case 4 : gif->stop = 1;
} }
} }
} }
@ -4510,7 +4513,7 @@ void Load_GIF(T_IO_Context * context)
&& Read_byte(GIF_file,&(IDB.Indicator)) && Read_byte(GIF_file,&(IDB.Indicator))
&& IDB.Image_width && IDB.Image_height) && IDB.Image_width && IDB.Image_height)
{ {
GFX2_Log(GFX2_DEBUG, "GIF Image descriptor %u Pos (%u,%u) %ux%u %s%slocal palette %ubpp\n", GFX2_Log(GFX2_DEBUG, "GIF Image descriptor %u Pos (%u,%u) %ux%u %s%slocal palette(%ubpp)\n",
number_LID, IDB.Pos_X, IDB.Pos_Y, IDB.Image_width, IDB.Image_height, number_LID, IDB.Pos_X, IDB.Pos_Y, IDB.Image_width, IDB.Image_height,
(IDB.Indicator & 0x40) ? "interlaced " : "", (IDB.Indicator & 0x80) ? "" : "no ", (IDB.Indicator & 0x40) ? "interlaced " : "", (IDB.Indicator & 0x80) ? "" : "no ",
(IDB.Indicator & 7) + 1); (IDB.Indicator & 7) + 1);
@ -4575,7 +4578,7 @@ void Load_GIF(T_IO_Context * context)
/*Init_lecture();*/ /*Init_lecture();*/
GIF.finished_interlaced_image=0; GIF.stop = 0;
//////////////////////////////////////////// DECOMPRESSION LZW // //////////////////////////////////////////// DECOMPRESSION LZW //
@ -4640,11 +4643,7 @@ void Load_GIF(T_IO_Context * context)
File_error=0; File_error=0;
/*Close_lecture();*/ /*Close_lecture();*/
if (File_error>=0) if (File_error >= 0 && !GIF.stop)
if ( /* (GIF_pos_X!=0) || */
( ( (!GIF.interlaced) && (GIF.pos_Y!=IDB.Image_height) && (GIF.pos_X!=0)) ||
( (GIF.interlaced) && (!GIF.finished_interlaced_image) )
) )
File_error=2; File_error=2;
// No need to read more than one frame in animation preview mode // No need to read more than one frame in animation preview mode