Attachment #460466 for bug #571654

Lines 1048-1053 Link Here

(-)libAfterImage-1.20.orig/export.c (+84 lines)
1048	Bool new_image = True ;	1048	Bool new_image = True ;
1049	START_TIME(started);	1049	START_TIME(started);
1050	int cmap_size = 1;	1050	int cmap_size = 1;
		1051	#if (GIFLIB_MAJOR>=5)
		1052	int errcode;
		1053	#endif
1051	#define GIF_NETSCAPE_EXT_BYTES 3	1054	#define GIF_NETSCAPE_EXT_BYTES 3
1052	unsigned char netscape_ext_bytes[GIF_NETSCAPE_EXT_BYTES] = { 0x1, 0x0, 0x0};	1055	unsigned char netscape_ext_bytes[GIF_NETSCAPE_EXT_BYTES] = { 0x1, 0x0, 0x0};
1053	#define GIF_GCE_BYTES 4	1056	#define GIF_GCE_BYTES 4
Lines 1086-1095 Link Here
1086		1089
1087	while( cmap_size < 256 && cmap_size < (int)cmap.count+(gce_bytes[0]&0x01) )	1090	while( cmap_size < 256 && cmap_size < (int)cmap.count+(gce_bytes[0]&0x01) )
1088	cmap_size = cmap_size<<1 ;	1091	cmap_size = cmap_size<<1 ;
		1092	#if (GIFLIB_MAJOR>=5)
		1093	if( (gif_cmap = GifMakeMapObject(cmap_size, NULL )) == NULL )
		1094	#else
1089	if( (gif_cmap = MakeMapObject(cmap_size, NULL )) == NULL )	1095	if( (gif_cmap = MakeMapObject(cmap_size, NULL )) == NULL )
		1096	#endif
1090	{	1097	{
1091	free( mapped_im );	1098	free( mapped_im );
		1099	#if (GIFLIB_MAJOR>=5)
		1100	ASIM_PrintGifError(E_GIF_ERR_NOT_ENOUGH_MEM);
		1101	#else
1092	ASIM_PrintGifError();	1102	ASIM_PrintGifError();
		1103	#endif
1093	return False;	1104	return False;
1094	}	1105	}
1095	memcpy( &(gif_cmap->Colors[0]), &(cmap.entries[0]), MIN(cmap.count,(unsigned int)cmap_size)*3 );	1106	memcpy( &(gif_cmap->Colors[0]), &(cmap.entries[0]), MIN(cmap.count,(unsigned int)cmap_size)*3 );
Lines 1101-1113 Link Here
1101	SavedImage *images = NULL ;	1112	SavedImage *images = NULL ;
1102	int count = 0 ;	1113	int count = 0 ;
1103	/* TODO: do something about multiimage files !!! */	1114	/* TODO: do something about multiimage files !!! */
		1115	#if (GIFLIB_MAJOR>=5)
		1116	gif = open_gif_read(infile, &errcode);
		1117	#else
1104	gif = open_gif_read(infile);	1118	gif = open_gif_read(infile);
		1119	#endif
