Changeset 6145 for branches/eam_rel9_p0/psModules/src/astrom/pmChipMosaic.c

Timestamp:

Jan 21, 2006, 5:23:32 PM (20 years ago)

Author:

Paul Price

Message:

Trying to fix memory leaks, but they are a long way down; too hard to find for now.

File:

• branches/eam_rel9_p0/psModules/src/astrom/pmChipMosaic.c (modified) (3 diffs)

branches/eam_rel9_p0/psModules/src/astrom/pmChipMosaic.c

@@ -5 +5 @@
 #include "pmFPA.h"
 #include "pmChipMosaic.h"
+
+#define MEM_LEAKS 1
 
 // Compare a value with a maximum and minimum
@@ -309 +311 @@
 
     // Chop off all the component cells, and put in a new one
+    #ifndef MEM_LEAKS
+    pmChipFreeCells(chip);
+    #else
+
     chip->cells = psArrayAlloc(0);
+    #endif
+
     pmCell *cell = pmCellAlloc(chip, NULL, __func__); // New cell
     cellConcepts(cell, cells, xBinChip, yBinChip);
-    psFree(cells);
 
     #if 1
@@ -330 +337 @@
     // Want the readouts to contain a subimage, but that subimage is the whole image.
     // This preserves the relationship there was before, where freeing the parent frees the child.
-    readout->image = psImageSubset(image, entire);
-    readout->weight = psImageSubset(weight, entire);
-    readout->mask = psImageSubset(mask, entire);
+    readout->image = psMemIncrRefCounter(psImageSubset(image, entire));
+    readout->weight = psMemIncrRefCounter(psImageSubset(weight, entire));
+    readout->mask = psMemIncrRefCounter(psImageSubset(mask, entire));
     psFree(readout);