Changeset 29217 for branches/eam_branches/ipp-20100823/ppStack/src/ppStackCombineFinal.c

Timestamp:

Sep 23, 2010, 7:08:16 AM (16 years ago)

Author:

eugene

Message:

more clearly distinguish mask used to test for bad pixels from mask value used to set possibly blank pixels; do not fail is no covariances are supplied; replace instance of psMetadataAddU8 with psMetadataAddImageMask; replace pmReadoutMaskNonfinite with pmReadoutMaskInvalid (only masks unmasked nan pixels)

File:

• branches/eam_branches/ipp-20100823/ppStack/src/ppStackCombineFinal.c (modified) (1 diff)

branches/eam_branches/ipp-20100823/ppStack/src/ppStackCombineFinal.c

@@ -93 +93 @@
 
     // Sum covariance matrices
+    // the array may be defined, but no covariances actually supplied.
+    bool haveCovariances = false;
     if (covariances) {
+        for (int i = 0; i < covariances->n; i++) {
+            haveCovariances |= (covariances->data[i] != NULL);
+        }
+    }
+
+    if (haveCovariances) {
         outRO->covariance = psImageCovarianceAverageWeighted(covariances, options->weightings);
     } else {