Author: post
Date: 2012-02-02 20:58:31 +0100 (Thu, 02 Feb 2012)
New Revision: 4124
Modified:
trunk/plugins/load-gdk/exiv2-colorspace.cpp
Log:
Add support for libpng > 1.5.
Modified: trunk/plugins/load-gdk/exiv2-colorspace.cpp
===================================================================
--- trunk/plugins/load-gdk/exiv2-colorspace.cpp 2012-01-31 21:08:51 UTC (rev
4123)
+++ trunk/plugins/load-gdk/exiv2-colorspace.cpp 2012-02-02 19:58:31 UTC (rev
4124)
@@ -127,9 +127,15 @@
/* Extract embedded ICC profile */
if (png_get_valid(png_ptr, info_ptr,
TRUE) & PNG_INFO_iCCP)
{
+#if PNG_LIBPNG_VER_SONUM >=15
png_uint_32 retval =
png_get_iCCP (png_ptr, info_ptr,
+
(png_charpp) &icc_profile_title, &compression_type,
+
(png_byte**) &icc_profile, (png_uint_32*)
&icc_profile_size);
+#else
+ png_uint_32 retval =
png_get_iCCP (png_ptr, info_ptr,
(png_charpp) &icc_profile_title, &compression_type,
(png_charpp) &icc_profile, (png_uint_32*)
&icc_profile_size);
+#endif
if (retval != 0)
{
RSIccProfile *icc =
rs_icc_profile_new_from_memory((gchar*)icc_profile, icc_profile_size, TRUE);
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
