Changeset 32252

Timestamp:

Aug 31, 2011, 1:30:49 PM (15 years ago)

Author:

bills

Message:

use psFitsTable structure when copying extra extensions.
Fix previously existing memory leak of extra extension header in sources file.

Location:

trunk/magic/remove/src

Files:

• streaksio.c (modified) (2 diffs)
• streaksremove.c (modified) (5 diffs)

trunk/magic/remove/src/streaksio.c

@@ -752 +752 @@
         return;
     }
-    psArray *table = psFitsReadTable(in->fits);
+    psFitsTable *table = psFitsReadTableNew(in->fits);
     if (!table) {
         psError(PS_ERR_UNKNOWN, false, "failed to read table in extension %d from in->resolved name", extnum);
@@ -758 +758 @@
     }
 
-    if (!psFitsWriteTable(out->fits, out->header, table, extname)) {
+    if (!psFitsWriteTableNew(out->fits, out->header, table, extname)) {
         psError(PS_ERR_UNKNOWN, false, "failed to copy table in extension %d", extnum);
         streaksExit("", PS_EXIT_DATA_ERROR);
     }
+    psFree(table);
 }
 

trunk/magic/remove/src/streaksremove.c

@@ -9 +9 @@
 
 #include "streaksremove.h"
-
-#include "psFitsTableNew.h"
 
 static pmConfig *parseArguments(int argc, char **argv);
@@ -280 +278 @@
 
     if (statsFileName) {
-    // Write out
         psString resolved = pmConfigConvertFilename(statsFileName, config, true, true); // Resolved filename
         if (!resolved) {
@@ -294 +291 @@
     }
 
-    // all done. Clean up to look for memory leaks.
+    // all done. Clean up and look for memory leaks.
 
     psFree(sfiles);
@@ -1060 +1057 @@
         }
 
-        psArray *inTable = psFitsReadTable(in->fits);
-        if (!inTable) {
+        psFitsTable *table = psFitsReadTableNew(in->fits);
+        if (!table) {
             psErrorStackPrint(stderr, "failed to read table in %s", in->resolved_name);
             streaksExit("", PS_EXIT_DATA_ERROR);
         }
-        if (! psFitsWriteTable(out->fits, header, inTable, extname)) {
+        if (! psFitsWriteTableNew(out->fits, header, table, extname)) {
             psErrorStackPrint(stderr, "failed to write table to %s", out->resolved_name);
             streaksExit("", PS_EXIT_DATA_ERROR);
         }
+        psFree(header);
+        psFree(table);
     }
 
@@ -1075 +1074 @@
         streaksExit("", PS_EXIT_DATA_ERROR);
     }
-    out->fits = NULL;
-}
+    out->fits = NULL;   // freed by psFitsclose()
+}