Index: /trunk/psLib/src/fft/psImageFFT.c
===================================================================
--- /trunk/psLib/src/fft/psImageFFT.c	(revision 3701)
+++ /trunk/psLib/src/fft/psImageFFT.c	(revision 3702)
@@ -5,6 +5,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-06 01:12:58 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-15 00:12:08 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -74,8 +74,11 @@
     // n.b. FFTW can perform a in-place transform at the same rate or faster than out-of-place.
     psS32 sign = ((direction & PS_FFT_FORWARD) != 0) ? FFTW_FORWARD : FFTW_BACKWARD;
-    out = psImageCopy(out, in, PS_TYPE_C32);
-    plan = fftwf_plan_dft_2d(numCols, numRows,
-                             out->data.C32[0],
-                             out->data.C32[0],
+
+    fftwf_complex* outBuffer = fftwf_malloc(numRows*numCols*sizeof(fftwf_complex));
+    p_psImageCopyToRawBuffer(outBuffer, in, PS_TYPE_C32);
+
+    plan = fftwf_plan_dft_2d(numRows, numCols,
+                             outBuffer,
+                             outBuffer,
                              sign,
                              PS_FFTW_PLAN_RIGOR);
@@ -101,8 +104,25 @@
         // becomes an issue, the use of fftwf_plan_dft_r2c should be considered
         // as well as fftwf_plan_dft_c2r.
-        psImage* realOut = psImageCopy(NULL,out,PS_TYPE_F32);
-        psFree(out);
-        out = realOut;
-    }
+        out = psImageRecycle(out,numCols,numRows,PS_TYPE_F32);
+        int index = 0;
+        for (int row=0; row < numRows; row++) {
+            psF32* outRow = out->data.F32[row];
+            for (int col=0; col < numCols; col++) {
+                outRow[col] = crealf(outBuffer[index++]); // take just the real part
+            }
+        }
+    } else {
+        out = psImageRecycle(out,numCols,numRows,PS_TYPE_C32);
+        int index = 0;
+        for (int row=0; row < numRows; row++) {
+            psC32* outRow = out->data.C32[row];
+            for (int col=0; col < numCols; col++) {
+                outRow[col] = outBuffer[index++]; // take just the real part
+            }
+        }
+        //        memcpy(out->rawDataBuffer, outBuffer, numRows*numCols*sizeof(fftwf_complex));
+    }
+
+    fftwf_free(outBuffer);
 
     return out;
Index: /trunk/psLib/src/image/psImage.c
===================================================================
--- /trunk/psLib/src/image/psImage.c	(revision 3701)
+++ /trunk/psLib/src/image/psImage.c	(revision 3702)
@@ -9,6 +9,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.63 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-07 20:27:41 $
+ *  @version $Revision: 1.64 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-15 00:12:08 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -197,5 +197,5 @@
 }
 
-psImage* psImageCopy(psImage* restrict output,
+psImage* psImageCopy(psImage* output,
                      const psImage* input,
                      psElemType type)
@@ -350,4 +350,142 @@
     return output;
 }
