Changeset 29542 for trunk/psLib/src/math/psMinimizeLMM.c

Timestamp:

Oct 25, 2010, 12:54:22 PM (16 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20100823

File:

• trunk/psLib/src/math/psMinimizeLMM.c (modified) (3 diffs)

trunk/psLib/src/math/psMinimizeLMM.c

@@ -325 +325 @@
         chisq += PS_SQR(delta) * dy->data.F32[i];
 
-        if (isnan(dy->data.F32[i])) return NAN;
-        if (isnan(delta)) return NAN;
-        if (isnan(chisq)) return NAN;
+        if (isnan(dy->data.F32[i])) goto escape;
+        if (isnan(delta)) goto escape;
+        if (isnan(chisq)) goto escape;
 
         // we track alpha,beta and params,deriv separately
@@ -354 +354 @@
     psFree(deriv);
     return(chisq);
+
+escape:
+    psFree(deriv);
+    return NAN;
 }
 
@@ -448 +452 @@
     if (isnan(min->value)) {
         min->iter = min->maxIter;
+        psFree(alpha);
+        psFree(Alpha);
+        psFree(beta);
+        psFree(Beta);
+        psFree(Params);
         return(false);
     }