[patch] 5.2-libpng15.patch

5.2-libpng15.patch (text/plain), 1.71 KB, created by Samuli Suominen (RETIRED) on 2011-08-11 20:33:23 UTC

diff -ur arbsrc_6779.orig/GL/glpng/glpng.c arbsrc_6779/GL/glpng/glpng.c
--- arbsrc_6779.orig/GL/glpng/glpng.c	2008-07-22 12:11:32.000000000 +0300
+++ arbsrc_6779/GL/glpng/glpng.c	2011-08-11 23:29:40.000000000 +0300
@@ -285,7 +285,7 @@
     endinfo = png_create_info_struct(png);
 
     // DH: added following lines
-    if (setjmp(png->jmpbuf))
+    if (setjmp(png_jmpbuf(png)))
     {
         png_destroy_read_struct(&png, &info, &endinfo);
         return 0;
@@ -390,7 +390,7 @@
     endinfo = png_create_info_struct(png);
 
     // DH: added following lines
-    if (setjmp(png->jmpbuf))
+    if (setjmp(png_jmpbuf(png)))
     {
         png_destroy_read_struct(&png, &info, &endinfo);
         return 0;
@@ -569,7 +569,7 @@
 #define ALPHA *q
 
                 switch (trans) {
-                    case PNG_CALLBACK:
+                    case PNG_CALLBACKT:
                         FORSTART
                             ALPHA = AlphaCallback((unsigned char) r, (unsigned char) g, (unsigned char) b);
                         FOREND
diff -ur arbsrc_6779.orig/GL/glpng/glpng.h arbsrc_6779/GL/glpng/glpng.h
--- arbsrc_6779.orig/GL/glpng/glpng.h	2008-07-22 12:11:32.000000000 +0300
+++ arbsrc_6779/GL/glpng/glpng.h	2011-08-11 23:29:57.000000000 +0300
@@ -57,7 +57,7 @@
 #define PNG_SIMPLEMIPMAP PNG_SIMPLEMIPMAPS
 
     /* Transparency parameters */
-#define PNG_CALLBACK  -3 /* Call the callback function to generate alpha   */
+#define PNG_CALLBACKT  -3 /* Call the callback function to generate alpha   */
 #define PNG_ALPHA     -2 /* Use alpha channel in PNG file, if there is one */
 #define PNG_SOLID     -1 /* No transparency                                */
 #define PNG_STENCIL    0 /* Sets alpha to 0 for r=g=b=0, 1 otherwise       */