[gegl] operations: the box-blur parameter is an integer



commit 1fdd00ad6ca777ba04bd829fcb2715a9cabde3ae
Author: Téo Mazars <teo mazars ensimag fr>
Date:   Fri Nov 1 11:40:19 2013 +0100

    operations: the box-blur parameter is an integer

 operations/common/box-blur.c  |   10 +++++-----
 tests/compositions/clones.xml |    6 +++---
 tests/opencl/box-blur.xml     |    2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/operations/common/box-blur.c b/operations/common/box-blur.c
index d44d6f4..afc19ea 100644
--- a/operations/common/box-blur.c
+++ b/operations/common/box-blur.c
@@ -22,7 +22,7 @@
 
 #ifdef GEGL_CHANT_PROPERTIES
 
-gegl_chant_double_ui (radius, _("Radius"), 0.0, 1000.0, 4.0, 0.0, 100.0, 1.5,
+gegl_chant_int_ui (radius, _("Radius"), 0, 1000, 4, 0, 100, 1.5,
    _("Radius of square pixel region, (width and height will be radius*2+1)"))
 
 #else
@@ -170,7 +170,7 @@ static void prepare (GeglOperation *operation)
   op_area->left   =
   op_area->right  =
   op_area->top    =
-  op_area->bottom = ceil (o->radius);
+  op_area->bottom = o->radius;
 
   gegl_operation_set_format (operation, "input",  babl_format ("RaGaBaA float"));
   gegl_operation_set_format (operation, "output", babl_format ("RaGaBaA float"));
@@ -295,7 +295,7 @@ cl_process (GeglOperation       *operation,
                          i->tex[0],
                          i->size[0],
                          &i->roi[0],
-                         ceil (o->radius));
+                         o->radius);
 
       if (err)
         {
@@ -340,8 +340,8 @@ process (GeglOperation       *operation,
                            babl_format ("RaGaBaA float"));
 
   /* doing second pass in separate gegl op may be significantly faster */
-  hor_blur (input, &rect, temp, &tmprect, ceil (o->radius));
-  ver_blur (temp, &rect, output, result, ceil (o->radius));
+  hor_blur (input, &rect, temp, &tmprect, o->radius);
+  ver_blur (temp, &rect, output, result, o->radius);
 
   g_object_unref (temp);
   return  TRUE;
diff --git a/tests/compositions/clones.xml b/tests/compositions/clones.xml
index 35923cc..ab3ee22 100644
--- a/tests/compositions/clones.xml
+++ b/tests/compositions/clones.xml
@@ -18,7 +18,7 @@
       </node>
       <node operation='gegl:box-blur'>
           <params>
-            <param name='radius'>5.000000</param>
+            <param name='radius'>5</param>
           </params>
       </node>
       <node operation='gegl:load' id='clone0'>
@@ -127,7 +127,7 @@
               </node>
               <node operation='gegl:box-blur'>
                   <params>
-                    <param name='radius'>4.000000</param>
+                    <param name='radius'>4</param>
                   </params>
               </node>
               <node operation='gegl:brightness-contrast'>
@@ -206,7 +206,7 @@
       </node>
       <node operation='gegl:box-blur'>
           <params>
-            <param name='radius'>15.000000</param>
+            <param name='radius'>15</param>
           </params>
       </node>
       <clone ref='clone2'/>
diff --git a/tests/opencl/box-blur.xml b/tests/opencl/box-blur.xml
index 64d7657..64df480 100644
--- a/tests/opencl/box-blur.xml
+++ b/tests/opencl/box-blur.xml
@@ -2,7 +2,7 @@
 <gegl>
   <node operation='gegl:box-blur'>
     <params>
-      <param name='radius'>25.0</param>
+      <param name='radius'>25</param>
     </params>
   </node>
   <node operation='gegl:load'>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]