Author: rmottola
Date: Tue Jun 3 14:48:13 2014
New Revision: 37936
URL: http://svn.gna.org/viewcvs/gnustep?rev=37936&view=rev
Log:
Rewrite Open compatibility with a more readable macro
Modified:
libs/gui/trunk/ChangeLog
libs/gui/trunk/Source/NSBitmapImageRep+GIF.m
Modified: libs/gui/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/ChangeLog?rev=37936&r1=37935&r2=37936&view=diff
==============================================================================
--- libs/gui/trunk/ChangeLog (original)
+++ libs/gui/trunk/ChangeLog Tue Jun 3 14:48:13 2014
@@ -1,3 +1,8 @@
+2014-06-03 Riccardo Mottola <r...@gnu.org>
+
+ * Source/NSBitmapImageRep+GIF.m
+ Rewrite Open compatibility with a more readable macro.
+
2014-06-03 Riccardo Mottola <r...@gnu.org>
* Source/NSBitmapImageRep+GIF.m
Modified: libs/gui/trunk/Source/NSBitmapImageRep+GIF.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Source/NSBitmapImageRep%2BGIF.m?rev=37936&r1=37935&r2=37936&view=diff
==============================================================================
--- libs/gui/trunk/Source/NSBitmapImageRep+GIF.m (original)
+++ libs/gui/trunk/Source/NSBitmapImageRep+GIF.m Tue Jun 3 14:48:13 2014
@@ -56,7 +56,12 @@
#define FALSE 0
#endif /* FALSE */
-// GIF 5.1
+// GIF > 5.0
+#if GIFLIB_MAJOR >= 5
+ #define DGifOpen(s, i) DGifOpen(s, i, NULL)
+#endif
+
+// GIF> 5.1
#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
#define DGifCloseFile(f) DGifCloseFile(f, NULL)
#endif
@@ -153,11 +158,7 @@
}
gs_gif_init_input_source(&src, imageData);
-#if GIFLIB_MAJOR >= 5
- file = DGifOpen(&src, gs_gif_input, NULL);
-#else
file = DGifOpen(&src, gs_gif_input);
-#endif
if (file == NULL)
{
/* we do not use giferror here because it doesn't
@@ -231,11 +232,7 @@
/* open the image */
gs_gif_init_input_source(&src, imageData);
-#if GIFLIB_MAJOR >= 5
- file = DGifOpen(&src, gs_gif_input, NULL);
-#else
file = DGifOpen(&src, gs_gif_input);
-#endif
if (file == NULL)
{
/* we do not use giferror here because it doesn't
_______________________________________________
Gnustep-cvs mailing list
Gnustep-cvs@gna.org
https://mail.gna.org/listinfo/gnustep-cvs
