Changeset 28288

Timestamp:

Jun 10, 2010, 11:17:30 AM (16 years ago)

Author:

Paul Price

Message:

Fix errors to make it work.

Location:

trunk/ppBackground/src

Files:

• ppBackgroundArguments.c (modified) (2 diffs)
• ppBackgroundCamera.c (modified) (2 diffs)
• ppBackgroundExit.c (modified) (1 diff)

trunk/ppBackground/src/ppBackgroundArguments.c

@@ -60 +60 @@
     data->maskName = psMemIncrRefCounter(psMetadataLookupStr(NULL, arguments, "-mask"));
     data->outRoot = psStringCopy(argv[1]);
-    psMetadataAddStr(data->config->arguments, PS_LIST_TAIL, "OUTPUT", 0, "Output root name", data->outRoot);
+    psMetadataAddStr(arguments, PS_LIST_TAIL, "OUTPUT", 0, "Output root name", data->outRoot);
 
     psTrace("ppBackground", 1, "Done reading command-line arguments\n");
-    psFree(arguments);
 
     if (!data->patternName && !data->backgroundName) {
@@ -87 +86 @@
     }
 
+    psFree(arguments);
     return true;
 }

trunk/ppBackground/src/ppBackgroundCamera.c

@@ -46 +46 @@
     }
 
-    fileArguments("IMAGE", data->backgroundName, "Input uncorrected image", data->config);
+    fileArguments("IMAGE", data->imageName, "Input uncorrected image", data->config);
     pmFPAfile *image = pmFPAfileDefineFromArgs(&status, data->config, "PPBACKGROUND.IMAGE",
                                                "IMAGE"); // File
@@ -54 +54 @@
     }
 
-    fileArguments("MASK", data->backgroundName, "Input uncorrected mask", data->config);
+    fileArguments("MASK", data->maskName, "Input uncorrected mask", data->config);
     pmFPAfileBindFromArgs(&status, image, data->config, "PPBACKGROUND.MASK", "MASK"); // File
     if (!status) {

trunk/ppBackground/src/ppBackgroundExit.c

@@ -13 +13 @@
     if (errorCode != PS_ERR_NONE) {
         pmFPAfileFreeSetStrict(false);
-        psErrorStackPrint(stderr, "Error in subtraction:");
+        psErrorStackPrint(stderr, "Error in background restoration:");
         switch (errorCode) {
           case PS_ERR_UNKNOWN: