Index: trunk/psLib/src/imageops/psImageConvolve.h
===================================================================
--- trunk/psLib/src/imageops/psImageConvolve.h	(revision 1653)
+++ trunk/psLib/src/imageops/psImageConvolve.h	(revision 1863)
@@ -7,12 +7,12 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-08-28 01:18:28 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-23 18:30:57 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
  */
 
-#ifndef PS_IMAGE_FFT_H
-#define PS_IMAGE_FFT_H
+#ifndef PS_IMAGE_CONVOLVE_H
+#define PS_IMAGE_CONVOLVE_H
 
 #include<stdbool.h>
@@ -20,15 +20,22 @@
 #include "psImage.h"
 #include "psVector.h"
+#include "psType.h"
+
+#define PS_TYPE_KERNEL PS_TYPE_F32     /**< the data member to use for kernel image */
+#define PS_TYPE_KERNEL_DATA F32        /**< the data member to use for kernel image */
+#define PS_TYPE_KERNEL_NAME "psF32"    /**< the data type for kernel as a string */
+
+typedef psF32 psKernelType;
 
 /** A convolution kernel */
 typedef struct
 {
+    psImage* image;                    ///< Kernel data, in the form of an image
     int xMin;                          ///< Most negative x index
     int yMin;                          ///< Most negative y index
     int xMax;                          ///< Most positive x index
     int yMax;                          ///< Most positive y index
-    psF32** kernel;                    ///< Pointer to the kernel data
-    psF32** p_kernelRows;              ///< Pointer to the rows of the kernel data
-    psImage* p_data;                   ///< Kernel data, in the form of an image
+    psKernelType** kernel;             ///< Pointer to the kernel data
+    psKernelType** p_kernelRows;       ///< Pointer to the rows of the kernel data; not intended for user use.
 }
 psKernel;
@@ -62,6 +69,6 @@
 psKernel* psKernelAlloc(
     int xMin,                          ///< Most negative x index
-    int xMax,                          ///< Most negative y index
-    int yMin,                          ///< Most positive x index
+    int xMax,                          ///< Most positive x index
+    int yMin,                          ///< Most negative y index
     int yMax                           ///< Most positive y index
 );
@@ -84,6 +91,8 @@
  */
 psKernel* psKernelGenerate(
-    const psVector* xShifts,           ///< list of shifts relative to a reference point
-    const psVector* yShifts            ///< list of shifts relative to a reference point
+    const psVector* tShifts,           ///< list of time shifts
+    const psVector* xShifts,           ///< list of x-axis shifts
+    const psVector* yShifts,           ///< list of y-axis shifts
+    bool relative
 );