Changeset 23594 for branches/cnb_branches/cnb_branch_20090301/ppStack/src/ppStackReject.c

Timestamp:

Mar 29, 2009, 6:15:31 PM (17 years ago)

Author:

beaumont

Message:

merged with head

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• ppStack (modified) (1 prop)
• ppStack/src/ppStackReject.c (modified) (3 diffs)

branches/cnb_branches/cnb_branch_20090301/ppStack/src/ppStackReject.c

@@ -14 +14 @@
     psAssert(options, "Require options");
     psAssert(config, "Require configuration");
+
+    if (!options->convolve) {
+        // No need to do complicated rejection when we haven't convolved
+        return true;
+    }
 
     int num = options->num;             // Number of inputs
@@ -86 +91 @@
 
         psPixels *reject = pmStackReject(options->inspect->data[i], options->numCols, options->numRows,
-                                         threshold, poorFrac, stride, options->subRegions->data[i],
-                                         options->subKernels->data[i]); // Rejected pixels
+                                         threshold, poorFrac, stride, options->regions->data[i],
+                                         options->kernels->data[i]); // Rejected pixels
 
 #ifdef TESTING
@@ -141 +146 @@
 
     psFree(options->inspect); options->inspect = NULL;
-    psFree(options->subKernels); options->subKernels = NULL;
-    psFree(options->subRegions); options->subRegions = NULL;
+    psFree(options->kernels); options->kernels = NULL;
+    psFree(options->regions); options->regions = NULL;
 
     if (numRejected >= num - 1) {