gegl r1836 - in trunk: . gegl operations/generated operations/workshop

[kcozens svn gnome org]

Author: kcozens
Date: Thu Jan 10 01:56:00 2008
New Revision: 1836
URL: http://svn.gnome.org/viewvc/gegl?rev=1836&view=rev

Log:
2008-01-08  Kevin Cozens  <kcozens cvs gnome org>

	* operations/generated/Makefile.am: Remove generated .c files in
	maintainer-clean-generic.

	* gegl/gegl-chant.h: Removed context argument from GEGL_CHANT_COMPOSER.

	* operations/workshop/min-envelope.c:
	* operations/workshop/max-envelope.c:
	* operations/workshop/kuwahara.c:
	* operations/workshop/box-min.c:
	* operations/workshop/disc-percentile.c:
	* operations/workshop/c2g.c:
	* operations/workshop/demosaic-simple.c:
	* operations/workshop/gluas.c:
	* operations/workshop/box-max.c:
	* operations/workshop/hstack.c:
	* operations/workshop/box-percentile.c:
	* operations/workshop/mblur.c:
	* operations/workshop/stress.c:
	* operations/workshop/kuwahara-min.c:
	* operations/workshop/line-profile.c:
	* operations/workshop/kuwahara-max.c:
	* operations/workshop/snn-percentile.c:
	* operations/workshop/ff-save.c:
	* operations/workshop/gtk-display.c: removed context_id from
	arguments on process function.


Modified:
   trunk/ChangeLog
   trunk/gegl/gegl-chant.h
   trunk/operations/generated/Makefile.am
   trunk/operations/workshop/box-max.c
   trunk/operations/workshop/box-min.c
   trunk/operations/workshop/box-percentile.c
   trunk/operations/workshop/c2g.c
   trunk/operations/workshop/demosaic-simple.c
   trunk/operations/workshop/disc-percentile.c
   trunk/operations/workshop/ff-save.c
   trunk/operations/workshop/gluas.c
   trunk/operations/workshop/gtk-display.c
   trunk/operations/workshop/hstack.c
   trunk/operations/workshop/kuwahara-max.c
   trunk/operations/workshop/kuwahara-min.c
   trunk/operations/workshop/kuwahara.c
   trunk/operations/workshop/line-profile.c
   trunk/operations/workshop/max-envelope.c
   trunk/operations/workshop/mblur.c
   trunk/operations/workshop/min-envelope.c
   trunk/operations/workshop/snn-percentile.c
   trunk/operations/workshop/stress.c

Modified: trunk/gegl/gegl-chant.h
==============================================================================
--- trunk/gegl/gegl-chant.h	(original)
+++ trunk/gegl/gegl-chant.h	Thu Jan 10 01:56:00 2008
@@ -415,7 +415,6 @@
 #else
 #ifdef GEGL_CHANT_COMPOSER
 static gboolean process (GeglOperation       *operation,
-                         GeglNodeContext     *context,
                          GeglBuffer          *in_buf,
                          GeglBuffer          *aux_buf,
                          GeglBuffer          *out_buf,

Modified: trunk/operations/generated/Makefile.am
==============================================================================
--- trunk/operations/generated/Makefile.am	(original)
+++ trunk/operations/generated/Makefile.am	Thu Jan 10 01:56:00 2008
@@ -1 +1,4 @@
 include $(top_srcdir)/operations/Makefile-operations.am
+
+maintainer-clean-generic:
+	-rm *.c

Modified: trunk/operations/workshop/box-max.c
==============================================================================
--- trunk/operations/workshop/box-max.c	(original)
+++ trunk/operations/workshop/box-max.c	Thu Jan 10 01:56:00 2008
@@ -49,7 +49,6 @@
 
 static gboolean
 process (GeglOperation       *operation,
-         GeglNodeContext     *context,
          GeglBuffer          *input,
          GeglBuffer          *output,
          const GeglRectangle *result)
@@ -72,12 +71,6 @@
       ver_max (temp, output, self->radius);
       g_object_unref (temp);
       g_object_unref (temp_in);
-
-      {
-        GeglBuffer *cropped = gegl_buffer_create_sub_buffer (output, result);
-
-        gegl_node_context_set_object (context, "output", G_OBJECT (cropped));
-      }
     }
 
   return  TRUE;

