[UFRaw-CVS] ufraw ufraw.h,1.167,1.168 ufraw-batch.c,1.45,1.46

[Niels K. B. J. <nk...@us...>]

Update of /cvsroot/ufraw/ufraw
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30536a

Modified Files:
	ufraw.h ufraw-batch.c 
Log Message:
Only overwrite ID files created with createID=only_id if asked to do so by a command line switch. Fix bug #3039432.

Index: ufraw.h
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw.h,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -d -r1.167 -r1.168
--- ufraw.h	1 Jan 2013 04:00:17 -0000	1.167
+++ ufraw.h	3 Feb 2013 11:30:23 -0000	1.168
@@ -220,7 +220,7 @@
  * CONF|ID: curve/profile are added to the list from RC.
  * CONF: inputFilename, outputFilename are ignored.
  * outputPath can only be specified in CMD or guessed in interactive mode.
- * ID: createID==only_id is switched to also_id in case of ufraw-batch.
+ * ID: createID==only_id is switched to no_id in case of ufraw-batch.
  * ID: chanMul[] override wb, green, temperature.
  */
 typedef struct {

Index: ufraw-batch.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw-batch.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- ufraw-batch.c	1 Jan 2013 04:00:17 -0000	1.45
+++ ufraw-batch.c	3 Feb 2013 11:30:23 -0000	1.46
@@ -73,8 +73,8 @@
             continue;
         }
         status = ufraw_config(uf, &rc, &conf, &cmd);
-        if (uf->conf && uf->conf->createID == only_id && cmd.createID != only_id)
-            uf->conf->createID = also_id;
+        if (uf->conf && uf->conf->createID == only_id && cmd.createID == -1)
+            uf->conf->createID = no_id;
         if (status == UFRAW_ERROR) {
             exitCode = 1;
             ufraw_close_darkframe(uf->conf);