Update of /cvsroot/ufraw/ufraw
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5949
Modified Files:
ufraw-gimp.c ufraw_preview.c
Log Message:
Do not use deprecated function gimp_image_parasite_attach() with newer versions
of GIMP. Fix unused parameter warning with GIMP 2.9.x.
Index: ufraw-gimp.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw-gimp.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- ufraw-gimp.c 6 Jul 2013 04:30:08 -0000 1.78
+++ ufraw-gimp.c 6 Jul 2013 05:00:11 -0000 1.79
@@ -432,7 +432,11 @@
GimpParasite *exif_parasite;
exif_parasite = gimp_parasite_new("exif-data",
GIMP_PARASITE_PERSISTENT,
uf->outputExifBufLen, uf->outputExifBuf);
+#if defined(GIMP_CHECK_VERSION) && GIMP_CHECK_VERSION(2,8,0)
+ gimp_image_attach_parasite(uf->gimpImage, exif_parasite);
+#else
gimp_image_parasite_attach(uf->gimpImage, exif_parasite);
+#endif
gimp_parasite_free(exif_parasite);
}
}
@@ -446,7 +450,11 @@
GimpParasite *icc_parasite;
icc_parasite = gimp_parasite_new("icc-profile",
GIMP_PARASITE_PERSISTENT, len,
buf);
+#if defined(GIMP_CHECK_VERSION) && GIMP_CHECK_VERSION(2,8,0)
+ gimp_image_attach_parasite(uf->gimpImage, icc_parasite);
+#else
gimp_image_parasite_attach(uf->gimpImage, icc_parasite);
+#endif
gimp_parasite_free(icc_parasite);
g_free(buf);
} else {
Index: ufraw_preview.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_preview.c,v
retrieving revision 1.369
retrieving revision 1.370
diff -u -d -r1.369 -r1.370
--- ufraw_preview.c 1 Jun 2013 18:30:58 -0000 1.369
+++ ufraw_preview.c 6 Jul 2013 05:00:11 -0000 1.370
@@ -4768,8 +4768,11 @@
/* End of Base Curve page */
}
-static void colormgmt_fill_interface(preview_data *data, GtkWidget *page,
- int plugin)
+static void colormgmt_fill_interface(preview_data *data, GtkWidget *page
+#if !HAVE_GIMP_2_9
+ , int plugin
+#endif
+ )
{
GtkTable *table;
GtkWidget *button;
@@ -5610,8 +5613,11 @@
page = notebook_page_new(notebook, _("Color management"),
"color-management");
- colormgmt_fill_interface(data, page, plugin);
-
+ colormgmt_fill_interface(data, page
+#if !HAVE_GIMP_2_9
+ , plugin
+#endif
+ );
page = notebook_page_new(notebook, _("Correct luminosity, saturation"),
"color-corrections");
corrections_fill_interface(data, page, curveeditorHeight);
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
ufraw-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
