Changeset 32337 for branches/eam_branches/ipp-20110710/magic/remove/src/streaksio.c

Timestamp:

Sep 6, 2011, 11:00:22 AM (15 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20110710/magic/remove/src/streaksio.c (modified) (5 diffs)

branches/eam_branches/ipp-20110710/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);
 }
 
@@ -839 +840 @@
     psFree(sfile->name);
     psFree(sfile->resolved_name);
+    psFree(sfile->fits);
     psFree(sfile);
 }
@@ -915 +917 @@
         sFileFree(sf->outWeight);
         sFileFree(sf->recWeight);
+    }
+    if (sf->inSources) {
+        sFileFree(sf->inSources);
+        sFileFree(sf->outSources);
     }
 }
@@ -1301 +1307 @@
                 streaksExit("", PS_EXIT_UNKNOWN_ERROR);
             }
+            psFree(compress);
         } else {
             copyTable(out, in, extnum);