Mercurial > mxe-octave
comparison src/vigra-1-png.patch @ 1626:5772a60b7521
package vigra: libpng 1.5 compatibility
author | Mark Brand <mabrand@mabrand.nl> |
---|---|
date | Fri, 04 Mar 2011 09:44:32 +0100 |
parents | |
children | 2288fcbf74ad |
comparison
equal
deleted
inserted
replaced
1625:7a3f723b7986 | 1626:5772a60b7521 |
---|---|
1 This file is part of mingw-cross-env. | |
2 See doc/index.html for further information. | |
3 | |
4 Posted 4 March 2011 on: | |
5 https://mailhost.informatik.uni-hamburg.de/pipermail/vigra/ | |
6 | |
7 diff --git a/src/impex/png.cxx b/src/impex/png.cxx | |
8 index 23786ef..6d0b012 100644 | |
9 --- a/src/impex/png.cxx | |
10 +++ b/src/impex/png.cxx | |
11 @@ -320,7 +320,7 @@ namespace vigra { | |
12 #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED) | |
13 char * dummyName; | |
14 int dummyCompType; | |
15 - char * profilePtr; | |
16 + png_byte * profilePtr; | |
17 png_uint_32 profileLen; | |
18 if (png_get_valid( png, info, PNG_INFO_iCCP )) { | |
19 png_get_iCCP(png, info, &dummyName, &dummyCompType, &profilePtr, &profileLen) ; | |
20 @@ -592,7 +592,7 @@ namespace vigra { | |
21 // set icc profile | |
22 if (iccProfile.size() > 0) { | |
23 png_set_iCCP(png, info, (png_charp)("icc"), 0, | |
24 - (png_charp)iccProfile.begin(), (png_uint_32)iccProfile.size()); | |
25 + (png_byte*)iccProfile.begin(), (png_uint_32)iccProfile.size()); | |
26 } | |
27 #endif | |
28 |