Author: Ullrich Koethe <ullrich.koethe@iwr.uni-heidelberg.de>
Approved: Ralf Treinen <treinen@debian.org>
Description: Fix FTBFS with libpng 1.5
Debian-Bug: 636003

Index: libvigraimpex-1.7.1+dfsg1/src/impex/png.cxx
===================================================================
--- libvigraimpex-1.7.1+dfsg1.orig/src/impex/png.cxx	2011-08-03 22:28:44.000000000 +0200
+++ libvigraimpex-1.7.1+dfsg1/src/impex/png.cxx	2011-08-03 22:32:14.000000000 +0200
@@ -320,7 +320,11 @@
 #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED)
         char * dummyName;
         int dummyCompType;
+#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 +596,11 @@
         // set icc profile
         if (iccProfile.size() > 0) {
             png_set_iCCP(png, info, (png_charp)("icc"), 0,
+#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
 