1105	if( gif == NULL \|\| get_gif_saved_images(gif, -1, &images, &count) == GIF_ERROR)	1120	if( gif == NULL \|\| get_gif_saved_images(gif, -1, &images, &count) == GIF_ERROR)
1106	{	1121	{
		1122	#if (GIFLIB_MAJOR>=5)
		1123	ASIM_PrintGifError(errcode);
		1124	#else
1107	ASIM_PrintGifError();	1125	ASIM_PrintGifError();
		1126	#endif
1108	if( gif )	1127	if( gif )
1109	{	1128	{
		1129	#if (GIFLIB_MAJOR>=5)
		1130	DGifCloseFile(gif, &errcode);
		1131	#else
1110	DGifCloseFile(gif);	1132	DGifCloseFile(gif);
		1133	#endif
1111	gif = NULL ;	1134	gif = NULL ;
1112	}	1135	}
1113	if (infile)	1136	if (infile)
Lines 1123-1136 Link Here
1123	gif_src = *gif ;	1146	gif_src = *gif ;
1124	gif->SColorMap = NULL ;	1147	gif->SColorMap = NULL ;
1125	gif->Image.ColorMap = NULL ;	1148	gif->Image.ColorMap = NULL ;
		1149	#if (GIFLIB_MAJOR>=5)
		1150	DGifCloseFile(gif, &errcode);
		1151	#else
1126	DGifCloseFile(gif);	1152	DGifCloseFile(gif);
		1153	#endif
1127	gif = NULL;	1154	gif = NULL;
1128	fclose (infile);	1155	fclose (infile);
1129	infile = NULL;	1156	infile = NULL;
1130	outfile = open_writeable_image_file( path );	1157	outfile = open_writeable_image_file( path );
1131		1158
1132	if (outfile)	1159	if (outfile)
		1160	#if (GIFLIB_MAJOR>=5)
		1161	gif = EGifOpenFileHandle(fileno(outfile), &errcode);
		1162	#else
1133	gif = EGifOpenFileHandle(fileno(outfile));	1163	gif = EGifOpenFileHandle(fileno(outfile));
		1164	#endif
1134		1165
1135	if (gif)	1166	if (gif)
1136	{	1167	{
Lines 1141-1166 Link Here
1141	gif_src.SColorMap )) == GIF_OK )	1172	gif_src.SColorMap )) == GIF_OK )
1142	status = write_gif_saved_images( gif, images, count );	1173	status = write_gif_saved_images( gif, images, count );
1143	if( status != GIF_OK )	1174	if( status != GIF_OK )
		1175	#if (GIFLIB_MAJOR>=5)
		1176	ASIM_PrintGifError(status);
		1177	#else
1144	ASIM_PrintGifError();	1178	ASIM_PrintGifError();
		1179	#endif
