[packages/libgdiplus] - adjusted to support giflib 5.0.x too

qboosh qboosh at pld-linux.org
Tue Sep 16 17:52:50 CEST 2014


commit e3bc3fc18aed9625a685ee432619d19059be3f99
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Sep 16 17:52:42 2014 +0200

    - adjusted to support giflib 5.0.x too

 libgdiplus-giflib.patch | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)
---
diff --git a/libgdiplus-giflib.patch b/libgdiplus-giflib.patch
index d70376d..6c1d983 100644
--- a/libgdiplus-giflib.patch
+++ b/libgdiplus-giflib.patch
@@ -80,21 +80,27 @@
  	}
  	
  	if (gif == NULL) {
-@@ -581,7 +578,7 @@
+@@ -581,7 +578,11 @@
  	}
  
  	FreeExtensionMono(&global_extensions);
--	DGifCloseFile (gif);
++#if (GIFLIB_MAJOR > 5) || ((GIFLIB_MAJOR == 5) && (GIFLIB_MINOR >= 1))
 +	DGifCloseFile (gif, NULL);
++#else
+ 	DGifCloseFile (gif);
++#endif
  
  	*image = result;
  	return Ok;
-@@ -597,7 +594,7 @@
+@@ -597,7 +598,11 @@
  
  	if (gif != NULL) {
  		FreeExtensionMono (&global_extensions);
--		DGifCloseFile (gif);
++#if (GIFLIB_MAJOR > 5) || ((GIFLIB_MAJOR == 5) && (GIFLIB_MINOR >= 1))
 +		DGifCloseFile (gif, NULL);
++#else
+ 		DGifCloseFile (gif);
++#endif
  	}
  
  	*image = NULL;
@@ -166,12 +172,15 @@
  			if (red != NULL) {
  				GdipFree (red);
  			}
-@@ -923,13 +922,13 @@
+@@ -923,13 +930,17 @@
  		}
  	}
  
--	EGifCloseFile (fp);	
-+	EGifCloseFile (fp, NULL);	
++#if (GIFLIB_MAJOR > 5) || ((GIFLIB_MAJOR == 5) && (GIFLIB_MINOR >= 1))
++	EGifCloseFile (fp, NULL);
++#else
+ 	EGifCloseFile (fp);	
++#endif
  	
  	return Ok;
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libgdiplus.git/commitdiff/e3bc3fc18aed9625a685ee432619d19059be3f99



More information about the pld-cvs-commit mailing list