Changeset 28280 for trunk/ppBackground/src/ppBackgroundCamera.c

Timestamp:

Jun 9, 2010, 6:16:39 PM (16 years ago)

Author:

Paul Price

Message:

Coding more or less done. Need to add ppStats call. Compiles.

Location:

trunk/ppBackground

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/ppBackgroundCamera.c (modified) (5 diffs)

trunk/ppBackground/src/ppBackgroundCamera.c

@@ -33 +33 @@
 
     fileArguments("PATTERN", data->patternName, "Input pattern", data->config);
-    pmFPAfile *pattern = pmFPAfileDefineFromArgs(&status, data->config, "PPBACKGROUND.PATTERN",
-                                                 "PATTERN"); // File
+    pmFPAfileDefineFromArgs(&status, data->config, "PPBACKGROUND.PATTERN", "PATTERN"); // File
     if (!status) {
         psError(psErrorCodeLast(), false, "Failed to build file from PPBACKGROUND.PATTERN");
@@ -41 +40 @@
 
     fileArguments("BACKGROUND", data->backgroundName, "Input background model", data->config);
-    pmFPAfile *background = pmFPAfileBindFromArgs(&status, data->config, "PPBACKGROUND.BACKGROUND",
-                                                  "BACKGROUND"); // File
+    pmFPAfileDefineFromArgs(&status, data->config, "PPBACKGROUND.BACKGROUND", "BACKGROUND"); // File
     if (!status) {
         psError(psErrorCodeLast(), false, "Failed to build file from PPBACKGROUND.BACKGROUND");
@@ -49 +47 @@
 
     fileArguments("IMAGE", data->backgroundName, "Input uncorrected image", data->config);
-    pmFPAfile *image = pmFPAfileBindFromArgs(&status, background, data->config, "PPBACKGROUND.IMAGE",
-                                             "IMAGE"); // File
-    if (!status) {
+    pmFPAfile *image = pmFPAfileDefineFromArgs(&status, data->config, "PPBACKGROUND.IMAGE",
+                                               "IMAGE"); // File
+    if (!status || !image) {
         psError(psErrorCodeLast(), false, "Failed to build file from PPBACKGROUND.IMAGE");
         return false;
@@ -57 +55 @@
 
     fileArguments("MASK", data->backgroundName, "Input uncorrected mask", data->config);
-    pmFPAfile *mask = pmFPAfileBindFromArgs(&status, image, data->config, "PPBACKGROUND.MASK",
-                                              "MASK"); // File
+    pmFPAfileBindFromArgs(&status, image, data->config, "PPBACKGROUND.MASK", "MASK"); // File
     if (!status) {
         psError(psErrorCodeLast(), false, "Failed to build file from PPBACKGROUND.MASK");
@@ -64 +61 @@
     }
 
-    pmFPAfile *output = pmFPAfileDefineOutput(data->config, file->fpa, "PPBACKGROUND.OUTPUT");
+    pmFPAfile *output = pmFPAfileDefineOutput(data->config, image->fpa, "PPBACKGROUND.OUTPUT");
     if (!output) {
         psError(psErrorCodeLast(), false, "Unable to define output.");