]>
Commit | Line | Data |
---|---|---|
4ba74276 AM |
1 | From: inkscape upstream |
2 | Fix compilation against libpng-1.5 | |
3 | ||
4 | === modified file 'src/sp-image.cpp' | |
5 | --- src/sp-image.cpp 2011-02-21 07:59:34 +0000 | |
6 | +++ src/sp-image.cpp 2011-02-21 08:57:28 +0000 | |
7 | @@ -387,9 +387,13 @@ | |
8 | ||
9 | #if defined(PNG_iCCP_SUPPORTED) | |
10 | { | |
11 | - char* name = 0; | |
12 | + png_charp name = 0; | |
13 | int compression_type = 0; | |
14 | - char* profile = 0; | |
15 | +#if (PNG_LIBPNG_VER < 10500) | |
16 | + png_charp profile = 0; | |
17 | +#else | |
18 | + png_bytep profile = 0; | |
19 | +#endif | |
20 | png_uint_32 proflen = 0; | |
21 | if ( png_get_iCCP(pngPtr, infoPtr, &name, &compression_type, &profile, &proflen) ) { | |
22 | // g_message("Found an iCCP chunk named [%s] with %d bytes and comp %d", name, proflen, compression_type); | |
23 |