Changeset 18650 for trunk/ppStack/src/ppStack.c

Timestamp:

Jul 21, 2008, 3:29:19 PM (18 years ago)

Author:

Paul Price

Message:

Must parse arguments after defining a camera; otherwise can't get camera-dependent recipe values.

File:

• trunk/ppStack/src/ppStack.c (modified) (2 diffs)

trunk/ppStack/src/ppStack.c

@@ -26 +26 @@
     (void) psTraceSetLevel("ppStack", 5);
 
-    if (!ppStackArguments(argc, argv, config)) {
+    if (!ppStackArgumentsSetup(argc, argv, config)) {
         psErrorStackPrint(stderr, "Error reading arguments.\n");
         exitValue = PS_EXIT_CONFIG_ERROR;
@@ -40 +40 @@
     if (!ppStackCamera(config)) {
         psErrorStackPrint(stderr, "Error setting up input files.\n");
+        exitValue = PS_EXIT_CONFIG_ERROR;
+        goto die;
+    }
+
+    if (!ppStackArgumentsParse(config)) {
+        psErrorStackPrint(stderr, "Error reading arguments.\n");
         exitValue = PS_EXIT_CONFIG_ERROR;
         goto die;