1145	}	1180	}
1146	if (gif_src.SColorMap)	1181	if (gif_src.SColorMap)
1147	{ /* we only want to save private colormap if it is any different from	1182	{ /* we only want to save private colormap if it is any different from
1148	* screen colormap ( saves us 768 bytes per image ) */	1183	* screen colormap ( saves us 768 bytes per image ) */
1149	if( gif_cmap->ColorCount == gif_src.SColorMap->ColorCount )	1184	if( gif_cmap->ColorCount == gif_src.SColorMap->ColorCount )
1150	dont_save_cmap = ( memcmp( gif_cmap->Colors, gif_src.SColorMap->Colors, gif_cmap->ColorCount*sizeof(GifColorType)) == 0 );	1185	dont_save_cmap = ( memcmp( gif_cmap->Colors, gif_src.SColorMap->Colors, gif_cmap->ColorCount*sizeof(GifColorType)) == 0 );
		1186	#if (GIFLIB_MAJOR>=5)
		1187	GifFreeMapObject(gif_src.SColorMap);
		1188	#else
1151	FreeMapObject(gif_src.SColorMap);	1189	FreeMapObject(gif_src.SColorMap);
		1190	#endif
1152	}	1191	}
1153	if (gif)	1192	if (gif)
1154	{	1193	{
1155	EGifPutExtension(gif, GRAPHICS_EXT_FUNC_CODE, GIF_GCE_BYTES, &(gce_bytes[0]));	1194	EGifPutExtension(gif, GRAPHICS_EXT_FUNC_CODE, GIF_GCE_BYTES, &(gce_bytes[0]));
1156	if( get_flags( params->gif.flags, EXPORT_ANIMATION_REPEATS ) )	1195	if( get_flags( params->gif.flags, EXPORT_ANIMATION_REPEATS ) )
1157	{	1196	{
		1197	#if (GIFLIB_MAJOR>=5)
		1198	EGifPutExtensionLeader(gif, APPLICATION_EXT_FUNC_CODE);
		1199	EGifPutExtensionBlock(gif, 11, "NETSCAPE2.0");
		1200	EGifPutExtensionBlock(gif, GIF_NETSCAPE_EXT_BYTES, &(netscape_ext_bytes[0]));
		1201	EGifPutExtensionTrailer(gif);
		1202	#else
1158	EGifPutExtensionFirst(gif, APPLICATION_EXT_FUNC_CODE, 11, "NETSCAPE2.0");	1203	EGifPutExtensionFirst(gif, APPLICATION_EXT_FUNC_CODE, 11, "NETSCAPE2.0");
1159	EGifPutExtensionLast(gif, 0, GIF_NETSCAPE_EXT_BYTES, &(netscape_ext_bytes[0]));	1204	EGifPutExtensionLast(gif, 0, GIF_NETSCAPE_EXT_BYTES, &(netscape_ext_bytes[0]));
		1205	#endif
1160	}	1206	}
1161		1207
		1208	#if (GIFLIB_MAJOR>=5)
		1209	if( (errcode = EGifPutImageDesc(gif, 0, 0, im->width, im->height, false, (dont_save_cmap)?NULL:gif_cmap )) == GIF_ERROR )
		1210	ASIM_PrintGifError(errcode);
		1211	#else
1162	if( EGifPutImageDesc(gif, 0, 0, im->width, im->height, FALSE, (dont_save_cmap)?NULL:gif_cmap ) == GIF_ERROR )	1212	if( EGifPutImageDesc(gif, 0, 0, im->width, im->height, FALSE, (dont_save_cmap)?NULL:gif_cmap ) == GIF_ERROR )
1163	ASIM_PrintGifError();	1213	ASIM_PrintGifError();
		1214	#endif
1164	}	1215	}
1165	}	1216	}
1166	free_gif_saved_images( images, count );	1217	free_gif_saved_images( images, count );
Lines 1172-1195 Link Here
1172	outfile = open_writeable_image_file(path);	1223	outfile = open_writeable_image_file(path);
1173		1224
1174	if (outfile)	1225	if (outfile)
		1226	{
		1227	#if (GIFLIB_MAJOR>=5)
		1228	gif = EGifOpenFileHandle(fileno(outfile), &errcode);
		1229	if (errcode != E_GIF_SUCCEEDED)
		1230	ASIM_PrintGifError(errcode);
		1231	#else
1175	if ((gif = EGifOpenFileHandle(fileno(outfile))) == NULL)	1232	if ((gif = EGifOpenFileHandle(fileno(outfile))) == NULL)
1176	ASIM_PrintGifError();	1233	ASIM_PrintGifError();
		1234	#endif
		1235	}
