Changeset 9986

Timestamp:

Nov 14, 2006, 3:11:21 PM (20 years ago)

Author:

Paul Price

Message:

Plugging memory leaks --- forgotten free in pmMaskIdentifyBadPixels, and was clobbering existing array in generateHDU.

Location:

trunk/psModules/src

Files:

• camera/pmHDUGenerate.c (modified) (2 diffs)
• detrend/pmMaskBadPixels.c (modified) (1 diff)

trunk/psModules/src/camera/pmHDUGenerate.c

@@ -303 +303 @@
     int numReadouts = -1;               // Number of readouts
     psElemType imageType = 0;           // Type of readout images
-    psElemType maskType = 0;   // Type of readout masks
+    psElemType maskType = 0;            // Type of readout masks
     psElemType weightType = 0;          // Type of readout weights
     {
@@ -324 +324 @@
                 }
 
-                if (readout->image) {
+                if (!hdu->images && readout->image) {
                     imageType = checkTypes(imageType, readout->image->type.type);
                 }
-                if (readout->mask) {
+                if (!hdu->masks && readout->mask) {
                     maskType = checkTypes(maskType, readout->mask->type.type);
                 }
-                if (readout->weight) {
+                if (!hdu->weights && readout->weight) {
                     weightType = checkTypes(weightType, readout->weight->type.type);
                 }

trunk/psModules/src/detrend/pmMaskBadPixels.c

@@ -148 +148 @@
     float mean = stats->sampleMean;     // Mean value
     float stdev = stats->sampleStdev;   // Standard deviation
+    psFree(stats);
 
     psImage *badpix = psImageAlloc(suspects->numCols, suspects->numRows, PS_TYPE_MASK); // Bad pixel mask