File exult-1.4.9rc1-pngio-libpng15.patch of Package exult

Overview Repositories Revisions Requests Users Attributes Meta

File exult-1.4.9rc1-pngio-libpng15.patch of Package exult (Revision 32584ee466fac3fbb0cdaf16bfa6418c)

Currently displaying revision 32584ee466fac3fbb0cdaf16bfa6418c , Show latest

Author: Michal Slonina <michal.slonina@gmail.com>
Date:   Fri Oct 27 08:54:23 2017 +0200

fix pngio to work with libpng15

Index: shapes/pngio.cc
--- exult-1.4.9rc1/shapes/pngio.cc
+++ exult-1.4.9rc1/shapes/pngio.cc
@@ -31,6 +31,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <png.h>
 #include <setjmp.h>
+#include <string.h>
 
 
 /*
@@ -79,7 +80,11 @@ int Import_png8
 		}
 					// Allocate info. structure.
 	png_infop info = png_create_info_struct(png);
+#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4
+	if (setjmp(png_jmpbuf((png))))	// Handle errors.
+#else
 	if (setjmp(png->jmpbuf))	// Handle errors.
+#endif
 		{
 		png_destroy_read_struct(&png, &info, 0);
 		fclose(fp);
@@ -208,7 +213,11 @@ int Export_png8
 		}
 					// Allocate info. structure.
 	png_infop info = png_create_info_struct(png);
+#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4
+	if (setjmp(png_jmpbuf((png))))	// Handle errors.
+#else
 	if (setjmp(png->jmpbuf))	// Handle errors.
+#endif
 		{
 		png_destroy_write_struct(&png, &info);
 		fclose(fp);
@@ -306,7 +315,11 @@ int Import_png32
 		}
 					// Allocate info. structure.
 	png_infop info = png_create_info_struct(png);
+#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4
+	if (setjmp(png_jmpbuf((png))))	// Handle errors.
+#else
 	if (setjmp(png->jmpbuf))	// Handle errors.
+#endif
 		{
 		png_destroy_read_struct(&png, &info, 0);
 		fclose(fp);
@@ -395,7 +408,11 @@ int Export_png32
 		}
 					// Allocate info. structure.
 	png_infop info = png_create_info_struct(png);
+#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4
+	if (setjmp(png_jmpbuf((png))))	// Handle errors.
+#else
 	if (setjmp(png->jmpbuf))	// Handle errors.
+#endif
 		{
 		png_destroy_write_struct(&png, &info);
 		fclose(fp);

Places

File exult-1.4.9rc1-pngio-libpng15.patch of Package exult (Revision 32584ee466fac3fbb0cdaf16bfa6418c)

Places