Changeset 13528 for trunk/pswarp/src/pswarpParseCamera.c

Timestamp:

May 25, 2007, 5:09:20 PM (19 years ago)

Author:

eugene

Message:

changed the pmFPAfileDefine functions to not require an input status value

File:

• trunk/pswarp/src/pswarpParseCamera.c (modified) (3 diffs)

trunk/pswarp/src/pswarpParseCamera.c

@@ -10 +10 @@
     status = false;
     pmFPAfile *input = pmFPAfileDefineFromArgs (&status, config, "PSWARP.INPUT", "INPUT");
-    if (!input) {
+    if (!input || !status) {
         psError(PSWARP_ERR_CONFIG, false, "Failed to build FPA from PSWARP.INPUT");
         return false;
@@ -17 +17 @@
     // the input image(s) are required arguments; they define the camera
     status = false;
-    pmFPAfileDefineFromArgs (&status, config, "PSWARP.ASTROM", "ASTROM");
-    if (status) {
+    pmFPAfile *astrom = pmFPAfileDefineFromArgs (&status, config, "PSWARP.ASTROM", "ASTROM");
+    if (!status) {
+        psError (PS_ERR_UNKNOWN, false, "failed to load find definition");
+        return NULL;
+    }
+    if (astrom) {
         psLogMsg ("pswarp", 3, "using supplied astrometry\n");
     } else {
@@ -25 +29 @@
 
     // the mask is not required - but must conform to input camera
-    pmFPAfile *inMask = pmFPAfileBindFromArgs(NULL, input, config, "PSWARP.MASK", "MASK");
+    pmFPAfile *inMask = pmFPAfileBindFromArgs(&status, input, config, "PSWARP.MASK", "MASK");
+    if (!status) {
+        psError (PS_ERR_UNKNOWN, false, "failed to load find definition");
+        return NULL;
+    }
     if (!inMask) {
         psLogMsg ("pswarp", 3, "no mask supplied\n");
     }
 
-    pmFPAfile *inWeight = pmFPAfileBindFromArgs(NULL, input, config, "PSWARP.WEIGHT", "WEIGHT");
+    pmFPAfile *inWeight = pmFPAfileBindFromArgs(&status, input, config, "PSWARP.WEIGHT", "WEIGHT");
+    if (!status) {
+        psError (PS_ERR_UNKNOWN, false, "failed to load find definition");
+        return NULL;
+    }
     if (!inWeight) {
         psLogMsg ("pswarp", 3, "no weight supplied\n");