gegl r1831 - in trunk: . gegl gegl/operation operations/affine operations/blur operations/color operations/enhance operations/io



Author: ok
Date: Tue Jan  8 19:48:33 2008
New Revision: 1831
URL: http://svn.gnome.org/viewvc/gegl?rev=1831&view=rev

Log:
* gegl/operation/gegl-operation-composer.[ch]: removed context_id from
arguments on process function.
* gegl/operation/gegl-operation-filter.[ch]: .. same
* gegl/operation/gegl-operation-sink.[ch]: .. and same.
* gegl/operation/gegl-operation-point-composer.c:
* gegl/operation/gegl-operation-point-filter.c: adapt to above change.
* gegl/gegl-chant.h: reflect above change.
* operations/affine/affine.c:
* operations/blur/box-blur.c:
* operations/blur/gaussian-blur.c:
* operations/color/mono-mixer.c:
* operations/color/stretch-contrast.c:
* operations/enhance/bilateral-filter.c:
* operations/enhance/snn-mean.c:
* operations/io/png-save.c:
* operations/io/save-buffer.c:
* operations/io/save-pixbuf.c: moved to new API.


Modified:
   trunk/ChangeLog
   trunk/gegl/gegl-chant.h
   trunk/gegl/operation/gegl-operation-composer.c
   trunk/gegl/operation/gegl-operation-composer.h
   trunk/gegl/operation/gegl-operation-filter.c
   trunk/gegl/operation/gegl-operation-filter.h
   trunk/gegl/operation/gegl-operation-point-composer.c
   trunk/gegl/operation/gegl-operation-point-filter.c
   trunk/gegl/operation/gegl-operation-sink.c
   trunk/gegl/operation/gegl-operation-sink.h
   trunk/operations/affine/affine.c
   trunk/operations/blur/box-blur.c
   trunk/operations/blur/gaussian-blur.c
   trunk/operations/color/mono-mixer.c
   trunk/operations/color/stretch-contrast.c
   trunk/operations/enhance/bilateral-filter.c
   trunk/operations/enhance/snn-mean.c
   trunk/operations/io/png-save.c
   trunk/operations/io/save-buffer.c
   trunk/operations/io/save-pixbuf.c

Modified: trunk/gegl/gegl-chant.h
==============================================================================
--- trunk/gegl/gegl-chant.h	(original)
+++ trunk/gegl/gegl-chant.h	Tue Jan  8 19:48:33 2008
@@ -422,7 +422,6 @@
 #else
 #ifdef GEGL_CHANT_SINK
 static gboolean process (GeglOperation       *operation,
-                         GeglNodeContext     *context,
                          GeglBuffer          *input,
                          const GeglRectangle *result);
 #else
@@ -434,14 +433,12 @@
 #else
 #ifdef GEGL_CHANT_FILTER
 static gboolean process (GeglOperation       *operation,
-                         GeglNodeContext     *context,
                          GeglBuffer          *input,
                          GeglBuffer          *output,
                          const GeglRectangle *result);
 #else
 #ifdef GEGL_CHANT_AREA_FILTER
 static gboolean process (GeglOperation       *operation,
-                         GeglNodeContext     *context,
                          GeglBuffer          *input,
                          GeglBuffer          *output,
                          const GeglRectangle *result);

