summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brand <mabrand@mabrand.nl>2011-03-04 08:44:32 (GMT)
committerMark Brand <mabrand@mabrand.nl>2011-03-04 08:44:32 (GMT)
commite01c5184f0ca96b0e29dfbf427237dfd508045b9 (patch)
tree7ae58ae0f245f79bd296c7efa3f3e6c55a93a0d9
parent2ba4832b0e2d1b0a37399e9718b64b21f474b134 (diff)
downloadmxe-e01c5184f0ca96b0e29dfbf427237dfd508045b9.zip
mxe-e01c5184f0ca96b0e29dfbf427237dfd508045b9.tar.gz
mxe-e01c5184f0ca96b0e29dfbf427237dfd508045b9.tar.bz2
package vigra: libpng 1.5 compatibility
-rw-r--r--src/vigra-1-png.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/src/vigra-1-png.patch b/src/vigra-1-png.patch
new file mode 100644
index 0000000..eef67d4
--- /dev/null
+++ b/src/vigra-1-png.patch
@@ -0,0 +1,28 @@
+This file is part of mingw-cross-env.
+See doc/index.html for further information.
+
+Posted 4 March 2011 on:
+https://mailhost.informatik.uni-hamburg.de/pipermail/vigra/
+
+diff --git a/src/impex/png.cxx b/src/impex/png.cxx
+index 23786ef..6d0b012 100644
+--- a/src/impex/png.cxx
++++ b/src/impex/png.cxx
+@@ -320,7 +320,7 @@ namespace vigra {
+ #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED)
+ char * dummyName;
+ int dummyCompType;
+- char * profilePtr;
++ png_byte * profilePtr;
+ png_uint_32 profileLen;
+ if (png_get_valid( png, info, PNG_INFO_iCCP )) {
+ png_get_iCCP(png, info, &dummyName, &dummyCompType, &profilePtr, &profileLen) ;
+@@ -592,7 +592,7 @@ namespace vigra {
+ // set icc profile
+ if (iccProfile.size() > 0) {
+ png_set_iCCP(png, info, (png_charp)("icc"), 0,
+- (png_charp)iccProfile.begin(), (png_uint_32)iccProfile.size());
++ (png_byte*)iccProfile.begin(), (png_uint_32)iccProfile.size());
+ }
+ #endif
+