diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2011-03-04 21:45:04 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2011-03-04 21:45:04 (GMT) |
| commit | 53d9daf2595fcc1a95acc040922282eb38e831e9 (patch) | |
| tree | f1f368a9070b6791fbd8b125c9b0ddf6e656508f /src/vigra-1-png.patch | |
| parent | 1592e495910ec2cccd5773907108a92eef664498 (diff) | |
| download | mxe-53d9daf2595fcc1a95acc040922282eb38e831e9.zip mxe-53d9daf2595fcc1a95acc040922282eb38e831e9.tar.gz mxe-53d9daf2595fcc1a95acc040922282eb38e831e9.tar.bz2 | |
package vigra: libpng backwards-compatible
Diffstat (limited to 'src/vigra-1-png.patch')
| -rw-r--r-- | src/vigra-1-png.patch | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/vigra-1-png.patch b/src/vigra-1-png.patch index eef67d4..03f42f7 100644 --- a/src/vigra-1-png.patch +++ b/src/vigra-1-png.patch @@ -5,24 +5,30 @@ 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 +index 23786ef..08822bd 100644 --- a/src/impex/png.cxx +++ b/src/impex/png.cxx -@@ -320,7 +320,7 @@ namespace vigra { +@@ -320,7 +320,11 @@ namespace vigra { #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED) char * dummyName; int dummyCompType; -- char * profilePtr; ++#if (PNG_LIBPNG_VER < 10500) + char * profilePtr; ++#else + png_byte * profilePtr; ++#endif 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 { +@@ -592,7 +596,11 @@ 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()); ++#if (PNG_LIBPNG_VER < 10500) + (png_charp)iccProfile.begin(), (png_uint_32)iccProfile.size()); ++#else + (png_byte*)iccProfile.begin(), (png_uint_32)iccProfile.size()); ++#endif } #endif |