sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add gif-loop metadata

Browse Source 
see https://github.com/rokka-io/imagine-vips/issues/3
This commit is contained in:
John Cupitt 2017-11-21 16:04:18 +00:00
parent b611f46d5a
commit e56282e1fd
2 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -36,7 +36,8 @@
- add VIPS_COMBINE_MIN, a new combining mode for vips_compass() - add VIPS_COMBINE_MIN, a new combining mode for vips_compass()
- vips_hist_find_indexed() now has a @combine parameter - vips_hist_find_indexed() now has a @combine parameter
- vips_affine() and vips_similarity() have a "background" parameter - vips_affine() and vips_similarity() have a "background" parameter
- fix nasty jaggies on the edge of affine output, thanks chregu - fix nasty jaggies on the edges of affine output, thanks chregu
- add gif-delay and gif-loop metadata
29/8/17 started 8.5.9 29/8/17 started 8.5.9
- make --fail stop jpeg read on any libjpeg warning, thanks @mceachen - make --fail stop jpeg read on any libjpeg warning, thanks @mceachen

33
libvips/foreign/gifload.c
View File

@ -16,7 +16,7 @@
* 5/10/17 * 5/10/17
* - colormap can be missing thanks Kleis * - colormap can be missing thanks Kleis
* 21/11/17 * 21/11/17
* - add "gif-delay" metadata * - add "gif-delay" and "gif-loop" metadata
*/ */
/* /*
@ -124,6 +124,10 @@ typedef struct _VipsForeignLoadGif {
*/ */
int delay; int delay;
/* Number of times to loop the animation.
*/
int loop;
/* The FILE* we read from. /* The FILE* we read from.
*/ */
FILE *fp; FILE *fp;
@ -553,22 +557,33 @@ vips_foreign_load_gif_page( VipsForeignLoadGif *gif, VipsImage *out )
} }
if( ext_code == GRAPHICS_EXT_FUNC_CODE && if( ext_code == GRAPHICS_EXT_FUNC_CODE &&
extension ) { extension &&
extension[0] == 4 ) {
/* Bytes are flags, delay low, delay high, /* Bytes are flags, delay low, delay high,
* transparency. Bit 1 means transparency * transparency. Flag bit 1 means transparency
* is being set. * is being set.
*/ */
if( extension[1] & 0x1 ) { if( extension[1] & 0x1 ) {
gif->transparency = extension[4]; gif->transparency = extension[4];
gif->has_transparency = TRUE; gif->has_transparency = TRUE;
VIPS_DEBUG_MSG( "gifload: "
"seen transparency %d\n",
gif->transparency );
} }
gif->delay = extension[2] | (extension[3] << 8);
VIPS_DEBUG_MSG( "gifload: " gif->delay = extension[2] | (extension[3] << 8);
"seen transparency %d\n",
gif->transparency );
} }
/* The 11-byte NETSCAPE extension.
*/
if( ext_code == APPLICATION_EXT_FUNC_CODE &&
extension &&
extension[0] == 11 &&
/* Then 'NETSCAPE2.0', then */
extension[12] == 3 &&
extension[13] == 1 )
gif->loop = extension[14] | (extension[15] << 8);
while( extension != NULL ) { while( extension != NULL ) {
if( DGifGetExtensionNext( gif->file, if( DGifGetExtensionNext( gif->file,
&extension) == GIF_ERROR ) { &extension) == GIF_ERROR ) {
@ -765,6 +780,7 @@ vips_foreign_load_gif_pages( VipsForeignLoadGif *gif, VipsImage **out )
if( n_frames > 1 ) if( n_frames > 1 )
vips_image_set_int( *out, VIPS_META_PAGE_HEIGHT, t[0]->Ysize ); vips_image_set_int( *out, VIPS_META_PAGE_HEIGHT, t[0]->Ysize );
vips_image_set_int( *out, "gif-delay", gif->delay ); vips_image_set_int( *out, "gif-delay", gif->delay );
vips_image_set_int( *out, "gif-loop", gif->loop );
return( 0 ); return( 0 );
} }
@ -862,7 +878,8 @@ vips_foreign_load_gif_init( VipsForeignLoadGif *gif )
{ {
gif->n = 1; gif->n = 1;
gif->transparency = -1; gif->transparency = -1;
gif->delay = 16; gif->delay = 10;
gif->loop = 0;
} }
typedef struct _VipsForeignLoadGifFile { typedef struct _VipsForeignLoadGifFile {