Changeset 6743 for branches/rel10_ifa/psModules/src/astrom/pmFPACopy.c

Timestamp:

Mar 30, 2006, 3:33:07 PM (20 years ago)

Author:

Paul Price

Message:

Plugging memory leaks --- done.

File:

• branches/rel10_ifa/psModules/src/astrom/pmFPACopy.c (modified) (5 diffs)

branches/rel10_ifa/psModules/src/astrom/pmFPACopy.c

@@ -307 +307 @@
     // Get the size of the HDU, either from existing trimsec and biassec, or generate these and try again
     int xSize = 0, ySize = 0;           // Size of HDU
-    #if 1
-
     if (!sizeHDU(&xSize, &ySize, targetCells) && !(generateTrimBias(targetCells, sourceCells) &&
             sizeHDU(&xSize, &ySize, targetCells))) {
@@ -314 +312 @@
         return false;
     }
-    #else
-    if (!sizeHDU(&xSize, &ySize, targetCells)) {
-        if (generateTrimBias(targetCells, sourceCells)) {
-            if (!sizeHDU(&xSize, &ySize, targetCells)) {
-                psError(PS_ERR_IO, true, "Unable to determine size of HDU!\n");
-                return false;
-            }
-        } else {
-            psError(PS_ERR_IO, true, "Unable to determine size of HDU!\n");
-            return false;
-        }
-    }
-    #endif
+    psFree(targetCells);
+    psFree(sourceCells);
 
     hdu->images = psArrayAlloc(numReadouts);
@@ -509 +496 @@
         } else {
             copyPixels(hdu->images->data[i], sourceImage, *trimsec, xFlip, yFlip);
-            targetReadout->image = psMemIncrRefCounter(psImageSubset(hdu->images->data[i], *trimsec));
+            targetReadout->image = psImageSubset(hdu->images->data[i], *trimsec);
         }
 
@@ -532 +519 @@
             } else {
                 copyPixels(hdu->images->data[i], bias, *biassec, xFlip, yFlip);
-                psImage *newBias = psMemIncrRefCounter(psImageSubset(hdu->images->data[i], *biassec));
+                psImage *newBias = psImageSubset(hdu->images->data[i], *biassec);
                 psListAdd(targetReadout->bias, PS_LIST_TAIL, newBias);
                 psFree(newBias);        // Drop reference
             }
         }
+        psFree(targetReadout);          // Drop reference
         psFree(biassecsIter);
         psFree(biasIter);
@@ -551 +539 @@
         }
     }
+    psFree(conceptsIter);
 
     // Need to update CELL.X0 and CELL.Y0 if we flipped