Changeset 6351 for branches/eam_rel9_p0/psModules/src/imsubtract/pmSubtractBias.c

Timestamp:

Feb 7, 2006, 2:52:13 PM (20 years ago)

Author:

Paul Price

Message:

Squashing memory leaks... some more yet to do.

File:

• branches/eam_rel9_p0/psModules/src/imsubtract/pmSubtractBias.c (modified) (4 diffs)

branches/eam_rel9_p0/psModules/src/imsubtract/pmSubtractBias.c

@@ -11 +11 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.6.8.1.2.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-01-20 09:47:06 $
+ *  @version $Revision: 1.6.8.1.2.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-08 00:52:13 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -376 +376 @@
         break;
     case PM_FIT_POLY_ORD:
-        overscanOpts->poly = psPolynomial1DAlloc(overscanOpts->order, PS_POLYNOMIAL_ORD);
-        overscanOpts->poly = psVectorFitPolynomial1D(overscanOpts->poly, mask, 1, reduced, NULL,
-                             ordinate);
+        if (overscanOpts->poly && (overscanOpts->poly->nX != overscanOpts->order ||
+                                   overscanOpts->poly->type != PS_POLYNOMIAL_ORD)) {
+            psFree(overscanOpts->poly);
+            overscanOpts->poly = psPolynomial1DAlloc(overscanOpts->order, PS_POLYNOMIAL_ORD);
+        }
+        psVectorFitPolynomial1D(overscanOpts->poly, mask, 1, reduced, NULL, ordinate);
         psFree(reduced);
         reduced = psPolynomial1DEvalVector(overscanOpts->poly, ordinate);
         break;
     case PM_FIT_POLY_CHEBY:
-        overscanOpts->poly = psPolynomial1DAlloc(overscanOpts->order, PS_POLYNOMIAL_CHEB);
-        overscanOpts->poly = psVectorFitPolynomial1D(overscanOpts->poly, mask, 1, reduced, NULL,
-                             ordinate);
+        if (overscanOpts->poly && (overscanOpts->poly->nX != overscanOpts->order ||
+                                   overscanOpts->poly->type != PS_POLYNOMIAL_CHEB)) {
+            psFree(overscanOpts->poly);
+            overscanOpts->poly = psPolynomial1DAlloc(overscanOpts->order, PS_POLYNOMIAL_CHEB);
+        }
+        psVectorFitPolynomial1D(overscanOpts->poly, mask, 1, reduced, NULL, ordinate);
         psFree(reduced);
         reduced = psPolynomial1DEvalVector(overscanOpts->poly, ordinate);
@@ -501 +507 @@
                 // Reduce the overscans
                 psVector *reduced = overscanVector(overscanOpts, pixels, myStats);
+                psFree(pixels);
                 if (! reduced) {
                     return in;
@@ -544 +551 @@
                 // Reduce the overscans
                 psVector *reduced = overscanVector(overscanOpts, pixels, myStats);
+                psFree(pixels);
                 if (! reduced) {
                     return in;