Changeset 29552 for trunk/ppStack/src/ppStackCombineFinal.c

Timestamp:

Oct 25, 2010, 3:22:33 PM (16 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20100823

File:

• trunk/ppStack/src/ppStackCombineFinal.c (modified) (1 diff)

trunk/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 {