Modified: trunk/operations/workshop/box-min.c
==============================================================================
--- trunk/operations/workshop/box-min.c	(original)
+++ trunk/operations/workshop/box-min.c	Thu Jan 10 01:56:00 2008
@@ -49,7 +49,6 @@
 
 static gboolean
 process (GeglOperation       *operation,
-         GeglNodeContext     *context,
          GeglBuffer          *input,
          GeglBuffer          *output,
          const GeglRectangle *result)
@@ -70,13 +69,9 @@
 
       hor_min (temp_in, temp,  self->radius);
       ver_min (temp, output, self->radius);
+
       g_object_unref (temp);
       g_object_unref (temp_in);
-
-      {
-        GeglBuffer *cropped = gegl_buffer_create_sub_buffer (output, result);
-        gegl_node_context_set_object (context, "output", G_OBJECT (cropped));
-      }
     }
 
   return  TRUE;

Modified: trunk/operations/workshop/box-percentile.c
==============================================================================
--- trunk/operations/workshop/box-percentile.c	(original)
+++ trunk/operations/workshop/box-percentile.c	Thu Jan 10 01:56:00 2008
@@ -50,7 +50,6 @@
 
 static gboolean
 process (GeglOperation       *operation,
-         GeglNodeContext     *context,
          GeglBuffer          *input,
          GeglBuffer          *output,
          const GeglRectangle *result)
@@ -76,11 +75,6 @@
           median (temp_in, output, self->radius, self->percentile / 100.0);
           g_object_unref (temp_in);
         }
-
-      {
-        GeglBuffer *cropped = gegl_buffer_create_sub_buffer (output, result);
-        gegl_node_context_set_object (context, "output", G_OBJECT (cropped));
-      }
     }
 
   return  TRUE;

Modified: trunk/operations/workshop/c2g.c
==============================================================================
--- trunk/operations/workshop/c2g.c	(original)
+++ trunk/operations/workshop/c2g.c	Thu Jan 10 01:56:00 2008
@@ -59,7 +59,6 @@
 
 static gboolean
 process (GeglOperation       *operation,
-         GeglNodeContext     *context,
          GeglBuffer          *input,
          GeglBuffer          *output,
          const GeglRectangle *result)
@@ -78,12 +77,6 @@
 
     c2g (temp_in, output, self->radius, self->samples, self->iterations, self->same_spray, self->rgamma, self->strength, self->gamma);
     g_object_unref (temp_in);
-
-    {
-      GeglBuffer *cropped = gegl_buffer_create_sub_buffer (output, result);
-
-      gegl_node_context_set_object (context, "output", G_OBJECT (cropped));
-    }
   }
 
   return  TRUE;

Modified: trunk/operations/workshop/demosaic-simple.c
==============================================================================
--- trunk/operations/workshop/demosaic-simple.c	(original)
+++ trunk/operations/workshop/demosaic-simple.c	Thu Jan 10 01:56:00 2008
@@ -37,7 +37,6 @@
 
 static gboolean
 process (GeglOperation       *operation,
-         GeglNodeContext     *context,
          GeglBuffer          *input,
          GeglBuffer          *output,
          const GeglRectangle *result)
@@ -58,12 +57,6 @@
 
       demosaic (self, temp_in, output);
       g_object_unref (temp_in);
-
-
-      {
-        GeglBuffer *cropped = gegl_buffer_create_sub_buffer (output, result);
-        gegl_node_context_set_object (context, "output", G_OBJECT (cropped));
-      }
     }
 
   return  TRUE;

Modified: trunk/operations/workshop/disc-percentile.c
==============================================================================
--- trunk/operations/workshop/disc-percentile.c	(original)
+++ trunk/operations/workshop/disc-percentile.c	Thu Jan 10 01:56:00 2008
@@ -51,7 +51,6 @@
 
 static gboolean
 process (GeglOperation       *operation,
-         GeglNodeContext     *context,
          GeglBuffer          *input,
          GeglBuffer          *output,
          const GeglRectangle *result)
@@ -77,11 +76,6 @@
           median (temp_in, output, self->radius, self->percentile / 100.0);
           g_object_unref (temp_in);
         }
