Changeset 11725

Timestamp:

Feb 8, 2007, 3:26:31 PM (19 years ago)

Author:

Paul Price

Message:

Moving FFT test into tap_psImageFFT2

File:

• trunk/psLib/test/imageops/tap_psImageConvolve2.c (modified) (2 diffs)

trunk/psLib/test/imageops/tap_psImageConvolve2.c

@@ -60 +60 @@
 int main(int argc, char *argv[])
 {
-    plan_tests(16);
+    plan_tests(10);
 
     diag("psImageConvolve tests");
 
     {
-        // Direct convolution
+        // Direct convolution: 5 tests
         psMemId id = psMemGetId();
 
@@ -88 +88 @@
 
     {
-        // FFT forward, then back --- do I get what I started with?
-        psMemId id = psMemGetId();
-
-        psImage *old = generateImage();
-        psImage *fftReal = NULL, *fftImag = NULL;
-        bool result = psImageForwardFFT(&fftReal, &fftImag, old);
-        ok(result, "forward fft result");
-        skip_start(!result, 3, "forward fft failed");
-        ok(fftReal->type.type == PS_TYPE_F32 && fftImag->type.type == PS_TYPE_F32, "forward fft types");
-        psImage *new = NULL;
-        result = psImageBackwardFFT(&new, fftReal, fftImag, old->numCols);
-        ok(result, "backward fft result");
-        skip_start(!result, 2, "backward fft failed");
-        ok(new->type.type == PS_TYPE_F32, "backward fft type");
-        bool correct = true;
-        for (int y = 0; y < old->numRows; y++) {
-            for (int x = 0; x < old->numCols; x++) {
-                if (fabs(new->data.F32[y][x] / IMAGE_SIZE / IMAGE_SIZE - old->data.F32[y][x]) > TOL) {
-                    correct = false;
-                }
-            }
-        }
-        ok(correct, "new matches old");
-        psFree(new);
-        skip_end();
-        skip_end();
-
-        psFree(fftReal);
-        psFree(fftImag);
-        psFree(old);
-        ok(!psMemCheckLeaks(id, NULL, NULL, false), "no memory leaks");
-
-    }
-
-    {
-        // FFT convolution
+        // FFT convolution: 5 tests
         psMemId id = psMemGetId();