+
+bool p_psImageCopyToRawBuffer(void* buffer,
+                              const psImage* input,
+                              psElemType type)
+{
+    psElemType inDatatype;
+    psS32 numRows;
+    psS32 numCols;
+
+    if (input == NULL || input->data.V == NULL) {
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psImage_IMAGE_NULL);
+        return false;
+    }
+
+    if (input->type.dimen != PS_DIMEN_IMAGE) {
+        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
+                PS_ERRORTEXT_psImage_NOT_AN_IMAGE);
+        return false;
+    }
+
+    inDatatype = input->type.type;
+    numRows = input->numRows;
+    numCols = input->numCols;
+
+    // cover the trival case of copy of the same
+    // datatype.
+    if (type == inDatatype) {
+        int rowSize = PSELEMTYPE_SIZEOF(inDatatype)*numCols;
+        for (psS32 row=0;row<numRows;row++) {
+            memcpy(&((psS8*)buffer)[row*rowSize], input->data.V[row], rowSize);
+        }
+        return true;
+    }
+
+    #define PSIMAGE_BUFFER_COPY(INTYPE,OUTTYPE) { \
+        ps##INTYPE *in; \
+        ps##OUTTYPE *out = buffer; \
+        for(psS32 row=0;row<numRows;row++) { \
+            in = input->data.INTYPE[row]; \
+            for (psS32 col=0;col<numCols;col++) { \
+                *(out++) = *(in++); \
+            } \
+        } \
+    }
+
+    #define PSIMAGE_BUFFER_COPY_CASE(OUT,OUTTYPE) { \
+        switch (inDatatype) { \
+        case PS_TYPE_S8: \
+            PSIMAGE_BUFFER_COPY(S8,OUTTYPE); \
+            break; \
+        case PS_TYPE_S16: \
+            PSIMAGE_BUFFER_COPY(S16,OUTTYPE); \
+            break; \
+        case PS_TYPE_S32: \
+            PSIMAGE_BUFFER_COPY(S32,OUTTYPE); \
+            break; \
+        case PS_TYPE_S64: \
+            PSIMAGE_BUFFER_COPY(S64,OUTTYPE); \
+            break; \
+        case PS_TYPE_U8: \
+            PSIMAGE_BUFFER_COPY(U8,OUTTYPE); \
+            break; \
+        case PS_TYPE_U16: \
+            PSIMAGE_BUFFER_COPY(U16,OUTTYPE); \
+            break; \
+        case PS_TYPE_U32: \
+            PSIMAGE_BUFFER_COPY(U32,OUTTYPE); \
+            break; \
+        case PS_TYPE_U64: \
+            PSIMAGE_BUFFER_COPY(U64,OUTTYPE); \
+            break; \
+        case PS_TYPE_F32: \
+            PSIMAGE_BUFFER_COPY(F32,OUTTYPE); \
+            break; \
+        case PS_TYPE_F64: \
+            PSIMAGE_BUFFER_COPY(F64,OUTTYPE); \
+            break; \
+        case PS_TYPE_C32: \
+            PSIMAGE_BUFFER_COPY(C32,OUTTYPE); \
+            break; \
+        case PS_TYPE_C64: \
+            PSIMAGE_BUFFER_COPY(C64,OUTTYPE); \
+            break; \
+        default: \
+            break; \
+        } \
+    }
+
+    switch (type) {
+    case PS_TYPE_S8:
+        PSIMAGE_BUFFER_COPY_CASE(output, S8);
+        break;
+    case PS_TYPE_S16:
+        PSIMAGE_BUFFER_COPY_CASE(output, S16);
+        break;
+    case PS_TYPE_S32:
+        PSIMAGE_BUFFER_COPY_CASE(output, S32);
+        break;
+    case PS_TYPE_S64:
+        PSIMAGE_BUFFER_COPY_CASE(output, S64);
+        break;
+    case PS_TYPE_U8:
+        PSIMAGE_BUFFER_COPY_CASE(output, U8);
+        break;
+    case PS_TYPE_U16:
+        PSIMAGE_BUFFER_COPY_CASE(output, U16);
+        break;
+    case PS_TYPE_U32:
+        PSIMAGE_BUFFER_COPY_CASE(output, U32);
+        break;
+    case PS_TYPE_U64:
+        PSIMAGE_BUFFER_COPY_CASE(output, U64);
+        break;
+    case PS_TYPE_F32:
+        PSIMAGE_BUFFER_COPY_CASE(output, F32);
+        break;
+    case PS_TYPE_F64:
+        PSIMAGE_BUFFER_COPY_CASE(output, F64);
+        break;
+    case PS_TYPE_C32:
+        PSIMAGE_BUFFER_COPY_CASE(output, C32);
+        break;
+    case PS_TYPE_C64:
+        PSIMAGE_BUFFER_COPY_CASE(output, C64);
+        break;
+    default: {
+            char* typeStr;
+            PS_TYPE_NAME(typeStr,type);
+            psError(PS_ERR_BAD_PARAMETER_TYPE, true,
+                    PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
+                    typeStr);
+            break;
+        }
+    }
+    return true;
+}
+
 
 psS32 psImageFreeChildren(psImage* image)
Index: /trunk/psLib/src/image/psImage.h
===================================================================
--- /trunk/psLib/src/image/psImage.h	(revision 3701)
+++ /trunk/psLib/src/image/psImage.h	(revision 3702)
@@ -11,6 +11,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.49 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-03-18 02:35:14 $
+ *  @version $Revision: 1.50 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-15 00:12:08 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -167,4 +167,10 @@
 );
 
