Changeset 14806 for trunk/ppSub/src/ppSubCamera.c

Timestamp:

Sep 10, 2007, 2:08:40 PM (19 years ago)

Author:

Paul Price

Message:

Adding support for getting stamps from sources.

File:

• trunk/ppSub/src/ppSubCamera.c (modified) (5 diffs)

trunk/ppSub/src/ppSubCamera.c

@@ -28 +28 @@
     pmFPAfile *inputMask = pmFPAfileBindFromArgs(&status, input, config, "PPSUB.INPUT.MASK", "INPUT.MASK");
     if (!status) {
-        psError (PS_ERR_UNKNOWN, false, "failed to load find definition");
+        psError (PS_ERR_UNKNOWN, false, "Failed to load file definition PPSUB.INPUT.MASK");
         return NULL;
     }
@@ -39 +39 @@
     pmFPAfile *inputWeight = pmFPAfileBindFromArgs(&status, input, config, "PPSUB.INPUT.WEIGHT", "INPUT.WEIGHT");
     if (!status) {
-        psError (PS_ERR_UNKNOWN, false, "failed to load find definition");
+        psError (PS_ERR_UNKNOWN, false, "Failed to load file definition PPSUB.INPUT.WEIGHT");
         return NULL;
     }
@@ -62 +62 @@
     pmFPAfile *refMask = pmFPAfileBindFromArgs(&status, ref, config, "PPSUB.REF.MASK", "REF.MASK");
     if (!status) {
-        psError (PS_ERR_UNKNOWN, false, "failed to load find definition");
+        psError (PS_ERR_UNKNOWN, false, "Failed to load file definition PPSUB.REF.MASK");
         return NULL;
     }
@@ -73 +73 @@
     pmFPAfile *refWeight = pmFPAfileBindFromArgs(&status, ref, config, "PPSUB.REF.WEIGHT", "REF.WEIGHT");
     if (!status) {
-        psError (PS_ERR_UNKNOWN, false, "failed to load find definition");
+        psError (PS_ERR_UNKNOWN, false, "Failed to load file definition PPSUB.REF.WEIGHT");
         return NULL;
     }
@@ -128 +128 @@
     psFree(view);
 
+    pmFPAfile *sources = pmFPAfileBindFromArgs(&status, input, config, "PPSUB.SOURCES", "SOURCES");
+    if (!sources) {
+        psError(PS_ERR_IO, false, "Failed to load file definition PPSUB.SOURCES");
+        return false;
+    }
+    if (ref->type != PM_FPA_FILE_CMF) {
+        psError(PS_ERR_IO, true, "PPSUB.SOURCES is not of type CMF");
+        return false;
+    }
+
     // psPhot input
     if (psMetadataLookup(config->arguments, "PSPHOT.PSF")) {