German Ruiz 1fca419
From: inkscape upstream
German Ruiz 1fca419
Fix compilation against libpng-1.5
German Ruiz 1fca419
German Ruiz 1fca419
=== modified file 'src/sp-image.cpp'
German Ruiz 1fca419
--- src/sp-image.cpp	2011-02-21 07:59:34 +0000
German Ruiz 1fca419
+++ src/sp-image.cpp	2011-02-21 08:57:28 +0000
German Ruiz 1fca419
@@ -387,9 +387,13 @@
German Ruiz 1fca419
 
German Ruiz 1fca419
 #if defined(PNG_iCCP_SUPPORTED)
German Ruiz 1fca419
                 {
German Ruiz 1fca419
-                    char* name = 0;
German Ruiz 1fca419
+                    png_charp name = 0;
German Ruiz 1fca419
                     int compression_type = 0;
German Ruiz 1fca419
-                    char* profile = 0;
German Ruiz 1fca419
+#if (PNG_LIBPNG_VER < 10500)
German Ruiz 1fca419
+                    png_charp profile = 0;
German Ruiz 1fca419
+#else
German Ruiz 1fca419
+                    png_bytep profile = 0;
German Ruiz 1fca419
+#endif
German Ruiz 1fca419
                     png_uint_32 proflen = 0;
German Ruiz 1fca419
                     if ( png_get_iCCP(pngPtr, infoPtr, &name, &compression_type, &profile, &proflen) ) {
German Ruiz 1fca419
 //                                         g_message("Found an iCCP chunk named [%s] with %d bytes and comp %d", name, proflen, compression_type);
German Ruiz 1fca419