Changeset 17568

Timestamp:

May 7, 2008, 2:04:11 PM (18 years ago)

Author:

Paul Price

Message:

Plugging memory leak.

File:

• trunk/psphot/src/psphotModelBackground.c (modified) (5 diffs)

trunk/psphot/src/psphotModelBackground.c

@@ -163 +163 @@
             // XXX don't bother trying if there are no valid pixels...
 
-            psVector *sample = NULL;
-
-            // turn on stats tracing in desired cells
-            # if (0)
-            psMetadata *plots = psMetadataLookupPtr (&status, recipe, "DIAGNOSTIC.PLOTS");
-            assert (plots);
-            
-            int xPlot = psMetadataLookupS32 (&status, plots, "IMAGE.BACKGROUND.CELL.HISTOGRAM.X");
-            assert (status);
-            int yPlot = psMetadataLookupS32 (&status, plots, "IMAGE.BACKGROUND.CELL.HISTOGRAM.Y");
-            assert (status);
-
-            bool gotX = (xPlot < 0) || (xPlot == ix);
-            bool gotY = (yPlot < 0) || (yPlot == iy);
-
-            if (gotX && gotY) {
-                psTraceSetLevel ("psLib.math.vectorFittedStats_v4", 6);
-                psTraceSetLevel ("psLib.math.vectorRobustStats", 6);
-            } else {
-                psTraceSetLevel ("psLib.math.vectorFittedStats_v4", 0);
-                psTraceSetLevel ("psLib.math.vectorRobustStats", 0);
-            }       
-            # endif
+            psVector *sample = NULL;
+
+            // turn on stats tracing in desired cells
+            # if (0)
+            psMetadata *plots = psMetadataLookupPtr (&status, recipe, "DIAGNOSTIC.PLOTS");
+            assert (plots);
+
+            int xPlot = psMetadataLookupS32 (&status, plots, "IMAGE.BACKGROUND.CELL.HISTOGRAM.X");
+            assert (status);
+            int yPlot = psMetadataLookupS32 (&status, plots, "IMAGE.BACKGROUND.CELL.HISTOGRAM.Y");
+            assert (status);
+
+            bool gotX = (xPlot < 0) || (xPlot == ix);
+            bool gotY = (yPlot < 0) || (yPlot == iy);
+
+            if (gotX && gotY) {
+                psTraceSetLevel ("psLib.math.vectorFittedStats_v4", 6);
+                psTraceSetLevel ("psLib.math.vectorRobustStats", 6);
+            } else {
+                psTraceSetLevel ("psLib.math.vectorFittedStats_v4", 0);
+                psTraceSetLevel ("psLib.math.vectorRobustStats", 0);
+            }
+            # endif
 
             if (psImageBackground(stats, &sample, subset, submask, maskVal, rng)) {
@@ -195 +195 @@
                 modelStdevData[iy][ix] = psStatsGetValue(stats, statsOptionWidth);
 
-                // supply sample to plotting routing
-                psphotDiagnosticPlots (config, "IMAGE.BACKGROUND.CELL.HISTOGRAM", ix, iy, modelData[iy][ix], modelStdevData[iy][ix], sample);
-                psFree (sample);
+                // supply sample to plotting routing
+                psphotDiagnosticPlots (config, "IMAGE.BACKGROUND.CELL.HISTOGRAM", ix, iy, modelData[iy][ix], modelStdevData[iy][ix], sample);
             } else {
                 psStatsOptions currentOptions = stats->options;
@@ -210 +209 @@
                     modelStdevData[iy][ix] = psStatsGetValue(stats, PS_STAT_ROBUST_STDEV);
 
-                    // supply sample to plotting routing
-                    psphotDiagnosticPlots (config, "IMAGE.BACKGROUND.CELL.HISTOGRAM", ix, iy, modelData[iy][ix], modelStdevData[iy][ix], sample);
-                    psFree (sample);
+                    // supply sample to plotting routing
+                    psphotDiagnosticPlots (config, "IMAGE.BACKGROUND.CELL.HISTOGRAM", ix, iy, modelData[iy][ix], modelStdevData[iy][ix], sample);
                 }
                 // drop errors caused by psImageBackground failures
@@ -219 +217 @@
                 stats->options = currentOptions;
             }
+            psFree(sample);
             modelData[iy][ix] += SKY_BIAS;
             psFree (subset);
@@ -263 +262 @@
     if (Count == 0) {
         psError (PSPHOT_ERR_DATA, true, "failed to build background image");
-        psFree(stats);
-        psFree(statsDefaults);
-        psFree(binning);
-        psFree(rng);
+        psFree(stats);
+        psFree(statsDefaults);
+        psFree(binning);
+        psFree(rng);
         return false;
     }