Modified: trunk/gegl/operation/gegl-operation-composer.c
==============================================================================
--- trunk/gegl/operation/gegl-operation-composer.c	(original)
+++ trunk/gegl/operation/gegl-operation-composer.c	Tue Jan  8 19:48:33 2008
@@ -163,7 +163,7 @@
   if (input != NULL ||
       aux != NULL)
     {
-      success = klass->process (operation, context, input, aux, output, result);
+      success = klass->process (operation, input, aux, output, result);
       if (input)
         g_object_unref (input);
       if (aux)

Modified: trunk/gegl/operation/gegl-operation-composer.h
==============================================================================
--- trunk/gegl/operation/gegl-operation-composer.h	(original)
+++ trunk/gegl/operation/gegl-operation-composer.h	Tue Jan  8 19:48:33 2008
@@ -44,7 +44,6 @@
   GeglOperationClass parent_class;
 
   gboolean (* process) (GeglOperation       *self,
-                        GeglNodeContext     *context,
                         GeglBuffer          *input,
                         GeglBuffer          *aux,
                         GeglBuffer          *output,

Modified: trunk/gegl/operation/gegl-operation-filter.c
==============================================================================
--- trunk/gegl/operation/gegl-operation-filter.c	(original)
+++ trunk/gegl/operation/gegl-operation-filter.c	Tue Jan  8 19:48:33 2008
@@ -196,8 +196,7 @@
   output = gegl_node_context_get_target (context, "output");
   if (input != NULL)
     { /* FIXME: perhaps input should really be passed instead of context */
-      success = klass->process (operation, context,
-                                input, output, result);
+      success = klass->process (operation, input, output, result);
       g_object_unref (input);
     }
   else

Modified: trunk/gegl/operation/gegl-operation-filter.h
==============================================================================
--- trunk/gegl/operation/gegl-operation-filter.h	(original)
+++ trunk/gegl/operation/gegl-operation-filter.h	Tue Jan  8 19:48:33 2008
@@ -44,7 +44,6 @@
   GeglOperationClass parent_class;
 
   gboolean (* process) (GeglOperation       *self,
-                        GeglNodeContext     *context,
                         GeglBuffer          *input,
                         GeglBuffer          *output,
                         const GeglRectangle *result);

Modified: trunk/gegl/operation/gegl-operation-point-composer.c
==============================================================================
--- trunk/gegl/operation/gegl-operation-point-composer.c	(original)
+++ trunk/gegl/operation/gegl-operation-point-composer.c	Tue Jan  8 19:48:33 2008
@@ -22,7 +22,6 @@
 #include <string.h>
 
 static gboolean process_inner (GeglOperation       *operation,
-                               GeglNodeContext     *context,
                                GeglBuffer          *input,
                                GeglBuffer          *aux,
                                GeglBuffer          *output,
@@ -56,6 +55,9 @@
 
 }
 
+#if 0 /* FIXME: this should be re-enabled, possibly by skipping the point-composer class duplicating that
+       * code and directly implement on top of GeglOperation
+       */
 static gboolean
 fast_paths (GeglOperation       *operation,
             GeglNodeContext     *context,
@@ -63,10 +65,10 @@
             const Babl          *aux_format,
             const Babl          *out_format,
             const GeglRectangle *result);
+#endif
 
 static gboolean
 process_inner (GeglOperation       *operation,
-               GeglNodeContext     *context,
                GeglBuffer          *input,
                GeglBuffer          *aux,
                GeglBuffer          *output,
@@ -107,12 +109,14 @@
    * good idea. NB! some of the OpenRaster meta ops, depends on the
    * short-circuiting happening in fast_paths.
    * */
+#if 0
   if (0 && fast_paths (operation, context,
                        in_format,
                        aux_format,
                        out_format,
                        result))
     return TRUE;
+#endif
 
 #if 0
   /* retrieve the buffer we're writing to from GEGL */
@@ -163,7 +167,7 @@
   return TRUE;
 }
 
-
+#if 0
 static gboolean
 fast_paths (GeglOperation       *operation,
             GeglNodeContext     *context,
@@ -240,3 +244,4 @@
   }
   return FALSE;
 }
+#endif

Modified: trunk/gegl/operation/gegl-operation-point-filter.c
==============================================================================
--- trunk/gegl/operation/gegl-operation-point-filter.c	(original)
+++ trunk/gegl/operation/gegl-operation-point-filter.c	Tue Jan  8 19:48:33 2008
@@ -21,7 +21,6 @@
 #include <string.h>
 
 static gboolean process_inner (GeglOperation       *operation,
-                               GeglNodeContext     *context,
                                GeglBuffer          *input,
                                GeglBuffer          *output,
                                const GeglRectangle *result);
@@ -51,7 +50,6 @@
 
 static gboolean
 process_inner (GeglOperation       *operation,
-               GeglNodeContext     *context,
                GeglBuffer          *input,
                GeglBuffer          *output,
                const GeglRectangle *result)

Modified: trunk/gegl/operation/gegl-operation-sink.c
==============================================================================
--- trunk/gegl/operation/gegl-operation-sink.c	(original)
+++ trunk/gegl/operation/gegl-operation-sink.c	Tue Jan  8 19:48:33 2008
@@ -39,7 +39,7 @@
 
 static gboolean      process               (GeglOperation       *operation,
                                             GeglNodeContext     *context,
-                                            const gchar         *output_prop,                                            
+                                            const gchar         *output_prop,
                                             const GeglRectangle *result);
 static void          attach                (GeglOperation       *operation);
 static GeglRectangle get_defined_region    (GeglOperation       *self);
@@ -127,7 +127,7 @@
   input = gegl_node_context_get_source (context, "input");
   if (input)
     {
-      success = klass->process (operation, context, input, result);
+      success = klass->process (operation, input, result);
       g_object_unref (input);
     }
 

Modified: trunk/gegl/operation/gegl-operation-sink.h
==============================================================================
--- trunk/gegl/operation/gegl-operation-sink.h	(original)
+++ trunk/gegl/operation/gegl-operation-sink.h	Tue Jan  8 19:48:33 2008
@@ -44,7 +44,6 @@
   gboolean           needs_full;
 
   gboolean (* process) (GeglOperation       *self,
-                        GeglNodeContext     *context,
                         GeglBuffer          *input,
                         const GeglRectangle *result);
 };