1177	}	1236	}
1178		1237
1179	if( new_image && gif )	1238	if( new_image && gif )
1180	{	1239	{
		1240	#if (GIFLIB_MAJOR>=5)
		1241	if( (errcode = EGifPutScreenDesc(gif, im->width, im->height, cmap_size, 0, gif_cmap )) == GIF_ERROR )
		1242	ASIM_PrintGifError(errcode);
		1243	#else
1181	if( EGifPutScreenDesc(gif, im->width, im->height, cmap_size, 0, gif_cmap ) == GIF_ERROR )	1244	if( EGifPutScreenDesc(gif, im->width, im->height, cmap_size, 0, gif_cmap ) == GIF_ERROR )
1182	ASIM_PrintGifError();	1245	ASIM_PrintGifError();
		1246	#endif
1183		1247
1184	EGifPutExtension(gif, 0xf9, GIF_GCE_BYTES, &(gce_bytes[0]));	1248	EGifPutExtension(gif, 0xf9, GIF_GCE_BYTES, &(gce_bytes[0]));
1185		1249
		1250	#if (GIFLIB_MAJOR>=5)
		1251	if( (errcode = EGifPutImageDesc(gif, 0, 0, im->width, im->height, false, NULL )) == GIF_ERROR )
		1252	ASIM_PrintGifError(errcode);
		1253	#else
1186	if( EGifPutImageDesc(gif, 0, 0, im->width, im->height, FALSE, NULL ) == GIF_ERROR )	1254	if( EGifPutImageDesc(gif, 0, 0, im->width, im->height, FALSE, NULL ) == GIF_ERROR )
1187	ASIM_PrintGifError();	1255	ASIM_PrintGifError();
		1256	#endif
1188	}	1257	}
1189		1258
1190	if( gif_cmap )	1259	if( gif_cmap )
1191	{	1260	{
		1261	#if (GIFLIB_MAJOR>=5)
		1262	GifFreeMapObject(gif_cmap);
		1263	#else
1192	FreeMapObject(gif_cmap);	1264	FreeMapObject(gif_cmap);
		1265	#endif
1193	gif_cmap = NULL ;	1266	gif_cmap = NULL ;
1194	}	1267	}
1195	if( gif )	1268	if( gif )
Lines 1203-1214 Link Here
1203	register int src = mapped_im + xy;	1276	register int src = mapped_im + xy;
1204	while( --x >= 0 )	1277	while( --x >= 0 )
1205	row_pointer[x] = src[x] ;	1278	row_pointer[x] = src[x] ;
		1279	#if (GIFLIB_MAJOR>=5)
		1280	if( (errcode = EGifPutLine(gif, row_pointer, im->width)) == GIF_ERROR)
		1281	ASIM_PrintGifError(errcode);
		1282	#else
1206	if( EGifPutLine(gif, row_pointer, im->width) == GIF_ERROR)	1283	if( EGifPutLine(gif, row_pointer, im->width) == GIF_ERROR)
1207	ASIM_PrintGifError();	1284	ASIM_PrintGifError();
		1285	#endif
1208	}	1286	}
1209	free( row_pointer );	1287	free( row_pointer );
		1288	#if (GIFLIB_MAJOR>=5)
		1289	EGifCloseFile(gif, &errcode);
		1290	if (errcode != E_GIF_SUCCEEDED)
		1291	ASIM_PrintGifError(errcode);
		1292	#else
1210	if (EGifCloseFile(gif) == GIF_ERROR)	1293	if (EGifCloseFile(gif) == GIF_ERROR)
1211	ASIM_PrintGifError();	1294	ASIM_PrintGifError();
		1295	#endif
1212	gif = NULL;	1296	gif = NULL;
1213	}	1297	}
1214	free( mapped_im );	1298	free( mapped_im );

Lines 2178-2183 Link Here

(-)libAfterImage-1.20.orig/import.c (+15 lines)
2178	int transparent = -1 ;	2178	int transparent = -1 ;
2179	unsigned int y;	2179	unsigned int y;
2180	unsigned int width = 0, height = 0;	2180	unsigned int width = 0, height = 0;
		2181	#if (GIFLIB_MAJOR>=5)
		2182	int errcode;
		2183	#endif
2181	ColorMapObject *cmap = NULL ;	2184	ColorMapObject *cmap = NULL ;
2182		2185
2183	START_TIME(started);	2186	START_TIME(started);
Lines 2186-2192 Link Here
2186		2189
2187	if ((fp = open_image_file(path)) == NULL)	2190	if ((fp = open_image_file(path)) == NULL)
2188	return NULL;	2191	return NULL;
		2192	#if (GIFLIB_MAJOR>=5)
		2193	if( (gif = open_gif_read(fp, &errcode)) != NULL )
		2194	#else
2189	if( (gif = open_gif_read(fp)) != NULL )	2195	if( (gif = open_gif_read(fp)) != NULL )
		2196	#endif
