Changeset 35771 for trunk/psModules/src/imcombine/pmSubtractionKernels.h

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/pmSubtractionKernels.h (modified) (2 diffs)

trunk/psModules/src/imcombine/pmSubtractionKernels.h

@@ -22 +22 @@
     } \
     if ((KERNELS)->type == PM_SUBTRACTION_KERNEL_ISIS_RADIAL) { \
+        PS_ASSERT_VECTOR_NON_NULL((KERNELS)->widths, RETURNVALUE); \
+        PS_ASSERT_VECTOR_TYPE((KERNELS)->widths, PS_TYPE_F32, RETURNVALUE); \
+        PS_ASSERT_VECTOR_SIZE((KERNELS)->widths, (KERNELS)->num, RETURNVALUE); \
+    } \
+    if ((KERNELS)->type == PM_SUBTRACTION_KERNEL_SIMPLE) { \
         PS_ASSERT_VECTOR_NON_NULL((KERNELS)->widths, RETURNVALUE); \
         PS_ASSERT_VECTOR_TYPE((KERNELS)->widths, PS_TYPE_F32, RETURNVALUE); \
@@ -71 +76 @@
 }
 
+// Generate 1D convolution kernel for SIMPLE
+psVector *pmSubtractionKernelSIMPLE(float sigma, // Gaussian width
+                                    int order,   // Unused polynomial order
+                                    int size     // Kernel half-size
+                                    );
+
 // Generate 1D convolution kernel for ISIS
 psVector *pmSubtractionKernelISIS(float sigma, // Gaussian width