Changeset 13528 for trunk/ppSub/src/ppSubCamera.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/ppSub/src/ppSubCamera.c (modified) (4 diffs)

trunk/ppSub/src/ppSubCamera.c

@@ -26 +26 @@
 
     // Input mask
-    pmFPAfile *inputMask = pmFPAfileBindFromArgs(NULL, input, config, "PPSUB.INPUT.MASK", "INPUT.MASK");
+    pmFPAfile *inputMask = pmFPAfileBindFromArgs(&status, input, config, "PPSUB.INPUT.MASK", "INPUT.MASK");
+    if (!status) {
+        psError (PS_ERR_UNKNOWN, false, "failed to load find definition");
+        return NULL;
+    }
     if (inputMask && inputMask->type != PM_FPA_FILE_MASK) {
         psError(PS_ERR_IO, true, "PPSUB.INPUT.MASK is not of type MASK");
@@ -33 +37 @@
 
     // Input weight map
-    pmFPAfile *inputWeight = pmFPAfileBindFromArgs(NULL, input, config, "PPSUB.INPUT.WEIGHT", "INPUT.WEIGHT");
+    pmFPAfile *inputWeight = pmFPAfileBindFromArgs(&status, input, config, "PPSUB.INPUT.WEIGHT", "INPUT.WEIGHT");
+    if (!status) {
+        psError (PS_ERR_UNKNOWN, false, "failed to load find definition");
+        return NULL;
+    }
     if (inputWeight && inputWeight->type != PM_FPA_FILE_WEIGHT) {
         psError(PS_ERR_IO, true, "PPSUB.INPUT.WEIGHT is not of type WEIGHT");
@@ -52 +60 @@
 
     // Reference mask
-    pmFPAfile *refMask = pmFPAfileBindFromArgs(NULL, input, config, "PPSUB.REF.MASK", "REF.MASK");
+    pmFPAfile *refMask = pmFPAfileBindFromArgs(&status, input, config, "PPSUB.REF.MASK", "REF.MASK");
+    if (!status) {
+        psError (PS_ERR_UNKNOWN, false, "failed to load find definition");
+        return NULL;
+    }
     if (refMask && refMask->type != PM_FPA_FILE_MASK) {
         psError(PS_ERR_IO, true, "PPSUB.REF.MASK is not of type MASK");
@@ -59 +71 @@
 
     // Reference weight map
-    pmFPAfile *refWeight = pmFPAfileBindFromArgs(NULL, input, config, "PPSUB.REF.WEIGHT", "REF.WEIGHT");
+    pmFPAfile *refWeight = pmFPAfileBindFromArgs(&status, input, config, "PPSUB.REF.WEIGHT", "REF.WEIGHT");
+    if (!status) {
+        psError (PS_ERR_UNKNOWN, false, "failed to load find definition");
+        return NULL;
+    }
     if (refWeight && refWeight->type != PM_FPA_FILE_WEIGHT) {
         psError(PS_ERR_IO, true, "PPSUB.REF.WEIGHT is not of type WEIGHT");