Changeset 14948

Timestamp:

Sep 20, 2007, 2:18:26 PM (19 years ago)

Author:

eugene

Message:

plug some leaks from psImageSubset

Location:

branches/eam_branch_20070830/psModules/src

Files:

• camera/pmFPAMosaic.c (modified) (4 diffs)
• camera/pmFPARead.c (modified) (5 diffs)
• objects/pmSource.c (modified) (3 diffs)

branches/eam_branch_20070830/psModules/src/camera/pmFPAMosaic.c

@@ -1024 +1024 @@
         // force limits to land on chip
         psRegion bounds = psRegionForImage (hdu->images->data[0], *chipRegion);
-        mosaicImage = psMemIncrRefCounter(psImageSubset(hdu->images->data[0], bounds));
+        mosaicImage = psImageSubset(hdu->images->data[0], bounds);
         if (!mosaicImage) {
             psError(PS_ERR_UNKNOWN, false, "Unable to select image pixels.\n");
@@ -1030 +1030 @@
         }
         if (hdu->masks) {
-            mosaicMask = psMemIncrRefCounter(psImageSubset(hdu->masks->data[0], bounds));
+            mosaicMask = psImageSubset(hdu->masks->data[0], bounds);
             if (!mosaicMask) {
                 psError(PS_ERR_UNKNOWN, false, "Unable to select mask pixels.\n");
@@ -1037 +1037 @@
         }
         if (hdu->weights) {
-            mosaicWeights = psMemIncrRefCounter(psImageSubset(hdu->weights->data[0], bounds));
+            mosaicWeights = psImageSubset(hdu->weights->data[0], bounds);
             if (!mosaicWeights) {
                 psError(PS_ERR_UNKNOWN, false, "Unable to select weight pixels.\n");
@@ -1256 +1256 @@
         psTrace("psModules.camera", 1, "Case 1 mosaicking: simple cut-out.\n");
         pmHDU *hdu = source->hdu;         // The HDU that has the pixels
-        mosaicImage = psMemIncrRefCounter(psImageSubset(hdu->images->data[0], *fpaRegion));
+        mosaicImage = psImageSubset(hdu->images->data[0], *fpaRegion);
         if (hdu->masks) {
-            mosaicMask = psMemIncrRefCounter(psImageSubset(hdu->masks->data[0], *fpaRegion));
+            mosaicMask = psImageSubset(hdu->masks->data[0], *fpaRegion);
         }
         if (hdu->weights) {
-            mosaicWeights = psMemIncrRefCounter(psImageSubset(hdu->weights->data[0], *fpaRegion));
+            mosaicWeights = psImageSubset(hdu->weights->data[0], *fpaRegion);
         }
     } else {

branches/eam_branch_20070830/psModules/src/camera/pmFPARead.c

@@ -64 +64 @@
 
     // place the image subset in the appropriate target location, freeing if needed
-    // XXX why psMemIncrRefCounter on psImageSubset??
     switch (type) {
       case FPA_READ_TYPE_IMAGE:
@@ -70 +69 @@
             psFree (readout->image);
         }
-        readout->image = psMemIncrRefCounter(psImageSubset(image, region));
+        readout->image = psImageSubset(image, region);
         break;
       case FPA_READ_TYPE_MASK:
@@ -76 +75 @@
             psFree (readout->mask);
         }
-        readout->mask = psMemIncrRefCounter(psImageSubset(image, region));
+        readout->mask = psImageSubset(image, region);
         break;
       case FPA_READ_TYPE_WEIGHT:
@@ -82 +81 @@
             psFree (readout->weight);
         }
-        readout->weight = psMemIncrRefCounter(psImageSubset(image, region));
+        readout->weight = psImageSubset(image, region);
         break;
       default:
@@ -111 +110 @@
                                       PS_MIN(biassec->y1 - readout->row0, image->numRows) // y1
                                      );
-        psImage *overscan = psMemIncrRefCounter(psImageSubset(image, region));
+        psImage *overscan = psImageSubset(image, region);
         psListAdd(readout->bias, PS_LIST_TAIL, overscan);
         psFree(overscan);

branches/eam_branch_20070830/psModules/src/objects/pmSource.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.35.2.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-07 20:34:27 $
+ *  @version $Revision: 1.35.2.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-09-21 00:18:26 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -175 +175 @@
 
     // these images are subset images of the equivalent parents
-    mySource->pixels   = psMemIncrRefCounter(psImageSubset(readout->image, srcRegion));
-    mySource->weight   = psMemIncrRefCounter(psImageSubset(readout->weight, srcRegion));
-    mySource->maskView = psMemIncrRefCounter(psImageSubset(readout->mask,  srcRegion));
+    mySource->pixels   = psImageSubset(readout->image, srcRegion);
+    mySource->weight   = psImageSubset(readout->weight, srcRegion);
+    mySource->maskView = psImageSubset(readout->mask,  srcRegion);
     mySource->region   = srcRegion;
 
@@ -220 +220 @@
         psFree (mySource->maskView);
 
-        mySource->pixels   = psMemIncrRefCounter(psImageSubset(readout->image,  newRegion));
-        mySource->weight   = psMemIncrRefCounter(psImageSubset(readout->weight, newRegion));
-        mySource->maskView = psMemIncrRefCounter(psImageSubset(readout->mask,   newRegion));
+        mySource->pixels   = psImageSubset(readout->image,  newRegion);
+        mySource->weight   = psImageSubset(readout->weight, newRegion);
+        mySource->maskView = psImageSubset(readout->mask,   newRegion);
         mySource->region   = newRegion;