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

Timestamp:

May 4, 2006, 5:37:16 PM (20 years ago)

Author:

Paul Price

Message:

Moving format back into options --- we need to know the camera configuration in order to get the recipe

File:

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

trunk/ppMerge/src/ppMergeCheckInputs.c

@@ -49 +49 @@
         // FPAview from the specified camera format configuration, and use pmFPAAddSourceFromView), but for
         // now it's less hassle just to limit the output format to be the input format.
-        if (!data->format) {
-            data->format = pmConfigCameraFormatFromHeader(config, header);
+        if (!options->format) {
+            options->format = pmConfigCameraFormatFromHeader(config, header);
             psFree(header);
-            if (!data->format) {
+            if (!options->format) {
                 psLogMsg(__func__, PS_LOG_WARN, "Unable to identify camera format for input file %s --- "
                              "ignored.\n", name);
@@ -60 +60 @@
                 continue;
             }
-        } else if (!pmConfigValidateCameraFormat(data->format, header)) {
+        } 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
@@ -69 +69 @@
 
         data->in->data[i] = pmFPAConstruct(config->camera);
-        pmFPAview *view = pmFPAAddSourceFromHeader(data->in->data[i], header, data->format);
+        pmFPAview *view = pmFPAAddSourceFromHeader(data->in->data[i], header, options->format);
         psFree(view);
 
@@ -75 +75 @@
         if (!data->out) {
             data->out = pmFPAConstruct(config->camera);
-            pmFPAview *view = pmFPAAddSourceFromHeader(data->out, header, data->format);
+            pmFPAview *view = pmFPAAddSourceFromHeader(data->out, header, options->format);
             psFree(view);
         }