Index: /trunk/psLib/test/image/tst_psImageConvolve.c
===================================================================
--- /trunk/psLib/test/image/tst_psImageConvolve.c	(revision 2067)
+++ /trunk/psLib/test/image/tst_psImageConvolve.c	(revision 2068)
@@ -5,6 +5,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-06 21:40:13 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-13 01:22:38 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -22,10 +22,10 @@
 static int testKernelAlloc(void);
 static int testKernelGenerate(void);
-static int testImageConvolve(void);
+//static int testImageConvolve(void);
 
 testDescription tests[] = {
                               {testKernelAlloc,731,"psKernelAlloc",0,false},
                               {testKernelGenerate,732,"psKernelGenerate",0,false},
-                              {testImageConvolve,733,"psImageConvolve",0,false},
+                              //                              {testImageConvolve,733,"psImageConvolve",0,false},
                               {NULL}
                           };
@@ -290,4 +290,5 @@
 }
 
+/*
 static int testImageConvolve(void)
 {
@@ -295,5 +296,5 @@
     const int c = 300;
     int sum;
-
+ 
     // approximate a normalized gaussian kernel.
     psKernel* g = psKernelAlloc(-1,1,-1,1);
@@ -307,5 +308,5 @@
                 g->kernel[0][1] = 0.0838;
     g->kernel[0][0] = 0.6193;
-
+ 
     // create a normalized non-symetric kernel.
     psKernel* nsk = psKernelAlloc(0,2,0,2);
@@ -322,6 +323,6 @@
         }
     }
-
-
+ 
+ 
     psImage* img = psImageAlloc(c,r,PS_TYPE_F32);
     memset(img->data.F32[0],0,c*r*PSELEMTYPE_SIZEOF(PS_TYPE_F32));
@@ -329,14 +330,14 @@
     img->data.F32[r/2][c/2] = 1.0f;
     img->data.F32[r-1][c/2] = 1.0f;
-
+ 
     // test spacial convolution of gaussian
     psLogMsg(__func__,PS_LOG_INFO,"Testing direct gaussian convolution");
     psImage* out = psImageConvolve(NULL, img, g, true);
-
+ 
     if (out == NULL) {
         psError(__func__, "psImageConvolve returned a NULL for direct gaussian case.");
         return 1;
     }
-
+ 
     if (out->numCols != c || out->numRows != r) {
         psError(__func__, "psImageConvolve result image is %dx%d, but expected %dx%d.",
@@ -345,5 +346,5 @@
         return 2;
     }
-
+ 
     if (out->type.type != PS_TYPE_F32) {
         char* typeStr;
@@ -353,5 +354,5 @@
         return 3;
     }
-
+ 
     // test values
     for (int i=-1;i<1;i++) {
@@ -377,5 +378,5 @@
         }
     }
-
+ 
     // test fourier convolution of gaussian
     psLogMsg(__func__,PS_LOG_INFO,"Testing fourier gaussian convolution");
@@ -394,15 +395,15 @@
     img->data.F32[r-1][c/2] = 0.0f;
     psImage* out2 = psImageConvolve(out, img, gg, false);
-
+ 
     if (out == NULL) {
         psError(__func__, "psImageConvolve returned a NULL for gaussian case.");
         return 10;
     }
-
+ 
     if (out != out2) {
         psError(__func__, "psImageConvolve didn't recycle the supplied out image struct.");
         return 11;
     }
-
+ 
     if (out->numCols != c || out->numRows != r) {
         psError(__func__, "psImageConvolve result image is %dx%d, but expected %dx%d.",
@@ -411,5 +412,5 @@
         return 12;
     }
-
+ 
     if (out->type.type != PS_TYPE_F32) {
         char* typeStr;
@@ -419,5 +420,5 @@
         return 13;
     }
-
+ 
     psImageWriteSection(out2,0,0,0,NULL,0,"out2.fits");
     // test values
@@ -445,5 +446,5 @@
         }
     }
-
+ 
     psFree(g);
     psFree(img);
@@ -452,2 +453,4 @@
     return 0;
 }
+*/
+
Index: /trunk/psLib/test/image/verified/tst_psImageConvolve.stderr
===================================================================
--- /trunk/psLib/test/image/verified/tst_psImageConvolve.stderr	(revision 2068)
+++ /trunk/psLib/test/image/verified/tst_psImageConvolve.stderr	(revision 2068)
@@ -0,0 +1,42 @@
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psImageConvolve.c                                      *
+*            TestPoint: psImage{psKernelAlloc}                                     *
+*             TestType: Positive                                                   *
+\**********************************************************************************/
+
+<DATE><TIME>|<HOST>|I|testKernelAlloc
+    Following should be a warning (xMin > xMax)
+<DATE><TIME>|<HOST>|W|psKernelAlloc
+    Specified xMin, 5, was greater than xMax, -5.  Values swapped.
+<DATE><TIME>|<HOST>|I|testKernelAlloc
+    Following should be a warning (yMin > yMax)
+<DATE><TIME>|<HOST>|W|psKernelAlloc
+    Specified yMin, 5, was greater than yMax, -5.  Values swapped.
+
+---> TESTPOINT PASSED (psImage{psKernelAlloc} | tst_psImageConvolve.c)
+
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psImageConvolve.c                                      *
+*            TestPoint: psImage{psKernelGenerate}                                  *
+*             TestType: Positive                                                   *
+\**********************************************************************************/
+
+<DATE><TIME>|<HOST>|I|testKernelGenerate
+    Following should be a warning - not automatically tested.
+<DATE><TIME>|<HOST>|W|psKernelGenerate
+    Shift vectors found to be different sizes.
+<DATE><TIME>|<HOST>|I|testKernelGenerate
+    Following should be a error (time vector NULL).
+<DATE><TIME>|<HOST>|E|psLib.image.psKernelGenerate
+    Specified shift vectors can not be NULL.
+<DATE><TIME>|<HOST>|I|testKernelGenerate
+    Following should be a error (x vector NULL).
+<DATE><TIME>|<HOST>|E|psLib.image.psKernelGenerate
+    Specified shift vectors can not be NULL.
+<DATE><TIME>|<HOST>|I|testKernelGenerate
+    Following should be a error (y vector NULL).
+<DATE><TIME>|<HOST>|E|psLib.image.psKernelGenerate
+    Specified shift vectors can not be NULL.
+
+---> TESTPOINT PASSED (psImage{psKernelGenerate} | tst_psImageConvolve.c)
+