components/imagemagick/patches/png.patch
author Jan Friedel <jan.friedel@oracle.com>
Sun, 26 Jun 2016 22:01:00 -0700
changeset 6287 09470f4f0af3
parent 3798 c0f7a9f723ca
permissions -rw-r--r--
23593285 update libgcrypt to version 1.7.1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3798
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results
John Beck <John.Beck@Oracle.COM>
parents: 168
diff changeset
     1
The history of this patch is unknown: it existed when ImageMagick was
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results
John Beck <John.Beck@Oracle.COM>
parents: 168
diff changeset
     2
migrated to Userland.
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results
John Beck <John.Beck@Oracle.COM>
parents: 168
diff changeset
     3
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results
John Beck <John.Beck@Oracle.COM>
parents: 168
diff changeset
     4
--- ImageMagick-6.8.3/coders/png.c.~1~	2013-02-15 04:48:48.000000000 -0800
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results
John Beck <John.Beck@Oracle.COM>
parents: 168
diff changeset
     5
+++ ImageMagick-6.8.3/coders/png.c	2015-02-10 20:39:14.131500401 -0800
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results
John Beck <John.Beck@Oracle.COM>
parents: 168
diff changeset
     6
@@ -100,6 +100,10 @@
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results
John Beck <John.Beck@Oracle.COM>
parents: 168
diff changeset
     7
 
168
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset
     8
 #include "png.h"
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset
     9
 #include "zlib.h"
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset
    10
+#if PNG_LIBPNG_VER >= 10400
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset
    11
+#define trans_values trans_color
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset
    12
+#define trans trans_alpha
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset
    13
+#endif
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset
    14
 
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset
    15
 /* ImageMagick differences */
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset
    16
 #define first_scene scene