Changeset 11249 for trunk/ppMerge/src/ppMergeCheckInputs.c

Timestamp:

Jan 23, 2007, 12:47:38 PM (19 years ago)

Author:

eugene

Message:

fixed error with CameraValidateConfig

File:

• trunk/ppMerge/src/ppMergeCheckInputs.c (modified) (1 diff)

trunk/ppMerge/src/ppMergeCheckInputs.c

@@ -82 +82 @@
                 continue;
             }
-        } else if (!pmConfigValidateCameraFormat(options->format, header)) {
-            psLogMsg(__func__, PS_LOG_WARN, "Input file %s doesn't match camera format --- ignored.\n", name);
-            // Kick it out
-            psFree(header);
-            data->in->data[i] = NULL;
-            continue;
+        } else {
+          bool valid = false;
+          if (!pmConfigValidateCameraFormat(&valid, options->format, header)) {
+            psError (PS_ERR_UNKNOWN, false, "Error in config scripts\n");
+            exit (PS_EXIT_CONFIG_ERROR);
+          }
+          if (!valid) {
+            psLogMsg(__func__, PS_LOG_WARN, "Input file %s doesn't match camera format --- ignored.\n", name);
+            // Kick it out
+            psFree(header);
+            data->in->data[i] = NULL;
+            continue;
+          }
         }