-
-      {
-        GeglBuffer *cropped = gegl_buffer_create_sub_buffer (output, result);
-        gegl_node_context_set_object (context, "output", G_OBJECT (cropped));
-      }
     }
 
   return  TRUE;

Modified: trunk/operations/workshop/ff-save.c
==============================================================================
--- trunk/operations/workshop/ff-save.c	(original)
+++ trunk/operations/workshop/ff-save.c	Thu Jan 10 01:56:00 2008
@@ -23,11 +23,12 @@
 
 #else
 
-#define GEGL_CHANT_SINK
 #define GEGL_CHANT_NAME         ff_save
-#define GEGL_CHANT_DESCRIPTION  "FFmpeg video output sink"
 #define GEGL_CHANT_SELF         "ff-save.c"
+#define GEGL_CHANT_DESCRIPTION  "FFmpeg video output sink"
 #define GEGL_CHANT_CATEGORIES   "output:video"
+
+#define GEGL_CHANT_SINK
 #define GEGL_CHANT_INIT
 #define GEGL_CHANT_CLASS_INIT
 
@@ -200,7 +201,6 @@
 
 static gboolean
 process (GeglOperation       *operation,
-         GeglNodeContext     *context,
          GeglBuffer          *input,
          const GeglRectangle *result)
 {

Modified: trunk/operations/workshop/gluas.c
==============================================================================
--- trunk/operations/workshop/gluas.c	(original)
+++ trunk/operations/workshop/gluas.c	Thu Jan 10 01:56:00 2008
@@ -86,7 +86,6 @@
 
 static gboolean
 process (GeglOperation       *operation,
-         GeglNodeContext     *context,
          GeglBuffer          *input,
          GeglBuffer          *aux,
          GeglBuffer          *output,
@@ -105,7 +104,6 @@
       drawable_lua_process (self, input, output, result, NULL, self->script, self->user_value);
     }
 
-  gegl_node_context_set_object (context, "output", G_OBJECT (output));
   return TRUE;
 }
 

Modified: trunk/operations/workshop/gtk-display.c
==============================================================================
--- trunk/operations/workshop/gtk-display.c	(original)
+++ trunk/operations/workshop/gtk-display.c	Thu Jan 10 01:56:00 2008
@@ -98,7 +98,6 @@
 
 static gboolean
 process (GeglOperation       *operation,
-         GeglNodeContext     *context,
          GeglBuffer          *input,
          GeglBuffer          *source,
          const GeglRectangle *result)

Modified: trunk/operations/workshop/hstack.c
==============================================================================
--- trunk/operations/workshop/hstack.c	(original)
+++ trunk/operations/workshop/hstack.c	Thu Jan 10 01:56:00 2008
@@ -39,7 +39,6 @@
 
 static gboolean
 process (GeglOperation       *operation,
-         GeglNodeContext     *context,
          GeglBuffer          *input,
          GeglBuffer          *aux,
          GeglBuffer          *output,
@@ -89,7 +88,6 @@
   g_object_unref (temp_in);
   g_object_unref (temp_aux);
 
-  gegl_node_context_set_object (context, "output", G_OBJECT (output));
   return  TRUE;
 }
 

Modified: trunk/operations/workshop/kuwahara-max.c
==============================================================================
--- trunk/operations/workshop/kuwahara-max.c	(original)
+++ trunk/operations/workshop/kuwahara-max.c	Thu Jan 10 01:56:00 2008
@@ -28,6 +28,7 @@
 #define GEGL_CHANT_CATEGORIES      "misc"
 
 #define GEGL_CHANT_AREA_FILTER
+#define GEGL_CHANT_PREPARE
 
 #include "gegl-chant.h"
 #include <math.h>
@@ -38,9 +39,14 @@
           gint        radius);
 
 
+static void prepare (GeglOperation *operation)
+{
+  gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
+}
+
+
 static gboolean
 process (GeglOperation       *operation,
-         GeglNodeContext     *context,
          GeglBuffer          *input,
          GeglBuffer          *output,
          const GeglRectangle *result)
@@ -56,15 +62,8 @@
       GeglRectangle    compute  = gegl_operation_compute_input_request (operation, "input", result);
 
       temp_in = gegl_buffer_create_sub_buffer (input, &compute);
