Changeset 7753

Timestamp:

Jun 29, 2006, 10:37:51 AM (20 years ago)

Author:

magnier

Message:

fixed memory leak in psVectorFitPolynomial1D

File:

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

trunk/psLib/src/math/psMinimizePolyFit.c

@@ -10 +10 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-05-18 03:05:47 $
+ *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-29 20:37:51 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -686 +686 @@
     }
 
-    if (f->type.type != PS_TYPE_F64) {
-        f64 = psVectorCopy(NULL, f, PS_TYPE_F64);
-    } else {
-        f64 = (psVector *) f;
-    }
+    f64 = (f->type.type == PS_TYPE_F64) ? (psVector *) f : psVectorCopy(NULL, f, PS_TYPE_F64);
 
     if (x != NULL) {
-        if (x->type.type != PS_TYPE_F64) {
-            x64 = psVectorCopy(NULL, x, PS_TYPE_F64);
-        } else {
-            x64 = (psVector *) x;
-        }
+        x64 = (x->type.type == PS_TYPE_F64) ? (psVector *) x : psVectorCopy(NULL, x, PS_TYPE_F64);
     }
 
     if (fErr != NULL) {
-        if (fErr->type.type != PS_TYPE_F64) {
-            fErr64 = psVectorCopy(NULL, fErr, PS_TYPE_F64);
-        } else {
-            fErr64 = (psVector *) fErr;
-        }
-    }
-
-    if (poly->type == PS_POLYNOMIAL_ORD) {
+        fErr64 = (fErr->type.type == PS_TYPE_F64) ? (psVector *) fErr : psVectorCopy(NULL, fErr, PS_TYPE_F64);
+    }
+
+    switch (poly->type) {
+    case PS_POLYNOMIAL_ORD:
         poly = VectorFitPolynomial1DOrd(poly, mask, maskValue, f64, fErr64, x64);
         if (poly == NULL) {
             psError(PS_ERR_UNKNOWN, false, "Could not fit polynomial.  Returning NULL.\n");
-            return(NULL);
-        }
-    } else if (poly->type == PS_POLYNOMIAL_CHEB) {
+        }
+        break;
+    case PS_POLYNOMIAL_CHEB:
         if (mask != NULL) {
             //            psLogMsg(__func__, PS_LOG_WARN, "WARNING: ignoring mask and maskValue with Chebyshev polynomials.\n");
@@ -731 +720 @@
             psFree(x64);
         }
-    } else {
+        break;
+    default:
         psError(PS_ERR_UNKNOWN, true, "Incorrect polynomial type (%d).  Returning NULL.\n", poly->type);
         poly = NULL;
+        break;
     }