Changeset 13873 for trunk/ppMerge/src/ppMerge.c

Timestamp:

Jun 18, 2007, 5:59:32 PM (19 years ago)

Author:

Paul Price

Message:

Changes to allow shutter correction to be processed piece by piece.

File:

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

trunk/ppMerge/src/ppMerge.c

@@ -46 +46 @@
     }
 
-    psImage *scale = NULL;              // The scalings
-    psImage *zero = NULL;               // The zeros
-
     if (options->mask) {
         // Generate a mask
         ppMergeMask(data, options, config);
     } else {
+
+        psImage *scale = NULL;              // The scalings
+        psImage *zero = NULL;               // The zeros
+        psArray *shutters = NULL;           // The shutter correction data
+
         // Measure the background in each image
-        ppMergeScaleZero(&scale, &zero, data, options, config);
+        ppMergeScaleZero(&scale, &zero, &shutters, data, options, config);
 
         // Do the combination and write
-        ppMergeCombine(scale, zero, data, options, config);
+        ppMergeCombine(scale, zero, shutters, data, options, config);
+
+        psFree(scale);
+        psFree(zero);
+        psFree(shutters);
     }
 
@@ -73 +79 @@
     // Cleaning up
     psFree(data);
-    psFree(scale);
-    psFree(zero);
     psFree(options);
     psFree(config);