Modified: trunk/operations/affine/affine.c
==============================================================================
--- trunk/operations/affine/affine.c	(original)
+++ trunk/operations/affine/affine.c	Tue Jan  8 19:48:33 2008
@@ -68,7 +68,6 @@
                                               const GeglRectangle *region);
 
 static gboolean      process                 (GeglOperation       *op,
-                                              GeglNodeContext     *context,
                                               GeglBuffer          *input,
                                               GeglBuffer          *output,
                                               const GeglRectangle *result);
@@ -661,7 +660,6 @@
 
 static gboolean
 process (GeglOperation       *operation,
-         GeglNodeContext     *context,
          GeglBuffer          *input,
          GeglBuffer          *output,
          const GeglRectangle *result)

Modified: trunk/operations/blur/box-blur.c
==============================================================================
--- trunk/operations/blur/box-blur.c	(original)
+++ trunk/operations/blur/box-blur.c	Tue Jan  8 19:48:33 2008
@@ -43,7 +43,6 @@
 
 static gboolean
 process (GeglOperation       *operation,
-         GeglNodeContext     *context,
          GeglBuffer          *input,
          GeglBuffer          *output,
          const GeglRectangle *result)

Modified: trunk/operations/blur/gaussian-blur.c
==============================================================================
--- trunk/operations/blur/gaussian-blur.c	(original)
+++ trunk/operations/blur/gaussian-blur.c	Tue Jan  8 19:48:33 2008
@@ -83,7 +83,6 @@
 
 static gboolean
 process (GeglOperation       *operation,
-         GeglNodeContext     *context,
          GeglBuffer          *input,
          GeglBuffer          *output,
          const GeglRectangle *result)

Modified: trunk/operations/color/mono-mixer.c
==============================================================================
--- trunk/operations/color/mono-mixer.c	(original)
+++ trunk/operations/color/mono-mixer.c	Tue Jan  8 19:48:33 2008
@@ -35,11 +35,10 @@
 #include "gegl-chant.h"
 
 static gboolean
-process (GeglOperation *operation,
-        GeglNodeContext *context,
-        GeglBuffer      *input,
-        GeglBuffer      *output,
-        const GeglRectangle *result)
+process (GeglOperation       *operation,
+         GeglBuffer          *input,
+         GeglBuffer          *output,
+         const GeglRectangle *result)
 {
  GeglChantOperation  *self;
  gfloat              *in_buf;

Modified: trunk/operations/color/stretch-contrast.c
==============================================================================
--- trunk/operations/color/stretch-contrast.c	(original)
+++ trunk/operations/color/stretch-contrast.c	Tue Jan  8 19:48:33 2008
@@ -82,7 +82,6 @@
 
 static gboolean
 process (GeglOperation       *operation,
-         GeglNodeContext     *context,
          GeglBuffer          *input,
          GeglBuffer          *output,
          const GeglRectangle *result)

Modified: trunk/operations/enhance/bilateral-filter.c
==============================================================================
--- trunk/operations/enhance/bilateral-filter.c	(original)
+++ trunk/operations/enhance/bilateral-filter.c	Tue Jan  8 19:48:33 2008
@@ -45,7 +45,6 @@
 
 static gboolean
 process (GeglOperation       *operation,
-         GeglNodeContext     *context,
          GeglBuffer          *input,
          GeglBuffer          *output,
          const GeglRectangle *result)

Modified: trunk/operations/enhance/snn-mean.c
==============================================================================
--- trunk/operations/enhance/snn-mean.c	(original)
+++ trunk/operations/enhance/snn-mean.c	Tue Jan  8 19:48:33 2008
@@ -44,8 +44,7 @@
 
 
 static gboolean
-process (GeglOperation *operation,
-         GeglNodeContext *context,
+process (GeglOperation       *operation,
          GeglBuffer          *input,
          GeglBuffer          *output,
          const GeglRectangle *result)

Modified: trunk/operations/io/png-save.c
==============================================================================
--- trunk/operations/io/png-save.c	(original)
+++ trunk/operations/io/png-save.c	Tue Jan  8 19:48:33 2008
@@ -44,7 +44,6 @@
 
 static gboolean
 process (GeglOperation       *operation,
-         GeglNodeContext     *context,
          GeglBuffer          *input,
          const GeglRectangle *result)
 {

Modified: trunk/operations/io/save-buffer.c
==============================================================================
--- trunk/operations/io/save-buffer.c	(original)
+++ trunk/operations/io/save-buffer.c	Tue Jan  8 19:48:33 2008
@@ -29,7 +29,6 @@
 
 static gboolean
 process (GeglOperation       *operation,
-         GeglNodeContext     *context,
          GeglBuffer          *input,
          const GeglRectangle *result)
 {

Modified: trunk/operations/io/save-pixbuf.c
==============================================================================
--- trunk/operations/io/save-pixbuf.c	(original)
+++ trunk/operations/io/save-pixbuf.c	Tue Jan  8 19:48:33 2008
@@ -32,7 +32,6 @@
 
 static gboolean
 process (GeglOperation       *operation,
-         GeglNodeContext     *context,
          GeglBuffer          *input,
          const GeglRectangle *result)
 {



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