Changeset 6319

Timestamp:

Feb 3, 2006, 8:48:32 AM (20 years ago)

Author:

eugene

Message:

added missing frees

Location:

trunk/psphot/src

Files:

• psphotBasicDeblend.c (modified) (3 diffs)
• psphotImageBackground.c (modified) (2 diffs)
• psphotReadout.c (modified) (4 diffs)

trunk/psphot/src/psphotBasicDeblend.c

@@ -1 +1 @@
 # include "psphot.h"
 
+// 2006.02.02 : no leaks? (creates source->blend entries)
+// XXX if I free sources, I still have 54 leaks?
 bool psphotBasicDeblend (psArray *sources, psMetadata *config, psStats *sky) { 
 
@@ -109 +111 @@
                 }
             }  
+            psFree (contour);
         }
     }
@@ -116 +119 @@
     if (!strcasecmp (breakPt, "DEBLEND")) exit (0);
 
+    psFree (SN);
+    psFree (index);
+    psFree (overlap);
+    
     return true;
 }

trunk/psphot/src/psphotImageBackground.c

@@ -1 +1 @@
 # include "psphot.h"
 
+// 2006.02.02 : no leaks
 psPolynomial2D *psphotImageBackground (pmReadout *readout, psMetadata *config, psStats *sky) 
 { 
@@ -61 +62 @@
     sky->sampleMean = 0.0;
 
+    psFree (x);
+    psFree (y);
+    psFree (z);
+    psFree (rnd);  // XXX should this be made available at a higher level?
+
     psLogMsg ("psphot", 3, "fit background model: %f sec\n", psTimerMark ("psphot"));
     return (skyModel);

trunk/psphot/src/psphotReadout.c

@@ -1 +1 @@
 # include "psphot.h"
+
+# define MEM_0 psMemId ID = psMemGetId ();
+# define MEM_1(A) \
+    psTimerStop ();\
+    if (A != NULL) { psFree (A); } \
+    fprintf (stderr, "found %d leaks\n", psMemCheckLeaks (ID, NULL, NULL, false));\
+    exit (1);
 
 bool psphotReadout (pmReadout *readout, psMetadata *config) {
@@ -8 +15 @@
     psStats     *sky     = NULL;
     bool         status;
+    psPolynomial2D *model = NULL;
 
     psphotSaveImage (NULL, readout->mask, "mask.fits");
@@ -18 +26 @@
     // generate a background model (currently, 2D polynomial)
     // XXX this should be available to be re-added to the original image
-    psphotImageBackground (readout, config, sky);
+    model = psphotImageBackground (readout, config, sky);
 
     // find the peaks in the image
@@ -33 +41 @@
 
     // use bright stellar objects to measure PSF
+    MEM_0;
     psf = psphotChoosePSF (config, sources, sky);
+    MEM_1(psf);
 
     // XXX change FITMODE to a string