Changeset 21441 for trunk/magic/remove/src/streaksremove.c

Timestamp:

Feb 10, 2009, 11:46:34 AM (17 years ago)

Author:

bills

Message:

enable -replace and -remove options. Plug memory leaks

File:

• trunk/magic/remove/src/streaksremove.c (modified) (7 diffs)

trunk/magic/remove/src/streaksremove.c

@@ -1 +1 @@
 #include "streaksremove.h"
+
+#include "nebclient.h"
 
 static pmConfig *parseArguments(int argc, char **argv);
@@ -162 +164 @@
             }
             psArrayElementsFree (pixels);
+            psFree(pixels);
         }
 
         if (sfiles->stage == IPP_STAGE_CHIP) {
-        // if (CHIP_LEVEL_INPUT(sfiles->stage)) {
             updateAstrometry(sfiles);
         }
@@ -174 +176 @@
         printf("time to process component %d: %f\n", sfiles->extnum, psTimerClear("PROCESS_COMPONENT"));
     } while (streakFilesNextExtension(sfiles));
+
+    psFree(streaks);
 
     printf("pixels: %ld streak pixels: %ld %4.2f%%\n", totalPixels, totalStreakPixels, 100. * totalStreakPixels / totalPixels);
@@ -191 +195 @@
     }
 
-#ifdef NOTYET
     if (psMetadataLookupBool(&status, config->arguments, "REPLACE")) {
         //     swap the instances for the input and output
@@ -221 +224 @@
         }
     }
-#endif  // REPLACE, REMOVE
+
     printf("time to run streaksremove: %f\n", psTimerClear("STREAKSREMOVE"));
 
-    // nebServerFree(ourNebServer);
+    psFree(sfiles);
     psFree(config);
     pmConceptsDone();
+    pmModelClassCleanup();
+    streaksNebulousCleanup(); 
     pmConfigDone();
     psLibFinalize();
 
-    //  PAU
     fprintf(stderr, "Found %d leaks at %s\n", psMemCheckLeaks (0, NULL, NULL, false), "streaksremove");
-
 
     return 0;
@@ -417 +420 @@
         psMetadataAddStr(config->arguments, PS_LIST_TAIL, "OUTPUT", 0, "directory for temporary files",
             dir);
+        psFree(dir);
         psArgumentRemove(argnum, &argc, argv);
     } else {
@@ -428 +432 @@
         psMetadataAddStr(config->arguments, PS_LIST_TAIL, "RECOVERY", 0, "directory for recovery files",
             dir);
+        psFree(dir);
         psArgumentRemove(argnum, &argc, argv);
     } else if ((stage == IPP_STAGE_RAW) && gotReplace) {