gegl r2510 - in branches/branch2_zhangjb: . operations/frequency operations/frequency/tools

[zhangjb svn gnome org]

Author: zhangjb
Date: Sun Jun 29 17:48:34 2008
New Revision: 2510
URL: http://svn.gnome.org/viewvc/gegl?rev=2510&view=rev

Log:
* operations/frequency/dft.c:
* operations/frequency/freq-general-filter.c: new op.
* operations/frequency/idft.c:
* operations/frequency/tools/Makefile.am: add filters.c
* operations/frequency/tools/filters.c: new.


Added:
   branches/branch2_zhangjb/operations/frequency/freq-general-filter.c
   branches/branch2_zhangjb/operations/frequency/tools/filters.c
Modified:
   branches/branch2_zhangjb/ChangeLog
   branches/branch2_zhangjb/operations/frequency/dft.c
   branches/branch2_zhangjb/operations/frequency/idft.c
   branches/branch2_zhangjb/operations/frequency/tools/Makefile.am

Modified: branches/branch2_zhangjb/operations/frequency/dft.c
==============================================================================
--- branches/branch2_zhangjb/operations/frequency/dft.c	(original)
+++ branches/branch2_zhangjb/operations/frequency/dft.c	Sun Jun 29 17:48:34 2008
@@ -28,7 +28,6 @@
 #include "gegl-chant.h"
 #include "tools/fourier.c"
 #include "tools/component.c"
-#include <fftw3.h>
 
 static GeglRectangle
 get_bounding_box (GeglOperation *operation)

Added: branches/branch2_zhangjb/operations/frequency/freq-general-filter.c
==============================================================================
--- (empty file)
+++ branches/branch2_zhangjb/operations/frequency/freq-general-filter.c	Sun Jun 29 17:48:34 2008
@@ -0,0 +1,99 @@
+/* This file is a part of GEGL
+ *
+ * GEGL is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * GEGL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with GEGL; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Copyright 2008 Zhang Junbo  <zhangjb svn gnome org>
+ */
+
+#ifdef GEGL_CHANT_PROPERTIES
+
+/* no properties */
+
+#else
+
+#define GEGL_CHANT_TYPE_FILTER
+#define GEGL_CHANT_C_FILE       "freq-general-filter.c"
+
+#include "gegl-chant.h"
+#include "tools/component.c"
+
+static GeglRectangle
+get_bounding_box (GeglOperation *operation)
+{
+  return *gegl_operation_source_get_bounding_box (operation, "input");
+}
+
+static GeglRectangle
+get_required_for_output(GeglOperation *operation,
+                        const gchar *input_pad,
+                        const GeglRectangle *roi)
+{
+  return *gegl_operation_source_get_bounding_box(operation, "input");
+}
+
+static GeglRectangle
+get_cached_region(GeglOperation *operation,
+                  const GeglRectangle *roi)
+{
+  return get_bounding_box(operation);
+}
+
+static void
+prepare(GeglOperation *operation)
+{
+  Babl *format = babl_format ("frequency double")
+    gegl_operation_set_format(operation, "input", format);
+  gegl_operation_set_format(operation, "output", format);
+}
+
+static gboolean
+process(GeglOperation *operation,
+        GeglBuffer *input,
+        GeglBuffer *output,
+        const GeglRectangle *result)
+{
+  gint width = gegl_buffer_get_width(input);
+  gint height = gegl_buffer_get_height(input);
+
+  src_buf = g_new0(gdouble, 4*width*height);
+  gegl_buffer_get(input, 1.0, NULL, babl_format ("RGBA double"), src_buf,
+                  GEGL_AUTO_ROWSTRIDE);
+
+  g_free(src_buf);
+  return TRUE;
+}
+
+static void
+gegl_chant_class_init(GeglChantClass *klass)
+{
+  GeglOperationClass *operation_class;
+  GeglOperationFilterClass *filter_class;
+
+  operation_class = GEGL_OPERATION_CLASS(klass);
+  filter_class = GEGL_OPERATION_FILTER_CLASS(klass);
+
+  filter_class->process = process;
+  operation_class->prepare = prepare;
+  operation_class->get_bounding_box = get_bounding_box;
+  operation_class->get_required_for_output= get_required_for_output;
+  operation_class->get_cached_region = get_cached_region;
+
+  operation_class->name = "freq-general-filter";
+  operation_class->categories = "frequency";
+  operation_class->description
+    = "The most general filer in frequency domain. What it does is just"
+    "multiplying a matrix on the freqeuncy image.";
+}
+
+#endif

Modified: branches/branch2_zhangjb/operations/frequency/idft.c
==============================================================================
--- branches/branch2_zhangjb/operations/frequency/idft.c	(original)
+++ branches/branch2_zhangjb/operations/frequency/idft.c	Sun Jun 29 17:48:34 2008
@@ -28,7 +28,6 @@
 #include "gegl-chant.h"
 #include "tools/fourier.c"
 #include "tools/component.c"
-#include <fftw3.h>
 
 static GeglRectangle
 get_bounding_box (GeglOperation *operation)
@@ -61,9 +60,9 @@
 
 static gboolean 
 process(GeglOperation *operation,
-                        GeglBuffer *input,
-                        GeglBuffer *output,
-                        const GeglRectangle *result)
+        GeglBuffer *input,
+        GeglBuffer *output,
+        const GeglRectangle *result)
 {
   gint width = gegl_buffer_get_width(input);
   gint height = gegl_buffer_get_height(input);
@@ -78,7 +77,8 @@
   tmp_src_buf = g_new0(gdouble, 2*height*FFT_HALF(width));
   tmp_dst_buf = g_new0(gdouble, width*height);
 
-  gegl_buffer_get(input, 1.0, NULL, babl_format("frequency double"), (gdouble *)src_buf, GEGL_AUTO_ROWSTRIDE);
+  gegl_buffer_get(input, 1.0, NULL, babl_format("frequency double"),
+                  (gdouble *)src_buf, GEGL_AUTO_ROWSTRIDE);
   for (i=0; i<4; i++)
     {
       get_rgba_component(src_buf, tmp_src_buf, i, 2*height*FFT_HALF(width));

Modified: branches/branch2_zhangjb/operations/frequency/tools/Makefile.am
==============================================================================
--- branches/branch2_zhangjb/operations/frequency/tools/Makefile.am	(original)
+++ branches/branch2_zhangjb/operations/frequency/tools/Makefile.am	Sun Jun 29 17:48:34 2008
@@ -1,4 +1,5 @@
 EXTRA_DIST = \
+	filters.c	\
 	fourier.c	\
 	display.c	\
 	component.c
\ No newline at end of file

Added: branches/branch2_zhangjb/operations/frequency/tools/filters.c
==============================================================================
--- (empty file)
+++ branches/branch2_zhangjb/operations/frequency/tools/filters.c	Sun Jun 29 17:48:34 2008
@@ -0,0 +1,29 @@
+/* This file is a part of GEGL
+ *
+ * GEGL is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * GEGL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with GEGL; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Copyright 2008 Zhang Junbo  <zhangjb svn gnome org>
+ */
+
+#ifndef FFT_HALF
+#define FFT_HALF(n) (gint)((n)/2+1)
+#define ELEM_ID_MATRIX(x, y, c) ((y)*(c)+(x)) 
+#define ELEM_ID_HALF_MATRIX(x, y, c) ((y)*(FFT_HALF(c))+(x))
+#endif
+
+gboolean
+freq_multiply(gdouble *X_buf, gdouble *H_buf, gint width, gint height)
+{
+  return TRUE;
+}
\ No newline at end of file