svn commit: r401361 - head/graphics/swftools/files

[Antoine Brodin]

Author: antoine
Date: Thu Nov 12 15:47:56 2015
New Revision: 401361
URL: https://svnweb.freebsd.org/changeset/ports/401361

Log:
  Allow building with giflib 5.1
  
  PR:		204492

Modified:
  head/graphics/swftools/files/patch-gif2swf.c

Modified: head/graphics/swftools/files/patch-gif2swf.c
==============================================================================
--- head/graphics/swftools/files/patch-gif2swf.c	Thu Nov 12 15:41:21 2015	(r401360)
+++ head/graphics/swftools/files/patch-gif2swf.c	Thu Nov 12 15:47:56 2015	(r401361)
@@ -49,7 +49,19 @@
          return t;
      }
  
-@@ -488,7 +515,11 @@ int CheckInputFile(char *fname, char **r
+@@ -455,7 +482,11 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, c
+ 
+     free(pal);
+     free(imagedata);
++#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
++    DGifCloseFile(gft, NULL);
++#else
+     DGifCloseFile(gft);
++#endif
+ 
+     return t;
+ }
+@@ -488,7 +519,11 @@ int CheckInputFile(char *fname, char **r
      }
      fclose(fi);
  
@@ -61,7 +73,7 @@
          fprintf(stderr, "%s is not a GIF file!\n", fname);
          return -1;
      }
-@@ -499,7 +530,11 @@ int CheckInputFile(char *fname, char **r
+@@ -499,7 +534,11 @@ int CheckInputFile(char *fname, char **r
          global.max_image_height = gft->SHeight;
  
      if (DGifSlurp(gft) != GIF_OK) { 
@@ -74,3 +86,15 @@
          return -1;
      }
      // After DGifSlurp() call, gft->ImageCount become available
+@@ -518,7 +557,11 @@ int CheckInputFile(char *fname, char **r
+             fprintf(stderr, "frame: %u, delay: %.3f sec\n", i + 1, getGifDelayTime(gft, i) / 100.0);
+     }
+ 
++#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
++    DGifCloseFile(gft, NULL);
++#else
+     DGifCloseFile(gft);
++#endif
+ 
+     return 0;
+ }