+bool p_psImageCopyToRawBuffer(
+    void* buffer,
+    const psImage* input,
+    psElemType type
+);
+
 /** Frees all children of a psImage.
  *
Index: /trunk/psLib/src/image/psImageConvolve.c
===================================================================
--- /trunk/psLib/src/image/psImageConvolve.c	(revision 3701)
+++ /trunk/psLib/src/image/psImageConvolve.c	(revision 3702)
@@ -5,6 +5,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-07 20:27:41 $
+ *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-15 00:12:08 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -398,6 +398,4 @@
         }
 
-        psImageWriteSection(paddedImage,0,0,0,NULL,0,"paddedImage.fits");
-
         // pad the kernel to the same size of paddedImage
         psImage* paddedKernel = psImageAlloc(paddedCols,paddedRows,PS_TYPE_KERNEL);
@@ -421,6 +419,4 @@
         }
 
-        psImageWriteSection(paddedKernel,0,0,0,NULL,0,"paddedKernel.fits");
-
         psImage* kernelFourier = psImageFFT(NULL, paddedKernel, PS_FFT_FORWARD);
         if (kernelFourier == NULL) {
@@ -440,5 +436,11 @@
 
         // convolution in fourier domain is just a pixel-wise multiplication
-        psBinaryOp(inFourier,inFourier,"*",kernelFourier);
+        for (int row = 0; row < paddedRows; row++) {
+            psC32* inRow = inFourier->data.C32[row];
+            psC32* kRow = kernelFourier->data.C32[row];
+            for (int col = 0; col < paddedCols; col++) {
+                inRow[col] *= kRow[col];
+            }
+        }
 
         psImage* complexOut = psImageFFT(NULL, inFourier,
@@ -451,10 +453,4 @@
         }
 
-        {
-            psImage* tmp = psImageReal(NULL,complexOut);
-            psImageWriteSection(tmp,0,0,0,NULL,0,"complexOut.fits");
-            psFree(tmp);
-        }
-
         // subset out the padded area now.
         psImage* complexOutSansPad = psImageSubset(complexOut,
@@ -463,5 +459,5 @@
 
         out = psImageRecycle(out,numCols,numRows,PS_TYPE_F32);
-        float factor = 1.0f/numCols/numRows;
+        float factor = 1.0f/(float)paddedCols/(float)paddedRows;
         for (psS32 row = 0; row < numRows; row++) {
             psF32* outRow = out->data.F32[row];
Index: /trunk/psLib/src/image/psImageFFT.c
===================================================================
--- /trunk/psLib/src/image/psImageFFT.c	(revision 3701)
+++ /trunk/psLib/src/image/psImageFFT.c	(revision 3702)
@@ -5,6 +5,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-06 01:12:58 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-15 00:12:08 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -74,8 +74,11 @@
     // n.b. FFTW can perform a in-place transform at the same rate or faster than out-of-place.
     psS32 sign = ((direction & PS_FFT_FORWARD) != 0) ? FFTW_FORWARD : FFTW_BACKWARD;
-    out = psImageCopy(out, in, PS_TYPE_C32);
-    plan = fftwf_plan_dft_2d(numCols, numRows,
-                             out->data.C32[0],
-                             out->data.C32[0],
+
+    fftwf_complex* outBuffer = fftwf_malloc(numRows*numCols*sizeof(fftwf_complex));
+    p_psImageCopyToRawBuffer(outBuffer, in, PS_TYPE_C32);
+
+    plan = fftwf_plan_dft_2d(numRows, numCols,
+                             outBuffer,
+                             outBuffer,
                              sign,
                              PS_FFTW_PLAN_RIGOR);
@@ -101,8 +104,25 @@
         // becomes an issue, the use of fftwf_plan_dft_r2c should be considered
         // as well as fftwf_plan_dft_c2r.
-        psImage* realOut = psImageCopy(NULL,out,PS_TYPE_F32);
-        psFree(out);
-        out = realOut;
-    }
+        out = psImageRecycle(out,numCols,numRows,PS_TYPE_F32);
+        int index = 0;
+        for (int row=0; row < numRows; row++) {
+            psF32* outRow = out->data.F32[row];
+            for (int col=0; col < numCols; col++) {
+                outRow[col] = crealf(outBuffer[index++]); // take just the real part
+            }
+        }
+    } else {
+        out = psImageRecycle(out,numCols,numRows,PS_TYPE_C32);
+        int index = 0;
+        for (int row=0; row < numRows; row++) {
+            psC32* outRow = out->data.C32[row];
+            for (int col=0; col < numCols; col++) {
+                outRow[col] = outBuffer[index++]; // take just the real part
+            }
+        }
+        //        memcpy(out->rawDataBuffer, outBuffer, numRows*numCols*sizeof(fftwf_complex));
+    }
+
+    fftwf_free(outBuffer);
 
     return out;
Index: /trunk/psLib/src/imageops/psImageConvolve.c
===================================================================
--- /trunk/psLib/src/imageops/psImageConvolve.c	(revision 3701)
+++ /trunk/psLib/src/imageops/psImageConvolve.c	(revision 3702)
@@ -5,6 +5,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-07 20:27:41 $
+ *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-15 00:12:08 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -398,6 +398,4 @@
         }
 
-        psImageWriteSection(paddedImage,0,0,0,NULL,0,"paddedImage.fits");
-
         // pad the kernel to the same size of paddedImage
         psImage* paddedKernel = psImageAlloc(paddedCols,paddedRows,PS_TYPE_KERNEL);
@@ -421,6 +419,4 @@
         }
 
-        psImageWriteSection(paddedKernel,0,0,0,NULL,0,"paddedKernel.fits");
-
         psImage* kernelFourier = psImageFFT(NULL, paddedKernel, PS_FFT_FORWARD);
         if (kernelFourier == NULL) {
@@ -440,5 +436,11 @@
 
         // convolution in fourier domain is just a pixel-wise multiplication
-        psBinaryOp(inFourier,inFourier,"*",kernelFourier);
+        for (int row = 0; row < paddedRows; row++) {
+            psC32* inRow = inFourier->data.C32[row];
+            psC32* kRow = kernelFourier->data.C32[row];
+            for (int col = 0; col < paddedCols; col++) {
+                inRow[col] *= kRow[col];
+            }
+        }
 
         psImage* complexOut = psImageFFT(NULL, inFourier,
@@ -451,10 +453,4 @@
         }
 
-        {
-            psImage* tmp = psImageReal(NULL,complexOut);
-            psImageWriteSection(tmp,0,0,0,NULL,0,"complexOut.fits");
-            psFree(tmp);
-        }
-
         // subset out the padded area now.
         psImage* complexOutSansPad = psImageSubset(complexOut,
@@ -463,5 +459,5 @@
 
         out = psImageRecycle(out,numCols,numRows,PS_TYPE_F32);
-        float factor = 1.0f/numCols/numRows;
+        float factor = 1.0f/(float)paddedCols/(float)paddedRows;
         for (psS32 row = 0; row < numRows; row++) {
             psF32* outRow = out->data.F32[row];
Index: /trunk/psLib/src/mathtypes/psImage.c
===================================================================
--- /trunk/psLib/src/mathtypes/psImage.c	(revision 3701)
+++ /trunk/psLib/src/mathtypes/psImage.c	(revision 3702)
@@ -9,6 +9,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.63 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-07 20:27:41 $
+ *  @version $Revision: 1.64 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-15 00:12:08 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -197,5 +197,5 @@
 }
 
-psImage* psImageCopy(psImage* restrict output,
+psImage* psImageCopy(psImage* output,
                      const psImage* input,
                      psElemType type)
@@ -350,4 +350,142 @@
     return output;
 }
+
+bool p_psImageCopyToRawBuffer(void* buffer,
+                              const psImage* input,
+                              psElemType type)
+{
+    psElemType inDatatype;
+    psS32 numRows;
+    psS32 numCols;
+
+    if (input == NULL || input->data.V == NULL) {
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psImage_IMAGE_NULL);
+        return false;
+    }
+
+    if (input->type.dimen != PS_DIMEN_IMAGE) {
+        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
+                PS_ERRORTEXT_psImage_NOT_AN_IMAGE);
+        return false;
+    }
+
+    inDatatype = input->type.type;
+    numRows = input->numRows;
+    numCols = input->numCols;
+
+    // cover the trival case of copy of the same
+    // datatype.
+    if (type == inDatatype) {
+        int rowSize = PSELEMTYPE_SIZEOF(inDatatype)*numCols;
+        for (psS32 row=0;row<numRows;row++) {
+            memcpy(&((psS8*)buffer)[row*rowSize], input->data.V[row], rowSize);
+        }
+        return true;
+    }
+
+    #define PSIMAGE_BUFFER_COPY(INTYPE,OUTTYPE) { \
+        ps##INTYPE *in; \
+        ps##OUTTYPE *out = buffer; \
+        for(psS32 row=0;row<numRows;row++) { \
+            in = input->data.INTYPE[row]; \
+            for (psS32 col=0;col<numCols;col++) { \
+                *(out++) = *(in++); \
+            } \
+        } \
+    }
+
+    #define PSIMAGE_BUFFER_COPY_CASE(OUT,OUTTYPE) { \
+        switch (inDatatype) { \
+        case PS_TYPE_S8: \
+            PSIMAGE_BUFFER_COPY(S8,OUTTYPE); \
+            break; \
+        case PS_TYPE_S16: \
+            PSIMAGE_BUFFER_COPY(S16,OUTTYPE); \
+            break; \
+        case PS_TYPE_S32: \
+            PSIMAGE_BUFFER_COPY(S32,OUTTYPE); \
+            break; \
+        case PS_TYPE_S64: \
+            PSIMAGE_BUFFER_COPY(S64,OUTTYPE); \
+            break; \
+        case PS_TYPE_U8: \
+            PSIMAGE_BUFFER_COPY(U8,OUTTYPE); \
+            break; \
+        case PS_TYPE_U16: \
+            PSIMAGE_BUFFER_COPY(U16,OUTTYPE); \
+            break; \
+        case PS_TYPE_U32: \
+            PSIMAGE_BUFFER_COPY(U32,OUTTYPE); \
+            break; \
+        case PS_TYPE_U64: \
+            PSIMAGE_BUFFER_COPY(U64,OUTTYPE); \
+            break; \
+        case PS_TYPE_F32: \
+            PSIMAGE_BUFFER_COPY(F32,OUTTYPE); \
+            break; \
+        case PS_TYPE_F64: \
+            PSIMAGE_BUFFER_COPY(F64,OUTTYPE); \
+            break; \
+        case PS_TYPE_C32: \
+            PSIMAGE_BUFFER_COPY(C32,OUTTYPE); \
+            break; \
+        case PS_TYPE_C64: \
+            PSIMAGE_BUFFER_COPY(C64,OUTTYPE); \
+            break; \
+        default: \
+            break; \
+        } \
+    }
+
+    switch (type) {
+    case PS_TYPE_S8:
+        PSIMAGE_BUFFER_COPY_CASE(output, S8);
+        break;
+    case PS_TYPE_S16:
+        PSIMAGE_BUFFER_COPY_CASE(output, S16);
+        break;
+    case PS_TYPE_S32:
+        PSIMAGE_BUFFER_COPY_CASE(output, S32);
+        break;
+    case PS_TYPE_S64:
+        PSIMAGE_BUFFER_COPY_CASE(output, S64);
+        break;
+    case PS_TYPE_U8:
+        PSIMAGE_BUFFER_COPY_CASE(output, U8);
+        break;
+    case PS_TYPE_U16:
+        PSIMAGE_BUFFER_COPY_CASE(output, U16);
+        break;
+    case PS_TYPE_U32:
+        PSIMAGE_BUFFER_COPY_CASE(output, U32);
+        break;
+    case PS_TYPE_U64:
+        PSIMAGE_BUFFER_COPY_CASE(output, U64);
+        break;
+    case PS_TYPE_F32:
+        PSIMAGE_BUFFER_COPY_CASE(output, F32);
+        break;
+    case PS_TYPE_F64:
+        PSIMAGE_BUFFER_COPY_CASE(output, F64);
+        break;
+    case PS_TYPE_C32:
+        PSIMAGE_BUFFER_COPY_CASE(output, C32);
+        break;
+    case PS_TYPE_C64:
+        PSIMAGE_BUFFER_COPY_CASE(output, C64);
+        break;
+    default: {
+            char* typeStr;
+            PS_TYPE_NAME(typeStr,type);
+            psError(PS_ERR_BAD_PARAMETER_TYPE, true,
+                    PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED,
+                    typeStr);
+            break;
+        }
+    }
+    return true;
+}
+
 
 psS32 psImageFreeChildren(psImage* image)
Index: /trunk/psLib/src/mathtypes/psImage.h
===================================================================
--- /trunk/psLib/src/mathtypes/psImage.h	(revision 3701)
+++ /trunk/psLib/src/mathtypes/psImage.h	(revision 3702)
@@ -11,6 +11,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.49 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-03-18 02:35:14 $
+ *  @version $Revision: 1.50 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-15 00:12:08 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -167,4 +167,10 @@
 );
 
+bool p_psImageCopyToRawBuffer(
+    void* buffer,
+    const psImage* input,
+    psElemType type
+);
+
 /** Frees all children of a psImage.
  *
Index: /trunk/psLib/test/image/tst_psImageConvolve.c
===================================================================
--- /trunk/psLib/test/image/tst_psImageConvolve.c	(revision 3701)
+++ /trunk/psLib/test/image/tst_psImageConvolve.c	(revision 3702)
@@ -5,6 +5,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-07 20:27:42 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-15 00:12:09 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -22,10 +22,10 @@
 static psS32 testKernelAlloc(void);
 static psS32 testKernelGenerate(void);
-//static psS32 testImageConvolve(void);
+static psS32 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}
                           };
@@ -286,5 +286,4 @@
 }
 
-/*
 static psS32 testImageConvolve(void)
 {
@@ -292,5 +291,5 @@
     const psS32 c = 300;
     psS32 sum;
- 
+
     // approximate a normalized gaussian kernel.
     psKernel* g = psKernelAlloc(-1,1,-1,1);
@@ -304,5 +303,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);
@@ -319,6 +318,6 @@
         }
     }
- 
- 
+
+
     psImage* img = psImageAlloc(c,r,PS_TYPE_F32);
     memset(img->data.F32[0],0,c*r*PSELEMTYPE_SIZEOF(PS_TYPE_F32));
@@ -326,14 +325,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(PS_ERR_UNKNOWN, true, "psImageConvolve returned a NULL for direct gaussian case.");
         return 1;
     }
- 
+
     if (out->numCols != c || out->numRows != r) {
         psError(PS_ERR_UNKNOWN, true, "psImageConvolve result image is %dx%d, but expected %dx%d.",
@@ -342,5 +341,5 @@
         return 2;
     }
- 
+
     if (out->type.type != PS_TYPE_F32) {
         char* typeStr;
@@ -350,5 +349,5 @@
         return 3;
     }
- 
+
     // test values
     for (psS32 i=-1;i<1;i++) {
@@ -374,32 +373,19 @@
         }
     }
- 
+
     // test fourier convolution of gaussian
     psLogMsg(__func__,PS_LOG_INFO,"Testing fourier gaussian convolution");
-    psKernel* gg = psKernelAlloc(1,3,1,3);
-    gg->kernel[1][1] =
-        gg->kernel[1][3] =
-            gg->kernel[3][1] =
-                gg->kernel[3][3] = 0.0113;
-    gg->kernel[3][2] =
-        gg->kernel[1][2] =
-            gg->kernel[2][1] =
-                gg->kernel[2][3] = 0.0838;
-    gg->kernel[2][2] = 0.6193;
-    img->data.F32[0][0] = 0.0f;
-    img->data.F32[r/2][c/2] = 1.0f;
-    img->data.F32[r-1][c/2] = 0.0f;
-    psImage* out2 = psImageConvolve(out, img, gg, false);
- 
+    psImage* out2 = psImageConvolve(out, img, g, false);
+
     if (out == NULL) {
         psError(PS_ERR_UNKNOWN, true, "psImageConvolve returned a NULL for gaussian case.");
         return 10;
     }
- 
+
     if (out != out2) {
         psError(PS_ERR_UNKNOWN, true, "psImageConvolve didn't recycle the supplied out image struct.");
         return 11;
     }
- 
+
     if (out->numCols != c || out->numRows != r) {
         psError(PS_ERR_UNKNOWN, true, "psImageConvolve result image is %dx%d, but expected %dx%d.",
@@ -408,5 +394,5 @@
         return 12;
     }
- 
+
     if (out->type.type != PS_TYPE_F32) {
         char* typeStr;
@@ -416,17 +402,15 @@
         return 13;
     }
- 
-    psImageWriteSection(out2,0,0,0,NULL,0,"out2.fits");
+
     // test values
     for (psS32 i=-1;i<1;i++) {
         for (psS32 j=-1;j<1;j++) {
-            if (fabsf(out->data.F32[r/2+i][c/2+j] - g->kernel[i][j]) > 0.0001) {
+            if (fabsf(out->data.F32[r/2+i][c/2+j] - g->kernel[i][j]) > 0.01) {
                 psError(PS_ERR_UNKNOWN, true,"Convolved image wrong at %d,%d.  Value is %g, expected %g.",
                         c/2+j,r/2+i,
                         out->data.F32[r/2+i][c/2+j], g->kernel[i][j]);
-                psImageWriteSection(out,0,0,0,NULL,0,"problem.fits");
                 return 14;
             }
-            if (i >= 0 && j >= 0 && fabsf(out->data.F32[i][j] - g->kernel[i][j]) > 0.0001) {
+            if (i >= 0 && j >= 0 && fabsf(out->data.F32[i][j] - g->kernel[i][j]) > 0.01) {
                 psError(PS_ERR_UNKNOWN, true,"Convolved image wrong at %d,%d.  Value is %g, expected %g.",
                         j,i,
@@ -434,5 +418,5 @@
                 return 15;
             }
-            if (i <= 0 && fabsf(out->data.F32[r-1+i][c/2+j] - g->kernel[i][j]) > 0.0001) {
+            if (i <= 0 && fabsf(out->data.F32[r-1+i][c/2+j] - g->kernel[i][j]) > 0.01) {
                 psError(PS_ERR_UNKNOWN, true,"Convolved image wrong at %d,%d.  Value is %g, expected %g.",
                         c/2+j,r-1+i,
@@ -442,5 +426,5 @@
         }
     }
- 
+
     psFree(g);
     psFree(img);
@@ -449,4 +433,3 @@
     return 0;
 }
-*/
-
+
Index: /trunk/psLib/test/image/tst_psImageFFT.c
===================================================================
--- /trunk/psLib/test/image/tst_psImageFFT.c	(revision 3701)
+++ /trunk/psLib/test/image/tst_psImageFFT.c	(revision 3702)
@@ -6,6 +6,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-07 20:27:42 $
+ *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-15 00:12:09 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -68,5 +68,5 @@
 
     // 1. assign a image to a radial sinisoid
