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

Timestamp:

Jan 30, 2007, 12:00:03 PM (19 years ago)

Author:

Paul Price

Message:

Don't know why we need that call to pmFPACopyStructure --- it's already adding the source.

File:

• trunk/ppMerge/src/ppMergeCheckInputs.c (modified) (2 diffs)

trunk/ppMerge/src/ppMergeCheckInputs.c

@@ -83 +83 @@
             }
         } 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;
-          }
+          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;
+          }
         }
 
@@ -107 +107 @@
             pmFPAview *view = pmFPAAddSourceFromHeader(data->out, header, options->format);
             psFree(view);
-#if 1
-            pmFPACopyStructure(data->out, data->in->data[i], 1, 1);
-#endif
         }
         psFree(header);