Changeset 29515 for branches/eam_branches/ipp-20100823/pstamp/src/ppstampMakeStamp.c

Timestamp:

Oct 21, 2010, 2:45:13 PM (16 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20100823/pstamp/src/ppstampMakeStamp.c (modified) (3 diffs)

branches/eam_branches/ipp-20100823/pstamp/src/ppstampMakeStamp.c

@@ -233 +233 @@
     int status = false;
 
-    pmFPAfile *output = psMetadataLookupPtr(NULL, config->files, "PPSTAMP.OUTPUT");
+    pmFPAfile *output;
+    if (!options->stage || (strcmp(options->stage, "diff") != 0)) {
+        output = psMetadataLookupPtr(NULL, config->files, "PPSTAMP.OUTPUT");
+    } else {
+        output = psMetadataLookupPtr(NULL, config->files, "PPSTAMP.OUTPUT.DIFF");
+    }
     if (!output) {
         psError(PS_ERR_UNKNOWN, false, "Can't find output data\n");
@@ -674 +679 @@
 static bool setMaskedToNAN(pmConfig *config, psImage *image, psImage *mask, psImage *variance)
 {
+#ifdef notdef
     bool status;
     psMetadata *masks = psMetadataLookupMetadata(&status, config->recipes, "MASKS");
@@ -719 +725 @@
         }
     }
-    fprintf(stderr, "excised %ld masked pixels\n", numExcised);
+#endif
+
+    long numCensored;
+    if (!pmCensorMasked(config, image, mask, variance, &numCensored)) {
+        psError(PS_ERR_UNKNOWN, false, "Failed to censor masked pixels.\n");
+        return false;
+    }
+
+    // XXX: this shouldn't be a fprintf
+    fprintf(stderr, "Censored %ld masked pixels\n", numCensored);
 
     return true;