Changeset 20420

Timestamp:

Oct 27, 2008, 2:19:42 PM (18 years ago)

Author:

Paul Price

Message:

Adding trace statements. Bug resulted in zero pixels rejected when
the grow radius was zero (no grown image was produced); fixed by
adding explicit case.

File:

• trunk/psModules/src/imcombine/pmStackReject.c (modified) (5 diffs)

trunk/psModules/src/imcombine/pmStackReject.c

@@ -38 +38 @@
                                                               xMin + size + 1, yMin + size + 1); // Polynomial
     int box = p_pmSubtractionBadRadius(NULL, kernels, polyValues, false, poorFrac); // Radius of bad box
+    psTrace("psModules.imcombine", 10, "Growing by %d", box);
     psFree(polyValues);
 
@@ -69 +70 @@
         }
         psFree(convolved);
-    }
+    } else {
+        // Just copy over
+        int numBytes = (xMax - xMin) * PSELEMTYPE_SIZEOF(PS_TYPE_MASK); // Number of bytes to copy
+        for (int yTarget = yMin; yTarget < yMax; yTarget++) {
+            memcpy(&target->data.PS_TYPE_MASK_DATA[yTarget][xMin],
+                   &source->data.PS_TYPE_MASK_DATA[yTarget][xMin], numBytes);
+        }
+    }
+
     return true;
 }
@@ -230 +239 @@
         }
     }
+    psTrace("psModules.imcombine", 7, "Found %ld bad pixels", bad->n);
 
     // Now, grow the mask to include everything that touches a bad pixel in the convolution
@@ -274 +284 @@
                         psFree(source);
                         psFree(target);
-                        return false;
+                        return NULL;
                     }
                     psFree(job);
@@ -307 +317 @@
     psFree(source);
     bad = psPixelsFromMask(bad, target, PM_STACK_MASK_ALL);
+    psTrace("psModules.imcombine", 7, "Total %ld bad pixels", bad->n);
 
     return bad;