Changeset 33415 for branches/meh_branches/ppstack_test/magic/remove/src/streaksio.c

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• magic/remove/src/streaksio.c (modified) (7 diffs)

branches/meh_branches/ppstack_test/magic/remove/src/streaksio.c

@@ -632 +632 @@
 
     if (!isImage(in)) {
+        psLogMsg("streaksremove", PS_LOG_INFO, "%s contains no image\n", in->name);
         return;
     }
@@ -752 +753 @@
         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 +759 @@
     }
 
-    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);
 }
 
@@ -778 +780 @@
 setupImageRefs(sFile *out, sFile *recoveryOut, sFile *in, int extnum, bool exciseAll)
 {
+    if (!in->image) {
+        // Input file is likely corrupt. XXX: Shouldn't we have caught this earlier?
+        psError(PS_ERR_UNKNOWN, true, "image is null for extension %d of %s file is likely corrupt", extnum, in->name);
+        streaksExit("", PS_EXIT_UNKNOWN_ERROR);
+    }
     if (!exciseAll) {
         // set output image to be the input image
@@ -839 +846 @@
     psFree(sfile->name);
     psFree(sfile->resolved_name);
+    psFree(sfile->fits);
     psFree(sfile);
 }
@@ -915 +923 @@
         sFileFree(sf->outWeight);
         sFileFree(sf->recWeight);
+    }
+    if (sf->inSources) {
+        sFileFree(sf->inSources);
+        sFileFree(sf->outSources);
     }
 }
@@ -1301 +1313 @@
                 streaksExit("", PS_EXIT_UNKNOWN_ERROR);
             }
+            psFree(compress);
         } else {
             copyTable(out, in, extnum);