Changeset 14950

Timestamp:

Sep 20, 2007, 2:21:57 PM (19 years ago)

Author:

eugene

Message:

plug leaks

Location:

trunk/psModules/src

Files:

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

trunk/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);

trunk/psModules/src/objects/pmSource.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-21 00:09:05 $
+ *  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-09-21 00:21:57 $
  *
  *  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->pixels = psImageSubset(readout->image, srcRegion);
     if (readout->weight) {
-        mySource->weight = psMemIncrRefCounter(psImageSubset(readout->weight, srcRegion));
+        mySource->weight = psImageSubset(readout->weight, srcRegion);
     }
     if (readout->mask) {
-        mySource->maskView = psMemIncrRefCounter(psImageSubset(readout->mask,  srcRegion));
+        mySource->maskView = psImageSubset(readout->mask,  srcRegion);
         // the object mask is a copy, and used to define the source pixels
         mySource->maskObj = psImageCopy(NULL, mySource->maskView, PS_TYPE_MASK);
@@ -223 +223 @@
         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;