r15001 - packages/trunk/fenix/debian/patches

[Vincent Cheng]

Author: vcheng
Date: 2014-03-31 07:34:45 +0000 (Mon, 31 Mar 2014)
New Revision: 15001

Modified:
   packages/trunk/fenix/debian/patches/fix_ftbfs_libpng1.5.patch
Log:
Fix undefined reference to `freee' caused by libpng1.5 patch


Modified: packages/trunk/fenix/debian/patches/fix_ftbfs_libpng1.5.patch
===================================================================
--- packages/trunk/fenix/debian/patches/fix_ftbfs_libpng1.5.patch	2014-03-31 07:12:37 UTC (rev 15000)
+++ packages/trunk/fenix/debian/patches/fix_ftbfs_libpng1.5.patch	2014-03-31 07:34:45 UTC (rev 15001)
@@ -70,7 +70,7 @@
 +		png_free(png_ptr, palette);
 +		palette = NULL;
 +#else
-+		freee(info_ptr->palette) ;
++		free(info_ptr->palette) ;
  		info_ptr->palette = NULL ;
 +#endif
  	}
@@ -93,21 +93,21 @@
 @@ -33,6 +33,7 @@
  #define _(String) String
  #endif
- 
+ 
 +#include <zlib.h>
- #include <png.h>
- 
- #define MAXPATH  1024
+ #include <png.h>
+ 
+ #define MAXPATH  1024
 @@ -187,8 +188,11 @@ MAP * png_load (const char * filename)
- 	if (!info_ptr || !end_info) fatal_error (_("Error loading PNG file")) ;
- 
- 	/* Rutina de error */
--
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+ 	if (!info_ptr || !end_info) fatal_error (_("Error loading PNG file")) ;
+ 
+ 	/* Rutina de error */
+-
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
 +	if (setjmp(png_jmpbuf(png_ptr)))
 +#else
- 	if (setjmp (png_ptr->jmpbuf))
+ 	if (setjmp (png_ptr->jmpbuf))
 +#endif
- 	{
- 		png_destroy_read_struct (&png_ptr, &info_ptr, &end_info) ;
- 		fclose (png) ;
+ 	{
+ 		png_destroy_read_struct (&png_ptr, &info_ptr, &end_info) ;
+ 		fclose (png) ;