Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/ppStack/src/ppStackCombineInitial.c

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• ppStack (modified) (1 prop)
• ppStack/src (modified) (1 prop)
• ppStack/src/ppStackCombineInitial.c (modified) (1 diff)

branches/cnb_branches/cnb_branch_20090301/ppStack/src

@@ -9 +9 @@
 config.h.in
 stamp-h1
+ppStackVersionDefinitions.h

@@ -9 +9 @@
 config.h.in
 stamp-h1
+ppStackVersionDefinitions.h

branches/cnb_branches/cnb_branch_20090301/ppStack/src/ppStackCombineInitial.c

@@ -87 +87 @@
 #endif
 
-    // Sum covariance matrices
-    for (int i = 0; i < options->num; i++) {
-        if (options->inputMask->data.U8[i]) {
-            psFree(options->covariances->data[i]);
-            options->covariances->data[i] = NULL;
-        }
-    }
-    options->outRO->covariance = psImageCovarianceSum(options->covariances);
-    psFree(options->covariances); options->covariances = NULL;
     psFree(options->matchChi2); options->matchChi2 = NULL;
 

@@ -9 +9 @@
 config.h.in
 stamp-h1
+ppStackVersionDefinitions.h