Changeset 13493

Timestamp:

May 23, 2007, 4:03:22 PM (19 years ago)

Author:

Paul Price

Message:

Squashing bugs, plugging memory leaks.

Location:

trunk/ppStack/src

Files:

• ppStackCamera.c (modified) (6 diffs)
• ppStackReadout.c (modified) (3 diffs)

trunk/ppStack/src/ppStackCamera.c

@@ -24 +24 @@
     }
     psArray *images = psStringSplitArray(imageList, "\n", false); // The image filenames
+    psFree(imageList);
 
     psString maskList = psSlurpFilename(maskName); // Contents of mask list
@@ -31 +32 @@
     }
     psArray *masks = psStringSplitArray(maskList, "\n", false); // The mask filenames
+    psFree(maskList);
     if (images->n != masks->n) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
@@ -57 +59 @@
 
         psArray *imageFiles = psArrayAlloc(1); // Array of filenames for this FPA
-        imageFiles->data[0] = image;
+        imageFiles->data[0] = psMemIncrRefCounter(image);
         psMetadataAddArray(config->arguments, PS_LIST_TAIL, "IMAGE.FILENAMES", PS_META_REPLACE,
                            "Filenames of image files", imageFiles);
@@ -63 +65 @@
 
         bool found = false;             // Found the file?
-        pmFPAfile *imageFile = pmFPAfileDefineFromArgs(&found, config, "PPSTACK.INPUT",
-                                                       "IMAGE.FILENAMES", true);
+        pmFPAfile *imageFile = pmFPAfileDefineFromArgs(&found, config, "PPSTACK.INPUT", "IMAGE.FILENAMES");
         if (!imageFile || !found) {
             psError(PS_ERR_UNKNOWN, false, "Unable to define file from image %d (%s)", i, image);
@@ -79 +80 @@
 
         psArray *maskFiles = psArrayAlloc(1); // Array of filenames for this FPA
-        maskFiles->data[0] = mask;
+        maskFiles->data[0] = psMemIncrRefCounter(mask);
         psMetadataAddArray(config->arguments, PS_LIST_TAIL, "MASK.FILENAMES", PS_META_REPLACE,
                            "Filenames of mask files", maskFiles);
+        psFree(maskFiles);
+
         found = false;
         pmFPAfile *maskFile = pmFPAfileBindFromArgs(&found, imageFile, config, "PPSTACK.INPUT.MASK",
-                                                    "MASK.FILENAMES", true);
+                                                    "MASK.FILENAMES");
         if (!maskFile || !found) {
             psError(PS_ERR_UNKNOWN, false, "Unable to define file from mask %d (%s)", i, mask);
@@ -102 +105 @@
 
     psMetadataAddS32(config->arguments, PS_LIST_TAIL, "INPUTS.NUM", 0, "Number of input files", images->n);
+
+    psFree(images);
+    psFree(masks);
 
     // Output image

trunk/ppStack/src/ppStackReadout.c

@@ -71 +71 @@
         pmStackData *data = pmStackDataAlloc(ro, SEEING, WEIGHT); // Data to stack
         psArrayAdd(stack, ARRAY_BUFFER, data);
+        psFree(data);                   // Drop reference
     }
     psFree(inputIter);
@@ -101 +102 @@
         psFree(name);
         psFitsWriteImage(fits, NULL, inspected, 0, NULL);
+        psFree(inspected);
         psFitsClose(fits);
     }
@@ -124 +126 @@
         psFree(name);
         psFitsWriteImage(fits, NULL, rejected, 0, NULL);
+        psFree(rejected);
         psFitsClose(fits);
     }