Changeset 15363 for trunk/ppstamp/src/ppstamp.c

Timestamp:

Oct 23, 2007, 11:50:52 AM (19 years ago)

Author:

bills

Message:

Extract postage stamp from chip mosaic image. Changed -celcenter to -skycenter
Range in celestial coordinates not specified with -arcrange (arcseconds)
Better error handling.
Allow files without WCS if we don't need it

Location:

trunk/ppstamp/src

Files:

• . (modified) (1 prop)
• ppstamp.c (modified) (4 diffs)

trunk/ppstamp/src

@@ -6 +6 @@
 config.h.in
 stamp-h1
+ppstampErrorCodes.c
+ppstampErrorCodes.h

@@ -6 +6 @@
 config.h.in
 stamp-h1
+ppstampErrorCodes.c
+ppstampErrorCodes.h

trunk/ppstamp/src/ppstamp.c

@@ -7 +7 @@
 int main(int argc, char **argv)
 {
-    ppstampOptions *options;
+    ppstampOptions *options = NULL;
+    int exitCode;
 
     psTimerStart(TIMERNAME);
-
     psLibInit(NULL);
-
-    // Parse the configuration and arguments
-    // Open the input image(s)
-    // note usage is called on error or request by ppstampArguments
-    // TODO is the cleanup really necessary since we're exiting anyways?
-    // (It's useful to know about memory leaks)
+    ppstampErrorRegister();
 
     pmConfig *config = ppstampArguments(argc, argv, &options);
@@ -26 +21 @@
     }
 
-    // define recipe options
     // define the active I/O files
     if (!ppstampParseCamera(config)) {
@@ -35 +29 @@
 
     // find the pixels that we need to copy, setup the output image
-    if (!ppstampMakeStamp(config, options)) {
-        exit(PS_EXIT_UNKNOWN_ERROR);
+    if (ppstampMakeStamp(config, options)) {
+        exitCode = 0;
+    } else {
+        exitCode = PS_EXIT_DATA_ERROR;
     }
 
@@ -44 +40 @@
     ppstampCleanup(config, options);
 
-    return PS_EXIT_SUCCESS;
+    return exitCode;
 }

@@ -6 +6 @@
 config.h.in
 stamp-h1
+ppstampErrorCodes.c
+ppstampErrorCodes.h