-      output = gegl_buffer_new (&compute, babl_format ("RGBA float"));
-
       kuwahara (temp_in, output, self->radius);
       g_object_unref (temp_in);
-
-      {
-        GeglBuffer *cropped = gegl_buffer_create_sub_buffer (output, result);
-        gegl_node_context_set_object (context, "output", G_OBJECT (cropped));
-      }
     }
   return  TRUE;
 }

Modified: trunk/operations/workshop/kuwahara-min.c
==============================================================================
--- trunk/operations/workshop/kuwahara-min.c	(original)
+++ trunk/operations/workshop/kuwahara-min.c	Thu Jan 10 01:56:00 2008
@@ -28,6 +28,7 @@
 #define GEGL_CHANT_CATEGORIES      "misc"
 
 #define GEGL_CHANT_AREA_FILTER
+#define GEGL_CHANT_PREPARE
 
 #include "gegl-chant.h"
 #include <math.h>
@@ -37,9 +38,15 @@
           GeglBuffer *dst,
           gint        radius);
 
+
+static void prepare (GeglOperation *operation)
+{
+  gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
+}
+
+
 static gboolean
 process (GeglOperation       *operation,
-         GeglNodeContext     *context,
          GeglBuffer          *input,
          GeglBuffer          *output,
          const GeglRectangle *result)
@@ -55,15 +62,8 @@
       GeglRectangle    compute  = gegl_operation_compute_input_request (operation, "input", result);
 
       temp_in = gegl_buffer_create_sub_buffer (input, &compute);
-      output = gegl_buffer_new (&compute, babl_format ("RGBA float"));
-
       kuwahara (temp_in, output, self->radius);
       g_object_unref (temp_in);
-
-      {
-        GeglBuffer *cropped = gegl_buffer_create_sub_buffer (output, result);
-        gegl_node_context_set_object (context, "output", G_OBJECT (cropped));
-      }
     }
 
   return  TRUE;

Modified: trunk/operations/workshop/kuwahara.c
==============================================================================
--- trunk/operations/workshop/kuwahara.c	(original)
+++ trunk/operations/workshop/kuwahara.c	Thu Jan 10 01:56:00 2008
@@ -28,6 +28,7 @@
 #define GEGL_CHANT_CATEGORIES      "misc"
 
 #define GEGL_CHANT_AREA_FILTER
+#define GEGL_CHANT_PREPARE
 
 #include "gegl-chant.h"
 #include <math.h>
@@ -38,9 +39,14 @@
           gint        radius);
 
 
+static void prepare (GeglOperation *operation)
+{
+  gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
+}
+
+
 static gboolean
 process (GeglOperation       *operation,
-         GeglNodeContext     *context,
          GeglBuffer          *input,
          GeglBuffer          *output,
          const GeglRectangle *result)
@@ -57,16 +63,8 @@
 
       temp_in = gegl_buffer_create_sub_buffer (input, &compute);
 
-      output = gegl_buffer_new (&compute, babl_format ("RGBA float"));
-
       kuwahara (temp_in, output, self->radius);
       g_object_unref (temp_in);
-
-      {
-        GeglBuffer *cropped = gegl_buffer_create_sub_buffer (output, result);
-
-        gegl_node_context_set_object (context, "output", G_OBJECT (cropped));
-      }
     }
 
   return  TRUE;

Modified: trunk/operations/workshop/line-profile.c
==============================================================================
--- trunk/operations/workshop/line-profile.c	(original)
+++ trunk/operations/workshop/line-profile.c	Thu Jan 10 01:56:00 2008
@@ -54,7 +54,6 @@
 
 static gboolean
 process (GeglOperation       *operation,
-         GeglNodeContext     *context,
          GeglBuffer          *input,
          GeglBuffer          *output,
          const GeglRectangle *result)
@@ -135,8 +134,6 @@
     gegl_buffer_set (output, NULL, babl_format ("B'aG'aR'aA u8"), buf, GEGL_AUTO_ROWSTRIDE);
   }
 
-  gegl_node_context_set_object (context, "output", G_OBJECT (output));
-
   return TRUE;
 }
 

