Mercurial Mercurial > sustaining > oi_151a > sfw-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.
usr/src/cmd/ImageMagick/png.patch
author Jon Tibble <meths@btinternet.com>
Mon, 04 May 2015 14:04:39 +0100
branchoi_151a
changeset 254 9c2a4ac793f0
parent 46 9c200dad5ecc
permissions -rw-r--r--
Bash patch catchup including shellshock
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
46
9c200dad5ecc Import sfw nuild 149
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     1
 
--- ImageMagick-6.3.4/coders/png.c.orig	Mon Aug 23 12:50:12 2010
9c200dad5ecc Import sfw nuild 149
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     2
 
+++ ImageMagick-6.3.4/coders/png.c	Mon Aug 23 12:51:35 2010
9c200dad5ecc Import sfw nuild 149
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     3
 
@@ -76,6 +76,10 @@
9c200dad5ecc Import sfw nuild 149
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     4
 
 #if defined(HasPNG)
9c200dad5ecc Import sfw nuild 149
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     5
 
 #include "png.h"
9c200dad5ecc Import sfw nuild 149
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     6
 
 #include "zlib.h"
9c200dad5ecc Import sfw nuild 149
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     7
 
+#if PNG_LIBPNG_VER >= 10400
9c200dad5ecc Import sfw nuild 149
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     8
 
+#define trans_values trans_color
9c200dad5ecc Import sfw nuild 149
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     9
 
+#define trans trans_alpha
9c200dad5ecc Import sfw nuild 149
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    10
 
+#endif
9c200dad5ecc Import sfw nuild 149
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    11
9c200dad5ecc Import sfw nuild 149
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    12
 
 /* ImageMagick differences */
9c200dad5ecc Import sfw nuild 149
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    13
 
 #define first_scene scene
sustaining/oi_151a/sfw-gate