Changeset 5858 for trunk/ppImage/src/ppImage.c

Timestamp:

Dec 30, 2005, 7:05:28 AM (21 years ago)

Author:

eugene

Message:

cleanups, segfault fixes, etc

File:

• trunk/ppImage/src/ppImage.c (modified) (2 diffs)

trunk/ppImage/src/ppImage.c

@@ -5 +5 @@
     ppData data;
     ppConfig config;
-    ppRecipe options;
+    ppOptions options;
 
     psTimerStart("phase2");
 
     // Parse the configuration and arguments
-    ppConfigLoad (&config, argc, argv);
+    ppImageConfig (&config, argc, argv);
 
     // Open the input image, output image, output mask
     // Get camera configuration from header if not already defined
     // Construct camera in preparation for reading
-    ppDataLoadMeta (&data, &config, argv);
+    ppImageParseCamera (&data, &config, argv);
 
     // Set various tasks (define optional operations)
-    ppRecipeInit (&options, &config)
+    ppImageOptions (&data, &options, &config);
 
-    // Read in the input pixels
-    // Generate mask and weight frame
-    // Read in detrend pixels
-    ppDataLoadPixels (&data, &options, &config);
+    // open detrend images, load headers, optionally load pixels
+    ppImageParseDetrend (&data, &options, &config);
 
     // Image Arithmetic Loop
@@ -29 +27 @@
 
     // output options
-    ppImageOutput (&data, &options, &config);
+    // ppImageOutput (&data, &options, &config);
 
     exit (0);