Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/imagemagick/patches/png.patch
author Brian Utterback <brian.utterback@oracle.com>
Fri, 11 Oct 2013 13:46:59 -0700
branchs11u1-sru
changeset 2795 a8138e69c041
parent 168 5884bc1edfdf
child 3798 c0f7a9f723ca
permissions -rw-r--r--
15705382 SUNBT7031289 Update ntp to 4.2.7 15722546 SUNBT7055402 ipmp cause reachability issues for ntp4 daemon 15727250 SUNBT7064417 ntpd errors on some new system 15751447 SUNBT7106031 Solaris 11 restrict noserve doesn't work right 15785388 SUNBT7161189 ntpd starts on S 11 in a forked status with error "ntpd indicates n 15813516 SUNBT7195495 ntpd crashed with SIGFPE (Arithmetic Exception) 16090481 ntp version 4 daemon crashes in isc_interfaceiter_first() 16741686 "ntpd" v4.2.5 cannot accept/query interface names longer than 15 characters. 16978017 ntpd debug in Solaris 11.1does not write any output 17000189 NTP needs to increase its file descriptor limit. 17000601 ntpd should log a message when it exits abnormally.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
168
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
     1
 
--- ImageMagick-6.3.4/coders/png.c.orig	Mon Aug 23 12:50:12 2010
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
     2
 
+++ ImageMagick-6.3.4/coders/png.c	Mon Aug 23 12:51:35 2010
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
     3
 
@@ -76,6 +76,10 @@
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
     4
 
 #if defined(HasPNG)
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
     5
 
 #include "png.h"
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
     6
 
 #include "zlib.h"
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
     7
 
+#if PNG_LIBPNG_VER >= 10400
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
     8
 
+#define trans_values trans_color
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
     9
 
+#define trans trans_alpha
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    10
 
+#endif
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    11
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    12
 
 /* ImageMagick differences */
5884bc1edfdf 7026850 move ImageMagick to userland
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
diff changeset 
    13
 
 #define first_scene scene
upstream/oracle/userland-gate