| author | Vladimir Marek <Vladimir.Marek@oracle.com> |
| Thu, 08 Dec 2016 17:02:09 +0100 | |
| branch | s11u3-sru |
| changeset 7538 | 1668450ff96c |
| parent 168 | 5884bc1edfdf |
| permissions | -rw-r--r-- |
|
7538
1668450ff96c
24788889 Update ImageMagick to 6.9.6-7
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
168
diff
changeset
|
1 |
The history of this patch is unknown: it existed when ImageMagick was |
|
1668450ff96c
24788889 Update ImageMagick to 6.9.6-7
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
168
diff
changeset
|
2 |
migrated to Userland. |
|
1668450ff96c
24788889 Update ImageMagick to 6.9.6-7
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
168
diff
changeset
|
3 |
|
|
1668450ff96c
24788889 Update ImageMagick to 6.9.6-7
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
168
diff
changeset
|
4 |
--- ImageMagick-6.8.3/coders/png.c.~1~ 2013-02-15 04:48:48.000000000 -0800 |
|
1668450ff96c
24788889 Update ImageMagick to 6.9.6-7
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
168
diff
changeset
|
5 |
+++ ImageMagick-6.8.3/coders/png.c 2015-02-10 20:39:14.131500401 -0800 |
|
1668450ff96c
24788889 Update ImageMagick to 6.9.6-7
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
168
diff
changeset
|
6 |
@@ -100,6 +100,10 @@ |
|
1668450ff96c
24788889 Update ImageMagick to 6.9.6-7
Vladimir Marek <Vladimir.Marek@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 |