Mercurial > hg > mxe-octave-anirudha
changeset 1629:2288fcbf74ad
package vigra: libpng backwards-compatible
author | Mark Brand <mabrand@mabrand.nl> |
---|---|
date | Fri, 04 Mar 2011 22:45:04 +0100 |
parents | 817eb45b5d3d |
children | 8f891b4913b6 |
files | src/vigra-1-png.patch |
diffstat | 1 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/vigra-1-png.patch +++ b/src/vigra-1-png.patch @@ -5,24 +5,30 @@ 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