[Rawstudio-commit] r4099 - in trunk/plugins: load-gdk output-pngfile

[Klaus Post]

Author: post
Date: 2012-01-15 14:46:09 +0100 (Sun, 15 Jan 2012)
New Revision: 4099

Modified:
   trunk/plugins/load-gdk/exiv2-colorspace.cpp
   trunk/plugins/output-pngfile/output-pngfile.c
Log:
Hopefully add support for libpng 1.5

Modified: trunk/plugins/load-gdk/exiv2-colorspace.cpp
===================================================================
--- trunk/plugins/load-gdk/exiv2-colorspace.cpp 2012-01-15 13:18:26 UTC (rev 
4098)
+++ trunk/plugins/load-gdk/exiv2-colorspace.cpp 2012-01-15 13:46:09 UTC (rev 
4099)
@@ -125,7 +125,7 @@
 
                                        int compression_type;
                                        /* Extract embedded ICC profile */
-                                       if (info_ptr->valid & PNG_INFO_iCCP)
+                                       if (png_get_valid(png_ptr, info_ptr, 
TRUE) & PNG_INFO_iCCP)
                                        {
                                                png_uint_32 retval = 
png_get_iCCP (png_ptr, info_ptr,
                                                                                
                        (png_charpp) &icc_profile_title, &compression_type,

Modified: trunk/plugins/output-pngfile/output-pngfile.c
===================================================================
--- trunk/plugins/output-pngfile/output-pngfile.c       2012-01-15 13:18:26 UTC 
(rev 4098)
+++ trunk/plugins/output-pngfile/output-pngfile.c       2012-01-15 13:46:09 UTC 
(rev 4099)
@@ -23,6 +23,7 @@
 #include <gettext.h>
 #include "config.h"
 #include <png.h>
+#include <zlib.h>
 
 #define RS_TYPE_PNGFILE (rs_pngfile_type)
 #define RS_PNGFILE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RS_TYPE_PNGFILE, 
RSPngfile))
@@ -197,8 +198,7 @@
                const RSIccProfile *profile = 
rs_color_space_get_icc_profile(pngfile->color_space, pngfile->save16bit);
                rs_icc_profile_get_data(profile, &data, &data_length);
 
-               // FIXME: Insert correct profile name
-               png_set_iCCP(png_ptr, info_ptr, "Profile name", 
PNG_COMPRESSION_TYPE_BASE, data, data_length);
+               png_set_iCCP(png_ptr, info_ptr, 
(png_charp)rs_color_space_get_name(pngfile->color_space), 
PNG_COMPRESSION_TYPE_BASE, (png_charp)data, data_length);
                if (pngfile->save16bit)
                        png_set_gAMA(png_ptr, info_ptr, 1.0);
        }


_______________________________________________
Rawstudio-commit mailing list
Rawstudio-commit@rawstudio.org
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit