Update of /cvsroot/ufraw/ufraw
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18247
Modified Files:
ufraw-gimp.c
Log Message:
Fix various problems with Send-to-Gimp on newer Gimp versions (bugs #346 and
#353). Thanks goes to Nils Philippsen for the patches.
Index: ufraw-gimp.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw-gimp.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- ufraw-gimp.c 6 Jul 2013 05:00:11 -0000 1.79
+++ ufraw-gimp.c 14 Sep 2013 02:30:08 -0000 1.80
@@ -79,7 +79,12 @@
load_args,
load_return_vals);
- gimp_register_load_handler("file_ufraw_load", (char *)raw_ext, "");
+ gimp_register_magic_load_handler("file_ufraw_load",
+ (char *)raw_ext,
+ "",
+ "0,string,II*\\0,"
+ "0,string,MM\\0*,"
+ "0,string,<?xml");
gimp_install_procedure("file_ufraw_load_thumb",
"Loads thumbnails from digital camera raw files.",
@@ -430,6 +435,9 @@
uf->outputExifBufLen);
} else {
GimpParasite *exif_parasite;
+ GimpParam *return_vals;
+ gint nreturn_vals;
+
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)
@@ -438,6 +446,16 @@
gimp_image_parasite_attach(uf->gimpImage, exif_parasite);
#endif
gimp_parasite_free(exif_parasite);
+
+ return_vals = gimp_run_procedure("plug-in-metadata-decode-exif",
+ &nreturn_vals,
+ GIMP_PDB_IMAGE, uf->gimpImage,
+ GIMP_PDB_INT32, 7,
+ GIMP_PDB_INT8ARRAY, "unused",
+ GIMP_PDB_END);
+ if (return_vals[0].data.d_status != GIMP_PDB_SUCCESS) {
+ g_warning("UFRaw Exif -> XMP Merge failed");
+ }
}
}
/* Create "icc-profile" parasite from output profile
------------------------------------------------------------------------------
How ServiceNow helps IT people transform IT departments:
1. Consolidate legacy IT systems to a single system of record for IT
2. Standardize and globalize service processes across IT
3. Implement zero-touch automation to replace manual, redundant tasks
http://pubads.g.doubleclick.net/gampad/clk?id=51271111&iu=/4140/ostg.clktrk
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