-    GENIMAGE(img,m,n,F32, sinf((32.0f-row)/16.0f*PS_PI)+sinf((64.0f-col)/32.0f*PS_PI));
+    GENIMAGE(img,m,n,F32, sinf((32.0f-row)/32.0f*PS_PI)+sinf((64.0f-col)/64.0f*PS_PI));
 
     // 2. perform a forward transform
@@ -88,7 +88,7 @@
             psF32 mag = cabsf(img2Row[col])/m/n;
             if (mag > 0.1f) {
-                // must be (0,1) or (0,n-1) or (1,0) or (n-1,0)
+                // must be (0,1) or (0,n-1) or (1,0) or (m-1,0)
                 if (! (col == 0 && (row == 1 || row == n-1))
-                        && ! (row == 0 && (col==1 || col == n-1)) ) {
+                        && ! (row == 0 && (col==1 || col == m-1)) ) {
                     psError(PS_ERR_UNKNOWN, true,"Result invalid at %d,%d (%.2f)",col,row,mag);
                     return 3;
@@ -96,5 +96,5 @@
             } else
                 if ( (col == 0 && (row == 1 || row == n-1))
-                        || (row == 0 && (col==1 || col == n-1)) ) {
+                        || (row == 0 && (col==1 || col == m-1)) ) {
                     psError(PS_ERR_UNKNOWN, true,"Result invalid at %d,%d (%.2f)",col,row,mag);
                     return 4;