Changeset 38062 for trunk/Ohana/src/dvomerge/src/args.c

Timestamp:

Mar 29, 2015, 6:52:41 AM (11 years ago)

Author:

eugene

Message:

merge changes from ipp-20150112

Location:

trunk

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/dvomerge/src/args.c (modified) (1 diff)

trunk/Ohana/src/dvomerge/src/args.c

@@ -206 +206 @@
   }
 
+  UPDATE_CATFORMAT = NULL;
+  if ((N = get_argument (*argc, argv, "-update-catformat"))) {
+    remove_argument (N, argc, argv);
+    UPDATE_CATFORMAT = strcreate (argv[N]);
+    remove_argument (N, argc, argv);
+  }
+
   /* replace measurement, don't duplicate */
   REPLACE_BY_PHOTCODE = FALSE;