[UFRaw-CVS] ufraw ufraw_ufraw.c,1.258,1.259

[Udi F. <udi...@us...>]

Update of /cvsroot/ufraw/ufraw
In directory vz-cvs-2.sog:/tmp/cvs-serv26034

Modified Files:
	ufraw_ufraw.c 
Log Message:
Fix the failover to dcraw EXIF tags when exiv2 fails.


Index: ufraw_ufraw.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_ufraw.c,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -d -r1.258 -r1.259
--- ufraw_ufraw.c	27 Feb 2011 06:34:37 -0000	1.258
+++ ufraw_ufraw.c	1 Mar 2011 05:27:04 -0000	1.259
@@ -434,7 +434,8 @@
         if (ufraw_exif_read_input(uf) != UFRAW_SUCCESS) {
             ufraw_message(UFRAW_SET_LOG, "Error reading EXIF data from %s\n",
                           uf->filename);
-        } else {
+            // If exiv2 fails to read the EXIF data, use the EXIF tags read
+            // by dcraw.
             g_strlcpy(uf->conf->exifSource, "DCRaw", max_name);
             uf->conf->iso_speed = raw->iso_speed;
             g_snprintf(uf->conf->isoText, max_name, "%d",