Modified: trunk/operations/workshop/max-envelope.c
==============================================================================
--- trunk/operations/workshop/max-envelope.c	(original)
+++ trunk/operations/workshop/max-envelope.c	Thu Jan 10 01:56:00 2008
@@ -54,7 +54,6 @@
 
 static gboolean
 process (GeglOperation       *operation,
-         GeglNodeContext     *context,
          GeglBuffer          *input,
          GeglBuffer          *output,
          const GeglRectangle *result)
@@ -80,11 +79,6 @@
         max_envelope (temp_in, output, self->radius, self->samples, self->iterations, self->same_spray, self->rgamma);
         g_object_unref (temp_in);
       }
-
-    {
-      GeglBuffer *cropped = gegl_buffer_create_sub_buffer (output, result);
-      gegl_node_context_set_object (context, "output", G_OBJECT (cropped));
-    }
   }
 
   return  TRUE;

Modified: trunk/operations/workshop/mblur.c
==============================================================================
--- trunk/operations/workshop/mblur.c	(original)
+++ trunk/operations/workshop/mblur.c	Thu Jan 10 01:56:00 2008
@@ -61,7 +61,6 @@
 
 static gboolean
 process (GeglOperation       *operation,
-         GeglNodeContext     *context,
          GeglBuffer          *input,
          GeglBuffer          *output,
          const GeglRectangle *result)
@@ -101,7 +100,6 @@
         g_free (acc);
       }
       g_object_unref (temp_in);
-      gegl_node_context_set_object (context, "output", G_OBJECT (output));
     }
 
   return  TRUE;

Modified: trunk/operations/workshop/min-envelope.c
==============================================================================
--- trunk/operations/workshop/min-envelope.c	(original)
+++ trunk/operations/workshop/min-envelope.c	Thu Jan 10 01:56:00 2008
@@ -54,7 +54,6 @@
 
 static gboolean
 process (GeglOperation       *operation,
-         GeglNodeContext     *context,
          GeglBuffer          *input,
          GeglBuffer          *output,
          const GeglRectangle *result)
@@ -80,11 +79,6 @@
         min_envelope (temp_in, output, self->radius, self->samples, self->iterations, self->same_spray, self->rgamma);
         g_object_unref (temp_in);
       }
-
-    {
-      GeglBuffer *cropped = gegl_buffer_create_sub_buffer (output, result);
-      gegl_node_context_set_object (context, "output", G_OBJECT (cropped));
-    }
   }
 
   return  TRUE;

Modified: trunk/operations/workshop/snn-percentile.c
==============================================================================
--- trunk/operations/workshop/snn-percentile.c	(original)
+++ trunk/operations/workshop/snn-percentile.c	Thu Jan 10 01:56:00 2008
@@ -34,6 +34,7 @@
 #define GEGL_CHANT_CATEGORIES  "misc"
 
 #define GEGL_CHANT_AREA_FILTER
+#define GEGL_CHANT_PREPARE
 
 #include "gegl-chant.h"
 #include <math.h>
@@ -46,10 +47,14 @@
                 gint        pairs);
 
 
+static void prepare (GeglOperation *operation)
+{
+  gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
+}
+
 
 static gboolean
 process (GeglOperation       *operation,
-         GeglNodeContext     *context,
          GeglBuffer          *input,
          GeglBuffer          *output,
          const GeglRectangle *result)
@@ -73,15 +78,9 @@
       else
         {
           temp_in = gegl_buffer_create_sub_buffer (input, &compute);
-          output = gegl_buffer_new (&compute, babl_format ("RGBA float"));
           snn_percentile (temp_in, output, self->radius, self->percentile, self->pairs);
           g_object_unref (temp_in);
         }
-
-      {
-        GeglBuffer *cropped = gegl_buffer_create_sub_buffer (output, result);
-        gegl_node_context_set_object (context, "output", G_OBJECT (cropped));
-      }
     }
 
   return  TRUE;

Modified: trunk/operations/workshop/stress.c
==============================================================================
--- trunk/operations/workshop/stress.c	(original)
+++ trunk/operations/workshop/stress.c	Thu Jan 10 01:56:00 2008
@@ -55,7 +55,6 @@
 
 static gboolean
 process (GeglOperation       *operation,
-         GeglNodeContext     *context,
          GeglBuffer          *input,
          GeglBuffer          *output,
          const GeglRectangle *result)