Changeset 6351 for branches/eam_rel9_p0/psModules/src/astrom/pmChipMosaic.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/astrom/pmChipMosaic.c (modified) (3 diffs)

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

@@ -157 +157 @@
         }
 
-        psMetadataPrint(cell->concepts, 10);
-
         nCells++;
         gain       += psMetadataLookupF32(NULL, cell->concepts, "CELL.GAIN");
@@ -303 +301 @@
         psArrayElementsFree(hdu->weights);
         psArrayElementsFree(hdu->masks);
-        hdu->images  = psArrayAlloc(1);
-        hdu->weights = psArrayAlloc(1);
-        hdu->masks   = psArrayAlloc(1);
+        hdu->images  = psArrayRealloc(hdu->images,1);
+        hdu->weights = psArrayRealloc(hdu->weights, 1);
+        hdu->masks   = psArrayRealloc(hdu->masks, 1);
         hdu->images->data[0]  = image;
         hdu->weights->data[0] = weight;
@@ -314 +312 @@
 
     // Chop off all the component cells, and put in a new one
-    #if !MEM_LEAKS
+    pmCell *newCell = pmCellAlloc(NULL, NULL, __func__); // New cell
+    cellConcepts(newCell, cells, xBinChip, yBinChip);
     pmChipFreeCells(chip);
-    #else
-
-    chip->cells = psArrayAlloc(0);
-    #endif
-
-    pmCell *cell = pmCellAlloc(chip, NULL, __func__); // New cell
-    cellConcepts(cell, cells, xBinChip, yBinChip);
-
-    #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.
-    psArrayElementsFree(chip->cells);
-    chip->cells->n = 0;
-    #endif
-
-    cell->exists = true;
-    cell->process = true;
-    pmReadout *readout = pmReadoutAlloc(cell); // New readout
-    psRegion entire = {0.0, 0.0, 0.0, 0.0};
+    // Have to put in the new cell manually, since we didn't want to put it in before blowing the cells away.
+    newCell->parent = chip;
+    psArrayAdd(chip->cells, 1, newCell);
+    newCell->exists = true;
+    newCell->process = true;
+
+    // Now make a new readout to go in the new cell
+    pmReadout *newReadout = pmReadoutAlloc(newCell); // New readout
     // 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);
-    psFree(readout);
+    psRegion entire = {0.0, 0.0, 0.0, 0.0};
+    newReadout->image = psImageSubset(image, entire);
+    newReadout->weight = psImageSubset(weight, entire);
+    newReadout->mask = psImageSubset(mask, entire);
+    // Drop references
+    psFree(newReadout);
+    psFree(newCell);
 
     // Well, we've stuffed around with the camera configuration, so it's no longer valid...