2190	{	2197	{
2191	SavedImage *sp = NULL ;	2198	SavedImage *sp = NULL ;
2192	int count = 0 ;	2199	int count = 0 ;
Lines 2289-2301 Link Here
2289	}	2296	}
2290	free_gif_saved_images( sp, count );	2297	free_gif_saved_images( sp, count );
2291	}else if( status != GIF_OK )	2298	}else if( status != GIF_OK )
		2299	#if (GIFLIB_MAJOR>=5)
		2300	ASIM_PrintGifError(status);
		2301	#else
2292	ASIM_PrintGifError();	2302	ASIM_PrintGifError();
		2303	#endif
2293	else if( params->subimage == -1 )	2304	else if( params->subimage == -1 )
2294	show_error( "Image file \"%s\" does not have any valid image information.", path );	2305	show_error( "Image file \"%s\" does not have any valid image information.", path );
2295	else	2306	else
2296	show_error( "Image file \"%s\" does not have subimage %d.", path, params->subimage );	2307	show_error( "Image file \"%s\" does not have subimage %d.", path, params->subimage );
2297		2308
		2309	#if (GIFLIB_MAJOR>=5)
		2310	DGifCloseFile(gif, &errcode);
		2311	#else
2298	DGifCloseFile(gif);	2312	DGifCloseFile(gif);
		2313	#endif
2299	fclose( fp );	2314	fclose( fp );
2300	}	2315	}
2301	SHOW_TIME("image loading",started);	2316	SHOW_TIME("image loading",started);

Lines 75-87 Link Here

(-)libAfterImage-1.20.orig/ungif.c (+33 lines)
75	if( sp )	75	if( sp )
76	{	76	{
77	if (sp->ImageDesc.ColorMap)	77	if (sp->ImageDesc.ColorMap)
		78	#if (GIFLIB_MAJOR>=5)
		79	GifFreeMapObject(sp->ImageDesc.ColorMap);
		80	#else
78	FreeMapObject(sp->ImageDesc.ColorMap);	81	FreeMapObject(sp->ImageDesc.ColorMap);
		82	#endif
79		83
80	if (sp->RasterBits)	84	if (sp->RasterBits)
81	free((char *)sp->RasterBits);	85	free((char *)sp->RasterBits);
82		86
83	if (sp->ExtensionBlocks)	87	if (sp->ExtensionBlocks)
		88	#if (GIFLIB_MAJOR>=5)
		89	GifFreeExtensions(&sp->ExtensionBlockCount, &sp->ExtensionBlocks);
		90	#else
84	FreeExtension(sp);	91	FreeExtension(sp);
		92	#endif
85		93
86	if( !reusable )	94	if( !reusable )
87	free( sp );	95	free( sp );
Lines 119-129 Link Here
119	return ret;	127	return ret;
120	}	128	}
121		129
		130	#if (GIFLIB_MAJOR>=5)
		131	GifFileType*
		132	open_gif_read( FILE in_stream, int errcode )
		133	{
		134	return DGifOpen(in_stream, fread_gif, errcode);
		135	}
		136	#else
122	GifFileType*	137	GifFileType*
123	open_gif_read( FILE *in_stream )	138	open_gif_read( FILE *in_stream )
124	{	139	{
125	return DGifOpen(in_stream, fread_gif);	140	return DGifOpen(in_stream, fread_gif);
126	}	141	}
		142	#endif
