Changeset 34246 for branches/eam_branches/ipp-20120627/psModules/src/imcombine/pmStack.c

Timestamp:

Jul 31, 2012, 11:47:07 AM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120627/psModules

Files:

• . (modified) (1 prop)
• src/imcombine/pmStack.c (modified) (2 diffs)

branches/eam_branches/ipp-20120627/psModules/src/imcombine/pmStack.c

@@ -357 +357 @@
         sumWeight += weights->data.F32[i];
         if (variances) {
-            sumVarianceWeight += variances->data.F32[i] * PS_SQR(weights->data.F32[i]);
+          //            sumVarianceWeight += variances->data.F32[i] * PS_SQR(weights->data.F32[i]);
+          sumVarianceWeight += 1 / variances->data.F32[i];
         }
         if (exps) {
@@ -372 +373 @@
     *mean = sumValueWeight / sumWeight;
     if (var) {
-        *var = sumVarianceWeight / PS_SQR(sumWeight);
+      //*var = sumVarianceWeight / PS_SQR(sumWeight);
+      *var = 1 / sumVarianceWeight;
     }
     if (exp) {