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

[zhangjb svn gnome org]

Author: zhangjb
Date: Mon Jun 30 05:07:44 2008
New Revision: 2514
URL: http://svn.gnome.org/viewvc/gegl?rev=2514&view=rev

Log:
Added the imag-matrix.
* operations/frequency/freq-general-filter.c:
* operations/frequency/tools/filters.c:


Modified:
   branches/branch2_zhangjb/ChangeLog
   branches/branch2_zhangjb/operations/frequency/freq-general-filter.c
   branches/branch2_zhangjb/operations/frequency/tools/filters.c

Modified: branches/branch2_zhangjb/operations/frequency/freq-general-filter.c
==============================================================================
--- branches/branch2_zhangjb/operations/frequency/freq-general-filter.c	(original)
+++ branches/branch2_zhangjb/operations/frequency/freq-general-filter.c	Mon Jun 30 05:07:44 2008
@@ -18,7 +18,8 @@
 
 #ifdef GEGL_CHANT_PROPERTIES
 
-gegl_chant_pointer(Hbuf, "Matrix", "The transfer function matrix.")
+gegl_chant_pointer(realH, "Matrix", "The transfer function matrix(real part).")
+gegl_chant_pointer(imagH, "Matrix", "The transfer function matrix(imag part).")
 gegl_chant_int(flag, "Flag", 0, 15, 14,
                "Decide which componet need to process. Example: if flag=14, "
                "14==0b1110, so we filter on componets RGB, do not filter on A.")
@@ -74,7 +75,8 @@
   gdouble *dst_buf;
   gdouble *comp_real;
   gdouble *comp_imag;
-  gdouble *H_buf = o->Hbuf;
+  gdouble *Hr_buf = o->realH;
+  gdouble *Hi_buf = o->imagH;
   gint flag = o->flag;
   gint i;
 
@@ -91,7 +93,7 @@
 
       if ((8>>i)&flag)
         {
-          freq_multiply(comp_real, comp_imag, H_buf, width, height);
+          freq_multiply(comp_real, comp_imag, Hr_buf, Hi_buf, width, height);
         }
 
       set_freq_component(comp_real, dst_buf, i, FFT_HALF(width)*height);
@@ -123,7 +125,7 @@
   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"
+    = "The most general filer in frequency domain. What it does is just "
     "multiplying a matrix on the freqeuncy image.";
 }
 

Modified: branches/branch2_zhangjb/operations/frequency/tools/filters.c
==============================================================================
--- branches/branch2_zhangjb/operations/frequency/tools/filters.c	(original)
+++ branches/branch2_zhangjb/operations/frequency/tools/filters.c	Mon Jun 30 05:07:44 2008
@@ -22,11 +22,12 @@
 #define ELEM_ID_HALF_MATRIX(x, y, c) ((y)*(FFT_HALF(c))+(x))
 #endif
 
-gboolean freq_multiply(gdouble *, gdouble *, gdouble *, gint, gint);
+gboolean freq_multiply(gdouble *, gdouble *, gdouble *, gdouble *, gint, gint);
 
 gboolean
-freq_multiply(gdouble *Xr_buf, gdouble *Xi_buf, gdouble *H_buf,
-              gint width, gint height)
+freq_multiply(gdouble *Xr_buf, gdouble *Xi_buf, gdouble *Hr_buf,
+              gdouble *Hi_buf, gint width, gint height)
 {
+  
   return TRUE;
 }