gegl r2357 - in branches/branch_zhangjb: . docs/images operations/frequency/tools tests/frequency

[zhangjb svn gnome org]

Author: zhangjb
Date: Mon May 26 13:53:12 2008
New Revision: 2357
URL: http://svn.gnome.org/viewvc/gegl?rev=2357&view=rev

Log:
Fixed this bug: Error when image's height isn't equal its width.
* operations/frequency/tools/fourier.c: fixed the bug which causes error when height!=width.
* tests/frequency/hello-world-fourier.c: some small modifies.
* docs/images/flower.png: a new image which has different height and width.
* docs/images/test_10x9.png: a new image for testing.


Added:
   branches/branch_zhangjb/docs/images/flower.png   (contents, props changed)
   branches/branch_zhangjb/docs/images/test_10x9.png   (contents, props changed)
Modified:
   branches/branch_zhangjb/ChangeLog
   branches/branch_zhangjb/operations/frequency/tools/fourier.c
   branches/branch_zhangjb/tests/frequency/hello-world-fourier.c

Added: branches/branch_zhangjb/docs/images/flower.png
==============================================================================
Binary file. No diff available.

Added: branches/branch_zhangjb/docs/images/test_10x9.png
==============================================================================
Binary file. No diff available.

Modified: branches/branch_zhangjb/operations/frequency/tools/fourier.c
==============================================================================
--- branches/branch_zhangjb/operations/frequency/tools/fourier.c	(original)
+++ branches/branch_zhangjb/operations/frequency/tools/fourier.c	Mon May 26 13:53:12 2008
@@ -33,8 +33,8 @@
 {
   fftw_plan fftplan;
 
-  fftplan = fftw_plan_dft_r2c_2d(width,
-                                 height,
+  fftplan = fftw_plan_dft_r2c_2d(height,
+                                 width,
                                  src_buf,
                                  dst_buf,
                                  FFTW_ESTIMATE);
@@ -51,8 +51,8 @@
   glong samples;
 
   samples= height*width;
-  fftplan = fftw_plan_dft_c2r_2d(width,
-                                 height,
+  fftplan = fftw_plan_dft_c2r_2d(height,
+                                 width,
                                  src_buf,
                                  dst_buf,
                                   FFTW_ESTIMATE);

Modified: branches/branch_zhangjb/tests/frequency/hello-world-fourier.c
==============================================================================
--- branches/branch_zhangjb/tests/frequency/hello-world-fourier.c	(original)
+++ branches/branch_zhangjb/tests/frequency/hello-world-fourier.c	Mon May 26 13:53:12 2008
@@ -13,7 +13,7 @@
                                   "operation",
                                   "load",
                                   "path",
-                                  "docs/images/lena_rgba.png",
+                                  "docs/images/flower.png",
                                   NULL);
       GeglNode *dft = gegl_node_new_child(gegl, "operation", "dft", NULL);
       GeglNode *idft = gegl_node_new_child(gegl, "operation", "dft-inverse", NULL);
@@ -26,12 +26,7 @@
                                   "test_result.png",
                                   NULL);
 
-      /* gegl_node_link_many(image, proc, display, NULL);        
-       for (frame=0; frame<50; frame++) {
-       gegl_node_process(display);
-       }*/
-
-      gegl_node_link_many(image, dft, preview, save, NULL);
+      gegl_node_link_many(image, dft, idft, save, NULL);
       gegl_node_process(save);
 
       g_object_unref(gegl);