127		143
128	int	144	int
129	get_gif_image_desc( GifFileType gif, SavedImage im )	145	get_gif_image_desc( GifFileType gif, SavedImage im )
Lines 151-157 Link Here
151	memcpy( &(im->ImageDesc), &(gif->Image), sizeof(GifImageDesc));	167	memcpy( &(im->ImageDesc), &(gif->Image), sizeof(GifImageDesc));
152	if( gif->Image.ColorMap )	168	if( gif->Image.ColorMap )
153	{	169	{
		170	#if (GIFLIB_MAJOR>=5)
		171	im->ImageDesc.ColorMap = GifMakeMapObject(gif->Image.ColorMap->ColorCount, NULL);
		172	#else
154	im->ImageDesc.ColorMap = MakeMapObject(gif->Image.ColorMap->ColorCount, NULL);	173	im->ImageDesc.ColorMap = MakeMapObject(gif->Image.ColorMap->ColorCount, NULL);
		174	#endif
155	fseek( gif->UserData, start_pos+9, SEEK_SET );	175	fseek( gif->UserData, start_pos+9, SEEK_SET );
156	fread( im->ImageDesc.ColorMap->Colors, 1, gif->Image.ColorMap->ColorCount*3, gif->UserData);	176	fread( im->ImageDesc.ColorMap->Colors, 1, gif->Image.ColorMap->ColorCount*3, gif->UserData);
157	fseek( gif->UserData, end_pos, SEEK_SET );	177	fseek( gif->UserData, end_pos, SEEK_SET );
Lines 166-171 Link Here
166	{	186	{
167	GifRecordType RecordType;	187	GifRecordType RecordType;
168	GifByteType *ExtData;	188	GifByteType *ExtData;
		189	#if (GIFLIB_MAJOR>=5)
		190	int ExtCode;
		191	#endif
169	SavedImage temp_save;	192	SavedImage temp_save;
170	int curr_image = 0, ret_count = *ret_images ;	193	int curr_image = 0, ret_count = *ret_images ;
171	int status = GIF_OK;	194	int status = GIF_OK;
Lines 197-209 Link Here
197	break;	220	break;
198		221
199	case EXTENSION_RECORD_TYPE:	222	case EXTENSION_RECORD_TYPE:
		223	#if (GIFLIB_MAJOR>=5)
		224	status = DGifGetExtension(gif,&ExtCode,&ExtData);
		225	#else
200	status = DGifGetExtension(gif,&temp_save.Function,&ExtData);	226	status = DGifGetExtension(gif,&temp_save.Function,&ExtData);
		227	#endif
201	while (ExtData != NULL && status == GIF_OK )	228	while (ExtData != NULL && status == GIF_OK )
202	{	229	{
203	/* Create an extension block with our data */	230	/* Create an extension block with our data */
		231	#if (GIFLIB_MAJOR>=5)
		232	if ((status = GifAddExtensionBlock(&temp_save.ExtensionBlockCount, &temp_save.ExtensionBlocks,
		233	ExtCode, sizeof(ExtData), ExtData)) == GIF_OK)
		234	status = DGifGetExtension(gif,&ExtCode,&ExtData);
		235	#else
204	if ((status = AddExtensionBlock(&temp_save, ExtData[0], (char*)&(ExtData[1]))) == GIF_OK)	236	if ((status = AddExtensionBlock(&temp_save, ExtData[0], (char*)&(ExtData[1]))) == GIF_OK)
205	status = DGifGetExtensionNext(gif, &ExtData);	237	status = DGifGetExtensionNext(gif, &ExtData);
206	temp_save.Function = 0;	238	temp_save.Function = 0;
		239	#endif
207	}	240	}
208	break;	241	break;
209		242




extern "C" {
#endif

#if ((GIFLIB_MAJOR==4) && (GIFLIB_MINOR>=2)) 
static inline void PrintGifError(void) {
    fprintf(stderr, "%s\n", GifErrorString());
}
#elif (GIFLIB_MAJOR>=5)
static inline void PrintGifError(int code) {
    fprintf(stderr, "%s\n", GifErrorString(code));
}
#endif

#if (GIFLIB_MAJOR>=5)
#ifdef __GNUC__
#define ASIM_PrintGifError(code) do{ fprintf( stderr, "%s():%d:<%s> ",__FUNCTION__, __LINE__, path?path:"null" ); PrintGifError(code); }while(0)
#else
#define ASIM_PrintGifError(code) do{ PrintGifError(code); }while(0)
#endif
#else // (GIFLIB_MAJOR>=5)
#ifdef __GNUC__
#define ASIM_PrintGifError() do{ fprintf( stderr, "%s():%d:<%s> ",__FUNCTION__, __LINE__, path?path:"null" ); PrintGifError(); }while(0)
#else
#define ASIM_PrintGifError() do{ PrintGifError(); }while(0)
#endif
#endif // (GIFLIB_MAJOR>=5)

#define GIF_GCE_DELAY_BYTE_LOW	1
#define GIF_GCE_DELAY_BYTE_HIGH	2



int fread_gif( GifFileType *gif, GifByteType* buf, int len );
#if (GIFLIB_MAJOR>=5)
GifFileType* open_gif_read( FILE *in_stream, int *errcode );
#else
GifFileType* open_gif_read( FILE *in_stream );
#endif

int get_gif_image_desc( GifFileType *gif, SavedImage *im );


Return to bug 571654

Lines 7-17 Link Here

(-)libAfterImage-1.20.orig/ungif.h (+22 lines)
7	extern "C" {	7	extern "C" {
8	#endif	8	#endif
9		9
		10	#if ((GIFLIB_MAJOR==4) && (GIFLIB_MINOR>=2))
		11	static inline void PrintGifError(void) {
		12	fprintf(stderr, "%s\n", GifErrorString());
		13	}
		14	#elif (GIFLIB_MAJOR>=5)
		15	static inline void PrintGifError(int code) {
		16	fprintf(stderr, "%s\n", GifErrorString(code));
		17	}
		18	#endif
		19
		20	#if (GIFLIB_MAJOR>=5)
		21	#ifdef __GNUC__
		22	#define ASIM_PrintGifError(code) do{ fprintf( stderr, "%s():%d:<%s> ",__FUNCTION__, __LINE__, path?path:"null" ); PrintGifError(code); }while(0)
		23	#else
		24	#define ASIM_PrintGifError(code) do{ PrintGifError(code); }while(0)
		25	#endif
		26	#else // (GIFLIB_MAJOR>=5)
10	#ifdef __GNUC__	27	#ifdef __GNUC__
11	#define ASIM_PrintGifError() do{ fprintf( stderr, "%s():%d:<%s> ",__FUNCTION__, __LINE__, path?path:"null" ); PrintGifError(); }while(0)	28	#define ASIM_PrintGifError() do{ fprintf( stderr, "%s():%d:<%s> ",__FUNCTION__, __LINE__, path?path:"null" ); PrintGifError(); }while(0)
12	#else	29	#else
13	#define ASIM_PrintGifError() do{ PrintGifError(); }while(0)	30	#define ASIM_PrintGifError() do{ PrintGifError(); }while(0)
14	#endif	31	#endif
		32	#endif // (GIFLIB_MAJOR>=5)
15		33
16	#define GIF_GCE_DELAY_BYTE_LOW 1	34	#define GIF_GCE_DELAY_BYTE_LOW 1
17	#define GIF_GCE_DELAY_BYTE_HIGH 2	35	#define GIF_GCE_DELAY_BYTE_HIGH 2
Lines 24-30 Link Here
24		42
25		43
26	int fread_gif( GifFileType gif, GifByteType buf, int len );	44	int fread_gif( GifFileType gif, GifByteType buf, int len );
		45	#if (GIFLIB_MAJOR>=5)
		46	GifFileType* open_gif_read( FILE in_stream, int errcode );
		47	#else
27	GifFileType* open_gif_read( FILE *in_stream );	48	GifFileType* open_gif_read( FILE *in_stream );
		49	#endif
28		50
29	int get_gif_image_desc( GifFileType gif, SavedImage im );	51	int get_gif_image_desc( GifFileType gif, SavedImage im );
30		52