Changeset 35771 for trunk/psModules/src/imcombine/pmSubtractionMatch.c

Timestamp:

Jul 3, 2013, 4:21:05 PM (13 years ago)

Author:

watersc1

Message:

Working 1D-Gaussian convolution code. Recipes/reductions that use this have _1DG added.

File:

• trunk/psModules/src/imcombine/pmSubtractionMatch.c (modified) (4 diffs)

trunk/psModules/src/imcombine/pmSubtractionMatch.c

@@ -21 +21 @@
 #include "pmSubtractionThreads.h"
 #include "pmSubtractionVisual.h"
+#include "pmSubtractionSimple.h"
 #include "pmErrorCodes.h"
 
@@ -537 +538 @@
     }
 
+    // Bail here if we're doing the simple matching
+    if (type == PM_SUBTRACTION_KERNEL_SIMPLE) {
+      if (!pmSubtractionSimpleMatch(conv1,conv2,ro1,ro2,sources,size,maskVal,maskBad,maskPoor)) {
+        return false;
+      }
+      return(true);
+    }
+
     // Where does our variance map come from?
     // Getting the variance exactly right is not necessary --- it's just used for weighting.
@@ -593 +602 @@
         goto MATCH_ERROR;
     }
+
     
     memCheck("start");
@@ -648 +658 @@
         psFree(bg);
     }
-
+    
     subtractionMatchAlloc(conv1, conv2, ro1, ro2, subMask, maskBad, subMode, numCols, numRows);
-
+    
     // Iterate over iso-kernel regions
     for (int j = 0; j < yRegions; j++) {