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

merge

Browse Source
This commit is contained in:
John Cupitt 2019-08-24 17:17:45 +01:00
parent 691b5584d4
commit 0dda54b1b5
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libvips/foreign/gifload.c
View File

@ -1093,17 +1093,10 @@ vips_foreign_load_gif_open( VipsForeignLoadGif *gif )
return( -1 ); return( -1 );
} }
} }
<<<<<<< HEAD
#else
if( !(gif->file = DGifOpen( gif->userPtr, gif->read_func )) ) {
vips_foreign_load_gif_error_vips( gif, GifLastError() );
return( -1 );
=======
#else #else
if( !(gif->file = DGifOpen( gif, gif->read_func )) ) { if( !(gif->file = DGifOpen( gif, gif->read_func )) ) {
vips_foreign_load_gif_error_vips( gif, GifLastError() ); vips_foreign_load_gif_error_vips( gif, GifLastError() );
return( -1 ); return( -1 );
>>>>>>> 8.8
} }
#endif #endif
@ -1204,13 +1197,8 @@ vips_foreign_load_gif_file_dispose( GObject *gobject )
* DGifOpenFileHandle() since that's an fd from open() and you can't pass those * DGifOpenFileHandle() since that's an fd from open() and you can't pass those
* across DLL boundaries on Windows. * across DLL boundaries on Windows.
*/ */
<<<<<<< HEAD
static int
vips_giflib_file_read( GifFileType *file, GifByteType *buffer, int n )
=======
static int static int
vips_giflib_file_read( GifFileType *gfile, GifByteType *buffer, int n ) vips_giflib_file_read( GifFileType *gfile, GifByteType *buffer, int n )
>>>>>>> 8.8
{ {
VipsForeignLoadGif *gif = (VipsForeignLoadGif *) gfile->UserData; VipsForeignLoadGif *gif = (VipsForeignLoadGif *) gfile->UserData;
VipsForeignLoadGifFile *file = (VipsForeignLoadGifFile *) gif; VipsForeignLoadGifFile *file = (VipsForeignLoadGifFile *) gif;