Changeset 14356

Timestamp:

Jul 20, 2007, 3:29:23 PM (19 years ago)

Author:

Paul Price

Message:

Mask bad pixels in the combined image.

Location:

trunk/ppMerge/src

Files:

• ppMergeCombine.c (modified) (4 diffs)
• ppMergeOptions.c (modified) (3 diffs)
• ppMergeOptions.h (modified) (1 diff)

trunk/ppMerge/src/ppMergeCombine.c

@@ -286 +286 @@
                         data->stats = psMetadataAlloc();
                     }
-                    if (!ppStatsFPA(data->stats, data->out, view, options->combine->maskVal, config)) {
+                    if (!ppStatsFPA(data->stats, data->out, view,
+                                    options->combine->maskVal | pmConfigMask("BLANK", config),
+                                    config)) {
                         psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to generate stats for image.\n");
                         return false;
@@ -304 +306 @@
             for (int i = 0; i < filenames->n; i++) {
                 pmFPA *fpaIn = data->in->data[i]; // Input FPA
-                if (!fpaIn) { continue; } // was not a valid input file
+                if (!fpaIn) { continue; } // was not a valid input file
                 pmChip *chipIn = fpaIn->chips->data[view->chip]; // Input chip
                 pmCell *cellIn = chipIn->cells->data[view->cell]; // Input cell
@@ -325 +327 @@
         for (int i = 0; i < filenames->n; i++) {
             pmFPA *fpaIn = data->in->data[i]; // Input FPA
-            if (!fpaIn) { continue; } // was not a valid input file
+            if (!fpaIn) { continue; } // was not a valid input file
             pmChip *chipIn = fpaIn->chips->data[view->chip]; // Input chip
             pmChipFreeData(chipIn);
@@ -345 +347 @@
     for (int i = 0; i < filenames->n; i++) {
         pmFPA *fpaIn = data->in->data[i]; // Input FPA
-        if (!fpaIn) { continue; } // was not a valid input file
+        if (!fpaIn) { continue; } // was not a valid input file
         pmFPAFreeData(fpaIn);
     }

trunk/ppMerge/src/ppMergeOptions.c

@@ -24 +24 @@
 
 // Allocator
-ppMergeOptions *ppMergeOptionsAlloc(void)
+ppMergeOptions *ppMergeOptionsAlloc(const pmConfig *config)
 {
     ppMergeOptions *options = psAlloc(sizeof(ppMergeOptions)); // The options, to return
@@ -59 +59 @@
     options->combine->maskVal = 0xff;
     options->combine->weights = false;
+    options->combine->blank = pmConfigMask("BLANK", config);
     options->satMask = 0x00;
     options->badMask = 0x00;
@@ -96 +97 @@
     )
 {
-    ppMergeOptions *options = ppMergeOptionsAlloc(); // The merge options
+    ppMergeOptions *options = ppMergeOptionsAlloc(config); // The merge options
 
     // We need to work out the camera before we can get the recipe.  Take the first input and inspect it.

trunk/ppMerge/src/ppMergeOptions.h

@@ -44 +44 @@
 
 // Allocator
-ppMergeOptions *ppMergeOptionsAlloc(void);
+ppMergeOptions *ppMergeOptionsAlloc(const pmConfig *config);