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

Timestamp:

Feb 7, 2006, 11:18:31 AM (20 years ago)

Author:

Paul Price

Message:

Squashing memory leaks

File:

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

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

@@ -6 +6 @@
 #include "pmChipMosaic.h"
 
-#define MEM_LEAKS 1
+#define MEM_LEAKS 0
 
 // Compare a value with a maximum and minimum
@@ -156 +156 @@
             continue;
         }
+
+        psMetadataPrint(cell->concepts, 10);
+
         nCells++;
         gain       += psMetadataLookupF32(NULL, cell->concepts, "CELL.GAIN");
@@ -266 +269 @@
 
         // The images to put into the mosaic
-        images->data[i]  = readout->image;
-        weights->data[i] = readout->weight;
-        masks->data[i]   = readout->mask;
+        images->data[i]  = psMemIncrRefCounter(readout->image);
+        weights->data[i] = psMemIncrRefCounter(readout->weight);
+        masks->data[i]   = psMemIncrRefCounter(readout->mask);
     }
     // Mosaic the images together and we're done
@@ -311 +314 @@
 
     // Chop off all the component cells, and put in a new one
-    #ifndef MEM_LEAKS
+    #if !MEM_LEAKS
     pmChipFreeCells(chip);
     #else
@@ -321 +324 @@
     cellConcepts(cell, cells, xBinChip, yBinChip);
 
-    #if 1
+    #if 0
     // XXX For the sake of getting something working, I am not going to bother with sorting out where
     // the double free is coming from.  I'm going to drop the pointers on the array and create a memory
     // leak.  We can clean this up later, when we're not under as much pressure.
-    #else
-
     psArrayElementsFree(chip->cells);
     chip->cells->n = 0;
@@ -337 +338 @@
     // 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 = psMemIncrRefCounter(psImageSubset(image, entire));
-    readout->weight = psMemIncrRefCounter(psImageSubset(weight, entire));
-    readout->mask = psMemIncrRefCounter(psImageSubset(mask, entire));
+    readout->image = psImageSubset(image, entire);
+    readout->weight = psImageSubset(weight, entire);
+    readout->mask = psImageSubset(mask, entire);
     psFree(readout);