Changeset 28998 for trunk/psLib/src/fft/psImageFFT.h

Timestamp:

Aug 20, 2010, 11:47:48 AM (16 years ago)

Author:

eugene

Message:

added pre-ffted kernel convolutions, changed minimization to accept maxTol and minTol

File:

• trunk/psLib/src/fft/psImageFFT.h (modified) (2 diffs)

trunk/psLib/src/fft/psImageFFT.h

@@ -15 +15 @@
 #include "psImage.h"
 #include "psImageConvolve.h"
+
+typedef struct {
+    void *fft;
+    int xMin;                          ///< Most negative x index
+    int yMin;                          ///< Most negative y index
+    int xMax;                          ///< Most positive x index
+    int yMax;                          ///< Most positive y index
+    int paddedCols;
+    int paddedRows;
+} psKernelFFT;
 
 /// @addtogroup MathOps Mathematical Operations
@@ -71 +81 @@
     const psImage *mask,                ///< Corresponding mask
     psImageMaskType maskVal,            ///< Value to mask
-    const psKernel *kernel              ///< kernel to colvolve with
+    const psKernel *kernel              ///< kernel to convolve with
+    );
+
+/// Allocate an the psKernelFFT structure
+psKernelFFT *psKernelFFTAlloc(
+    const psKernel *input               ///< kernel to convolve with
 );
+
+/// Generate an FFT'ed kernel suitable for convolution with the given image
+psKernelFFT *psImageConvolveKernelInit(
+    const psImage *in,                  ///< representative image to convolve
+    const psKernel *kernel              ///< kernel to convolve with
+    );
+
+/// Convolve the given image with the pre-FFT'ed kernel
+psImage *psImageConvolveKernel(
+    psImage *out,                       ///< Output image, or NULL
+    const psImage *in,                  ///< Image to convolve
+    const psImage *mask,                ///< Corresponding mask
+    psImageMaskType maskVal,            ///< Value to mask
+    const psKernelFFT *kernel           ///< kernel to convolve with
+    );
 
 /// @}