gegl r1917 - in trunk: . operations/blur operations/enhance operations/workshop

[ok svn gnome org]

Author: ok
Date: Sun Jan 27 23:02:46 2008
New Revision: 1917
URL: http://svn.gnome.org/viewvc/gegl?rev=1917&view=rev

Log:
Got rid of tickling, prepare should suffice for now.
* operations/blur/box-blur.c:
* operations/blur/gaussian-blur.c:
* operations/enhance/bilateral-filter.c:
* operations/enhance/snn-mean.c:
* operations/workshop/Makefile.am:
* operations/workshop/box-max.c:
* operations/workshop/box-min.c:
* operations/workshop/box-percentile.c:
* operations/workshop/c2g.c:
* operations/workshop/demosaic-bimedian.c:
* operations/workshop/demosaic-simple.c:
* operations/workshop/disc-percentile.c:
* operations/workshop/kuwahara-max.c:
* operations/workshop/kuwahara-min.c:
* operations/workshop/kuwahara.c:
* operations/workshop/max-envelope.c:
* operations/workshop/min-envelope.c:
* operations/workshop/snn-percentile.c:
* operations/workshop/stress.c:


Modified:
   trunk/ChangeLog
   trunk/operations/blur/box-blur.c
   trunk/operations/blur/gaussian-blur.c
   trunk/operations/enhance/bilateral-filter.c
   trunk/operations/enhance/snn-mean.c
   trunk/operations/workshop/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-bimedian.c
   trunk/operations/workshop/demosaic-simple.c
   trunk/operations/workshop/disc-percentile.c
   trunk/operations/workshop/kuwahara-max.c
   trunk/operations/workshop/kuwahara-min.c
   trunk/operations/workshop/kuwahara.c
   trunk/operations/workshop/max-envelope.c
   trunk/operations/workshop/min-envelope.c
   trunk/operations/workshop/snn-percentile.c
   trunk/operations/workshop/stress.c

Modified: trunk/operations/blur/box-blur.c
==============================================================================
--- trunk/operations/blur/box-blur.c	(original)
+++ trunk/operations/blur/box-blur.c	Sun Jan 27 23:02:46 2008
@@ -37,7 +37,7 @@
 #include <stdio.h>
 #include <math.h>
 
-static void tickle (GeglOperation *operation)
+static void prepare (GeglOperation *operation)
 {
   GeglChantO              *o;
   GeglOperationAreaFilter *op_area;
@@ -251,7 +251,7 @@
   filter_class     = GEGL_OPERATION_FILTER_CLASS (klass);
 
   filter_class->process   = process;
-  operation_class->tickle = tickle;
+  operation_class->prepare = prepare;
 
   operation_class->categories = "blur";
   operation_class->name       = "box-blur";

Modified: trunk/operations/blur/gaussian-blur.c
==============================================================================
--- trunk/operations/blur/gaussian-blur.c	(original)
+++ trunk/operations/blur/gaussian-blur.c	Sun Jan 27 23:02:46 2008
@@ -78,7 +78,7 @@
               gint        offsetY);
 
 
-static void tickle (GeglOperation *operation)
+static void prepare (GeglOperation *operation)
 {
   GeglOperationAreaFilter *area = GEGL_OPERATION_AREA_FILTER (operation);
   GeglChantO              *o    = GEGL_CHANT_PROPERTIES (operation);
@@ -464,7 +464,7 @@
   filter_class     = GEGL_OPERATION_FILTER_CLASS (klass);
 
   filter_class->process   = process;
-  operation_class->tickle = tickle;
+  operation_class->prepare = prepare;
 
   operation_class->categories = "blur";
   operation_class->name       = "gaussian-blur";

Modified: trunk/operations/enhance/bilateral-filter.c
==============================================================================
--- trunk/operations/enhance/bilateral-filter.c	(original)
+++ trunk/operations/enhance/bilateral-filter.c	Sun Jan 27 23:02:46 2008
@@ -40,7 +40,7 @@
 
 #include <stdio.h>
 
-static void tickle (GeglOperation *operation)
+static void prepare (GeglOperation *operation)
 {
   GeglOperationAreaFilter *area = GEGL_OPERATION_AREA_FILTER (operation);
   GeglChantO              *o = GEGL_CHANT_PROPERTIES (operation);
@@ -162,7 +162,7 @@
   filter_class     = GEGL_OPERATION_FILTER_CLASS (klass);
 
   filter_class->process   = process;
-  operation_class->tickle = tickle;
+  operation_class->prepare = prepare;
 
   operation_class->name        = "bilateral-filter";
   operation_class->categories  = "misc";

Modified: trunk/operations/enhance/snn-mean.c
==============================================================================
--- trunk/operations/enhance/snn-mean.c	(original)
+++ trunk/operations/enhance/snn-mean.c	Sun Jan 27 23:02:46 2008
@@ -38,7 +38,7 @@
           gint        pairs);
 
 
-static void tickle (GeglOperation *operation)
+static void prepare (GeglOperation *operation)
 {
   GeglOperationAreaFilter *area = GEGL_OPERATION_AREA_FILTER (operation);
   GeglChantO              *o = GEGL_CHANT_PROPERTIES (operation);
@@ -190,7 +190,7 @@
   filter_class     = GEGL_OPERATION_FILTER_CLASS (klass);
 
   filter_class->process   = process;
-  operation_class->tickle = tickle;
+  operation_class->prepare = prepare;
 
   operation_class->name        = "snn-mean";
   operation_class->categories  = "misc";

Modified: trunk/operations/workshop/Makefile.am
==============================================================================
--- trunk/operations/workshop/Makefile.am	(original)
+++ trunk/operations/workshop/Makefile.am	Sun Jan 27 23:02:46 2008
@@ -40,3 +40,13 @@
 	@[ ! -z "$(GTK_LIBS)" ] &&\
 	(echo $@;$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) $(GTK_CFLAGS) $(GTK_LIBS))\
 	||true
+
+stroke$(SHREXT): stroke.c $(GEGLHEADERS)
+	if [ ! -z "$(PANGO_LIBS)" ]; then \
+	echo $@;\
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) \
+              $(CAIRO_CFLAGS) $(CAIRO_LIBS) \
+              $(PANGO_CFLAGS) $(PANGO_LIBS) \
+              $(PANGOCAIRO_CFLAGS) $(PANGOCAIRO_LIBS);\
+	fi
+

Modified: trunk/operations/workshop/box-max.c
==============================================================================
--- trunk/operations/workshop/box-max.c	(original)
+++ trunk/operations/workshop/box-max.c	Sun Jan 27 23:02:46 2008
@@ -143,15 +143,11 @@
 
 static void prepare (GeglOperation *operation)
 {
-  gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
-}
-
-static void tickle (GeglOperation *operation)
-{
   GeglOperationAreaFilter *area = GEGL_OPERATION_AREA_FILTER (operation);
 
   area->left = area->right = area->top = area->bottom =
       ceil (GEGL_CHANT_PROPERTIES (operation)->radius);
+  gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
 }
 
 static gboolean
@@ -186,7 +182,6 @@
 
   filter_class->process = process;
   operation_class->prepare = prepare;
-  operation_class->tickle  = tickle;
 
   operation_class->name        = "box-max";
   operation_class->categories  = "misc";

Modified: trunk/operations/workshop/box-min.c
==============================================================================
--- trunk/operations/workshop/box-min.c	(original)
+++ trunk/operations/workshop/box-min.c	Sun Jan 27 23:02:46 2008
@@ -143,17 +143,12 @@
 
 static void prepare (GeglOperation *operation)
 {
-  gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
-}
-
-static void tickle (GeglOperation *operation)
-{
   GeglOperationAreaFilter *area = GEGL_OPERATION_AREA_FILTER (operation);
-
   area->left  =
   area->right =
   area->top   =
   area->bottom = GEGL_CHANT_PROPERTIES (operation)->radius;
+  gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
 }
 
 static gboolean
@@ -188,7 +183,6 @@
 
   filter_class->process = process;
   operation_class->prepare = prepare;
-  operation_class->tickle  = tickle;
 
   operation_class->name        = "box-min";
   operation_class->categories  = "misc";

Modified: trunk/operations/workshop/box-percentile.c
==============================================================================
--- trunk/operations/workshop/box-percentile.c	(original)
+++ trunk/operations/workshop/box-percentile.c	Sun Jan 27 23:02:46 2008
@@ -42,14 +42,11 @@
 
 static void prepare (GeglOperation *operation)
 {
-  gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
-}
-
-static void tickle (GeglOperation *operation)
-{
   GeglOperationAreaFilter *area = GEGL_OPERATION_AREA_FILTER (operation);
   GeglChantO              *o = GEGL_CHANT_PROPERTIES (operation);
   area->left = area->right = area->top = area->bottom = ceil (o->radius);
+
+  gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
 }
 
 static gboolean
@@ -217,7 +214,6 @@
 
   filter_class->process = process;
   operation_class->prepare = prepare;
-  operation_class->tickle  = tickle;
 
   operation_class->name        = "box-percentile";
   operation_class->categories  = "misc";

Modified: trunk/operations/workshop/c2g.c
==============================================================================
--- trunk/operations/workshop/c2g.c	(original)
+++ trunk/operations/workshop/c2g.c	Sun Jan 27 23:02:46 2008
@@ -51,14 +51,11 @@
 
 static void prepare (GeglOperation *operation)
 {
-  gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
-}
-
-static void tickle (GeglOperation *operation)
-{
   GeglOperationAreaFilter *area = GEGL_OPERATION_AREA_FILTER (operation);
   GeglChantO              *o = GEGL_CHANT_PROPERTIES (operation);
   area->left = area->right = area->top = area->bottom = ceil (o->radius);
+
+  gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
 }
 
 static gboolean
@@ -174,7 +171,6 @@
 
   filter_class->process = process;
   operation_class->prepare = prepare;
-  operation_class->tickle = tickle;
 
   operation_class->name        = "c2g";
   operation_class->categories  = "enhance";

Modified: trunk/operations/workshop/demosaic-bimedian.c
==============================================================================
--- trunk/operations/workshop/demosaic-bimedian.c	(original)
+++ trunk/operations/workshop/demosaic-bimedian.c	Sun Jan 27 23:02:46 2008
@@ -168,7 +168,7 @@
 
 /* Specify required extra pixels around dst_extent: one pixel on every side.
  */
-static void tickle (GeglOperation *operation)
+static void prepare (GeglOperation *operation)
 {
   GeglOperationAreaFilter *area = GEGL_OPERATION_AREA_FILTER (operation);
   area->right = area->bottom = 1;
@@ -199,7 +199,7 @@
   filter_class    = GEGL_OPERATION_FILTER_CLASS (klass);
 
   filter_class->process = process;
-  operation_class->tickle = tickle;
+  operation_class->prepare = prepare;
 
   operation_class->name        = "demosaic-bimedian";
   operation_class->categories  = "blur";

Modified: trunk/operations/workshop/demosaic-simple.c
==============================================================================
--- trunk/operations/workshop/demosaic-simple.c	(original)
+++ trunk/operations/workshop/demosaic-simple.c	Sun Jan 27 23:02:46 2008
@@ -100,13 +100,9 @@
 
 static void prepare (GeglOperation *operation)
 {
-  gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
-}
-
-static void tickle (GeglOperation *operation)
-{
   GeglOperationAreaFilter *area = GEGL_OPERATION_AREA_FILTER (operation);
   area->right = area->bottom = 1;
+  gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
 }
 
 static gboolean
@@ -140,7 +136,6 @@
 
   filter_class->process = process;
   operation_class->prepare = prepare;
-  operation_class->tickle = tickle;
 
   operation_class->name        = "demosaic-simple";
   operation_class->categories  = "blur";

Modified: trunk/operations/workshop/disc-percentile.c
==============================================================================
--- trunk/operations/workshop/disc-percentile.c	(original)
+++ trunk/operations/workshop/disc-percentile.c	Sun Jan 27 23:02:46 2008
@@ -172,17 +172,12 @@
   g_free (dst_buf);
 }
 
-
 static void prepare (GeglOperation *operation)
 {
-  gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
-}
-
-static void tickle (GeglOperation *operation)
-{
   GeglOperationAreaFilter *area = GEGL_OPERATION_AREA_FILTER (operation);
   GeglChantO              *o = GEGL_CHANT_PROPERTIES (operation);
   area->left = area->right = area->top = area->bottom = ceil (o->radius);
+  gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
 }
 
 static gboolean
@@ -223,7 +218,6 @@
 
   filter_class->process = process;
   operation_class->prepare = prepare;
-  operation_class->tickle  = tickle;
 
   operation_class->name        = "disc-percentile";
   operation_class->categories  = "misc";

Modified: trunk/operations/workshop/kuwahara-max.c
==============================================================================
--- trunk/operations/workshop/kuwahara-max.c	(original)
+++ trunk/operations/workshop/kuwahara-max.c	Sun Jan 27 23:02:46 2008
@@ -192,15 +192,11 @@
 
 static void prepare (GeglOperation *operation)
 {
-  gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
-}
-
-static void tickle (GeglOperation *operation)
-{
   GeglOperationAreaFilter *area = GEGL_OPERATION_AREA_FILTER (operation);
 
   area->left = area->right = area->top = area->bottom =
       ceil (GEGL_CHANT_PROPERTIES (operation)->radius);
+  gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
 }
 
 static gboolean
@@ -233,7 +229,6 @@
 
   filter_class->process = process;
   operation_class->prepare = prepare;
-  operation_class->tickle  = tickle;
 
   operation_class->name        = "kuwahara-max";
   operation_class->categories  = "misc";

Modified: trunk/operations/workshop/kuwahara-min.c
==============================================================================
--- trunk/operations/workshop/kuwahara-min.c	(original)
+++ trunk/operations/workshop/kuwahara-min.c	Sun Jan 27 23:02:46 2008
@@ -192,15 +192,11 @@
 
 static void prepare (GeglOperation *operation)
 {
-  gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
-}
-
-static void tickle (GeglOperation *operation)
-{
   GeglOperationAreaFilter *area = GEGL_OPERATION_AREA_FILTER (operation);
 
   area->left = area->right = area->top = area->bottom =
       ceil (GEGL_CHANT_PROPERTIES (operation)->radius);
+  gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
 }
 
 static gboolean
@@ -233,7 +229,6 @@
 
   filter_class->process = process;
   operation_class->prepare = prepare;
-  operation_class->tickle  = tickle;
 
   operation_class->name        = "kuwahara-min";
   operation_class->categories  = "misc";

Modified: trunk/operations/workshop/kuwahara.c
==============================================================================
--- trunk/operations/workshop/kuwahara.c	(original)
+++ trunk/operations/workshop/kuwahara.c	Sun Jan 27 23:02:46 2008
@@ -192,15 +192,11 @@
 
 static void prepare (GeglOperation *operation)
 {
-  gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
-}
-
-static void tickle (GeglOperation *operation)
-{
   GeglOperationAreaFilter *area = GEGL_OPERATION_AREA_FILTER (operation);
 
   area->left = area->right = area->top = area->bottom =
       ceil (GEGL_CHANT_PROPERTIES (operation)->radius);
+  gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
 }
 
 static gboolean
@@ -233,7 +229,6 @@
 
   filter_class->process = process;
   operation_class->prepare = prepare;
-  operation_class->tickle  = tickle;
 
   operation_class->name        = "kuwahara";
   operation_class->categories  = "misc";

Modified: trunk/operations/workshop/max-envelope.c
==============================================================================
--- trunk/operations/workshop/max-envelope.c	(original)
+++ trunk/operations/workshop/max-envelope.c	Sun Jan 27 23:02:46 2008
@@ -85,14 +85,10 @@
 
 static void prepare (GeglOperation *operation)
 {
-  gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
-}
-
-static void tickle (GeglOperation *operation)
-{
   GeglOperationAreaFilter *area = GEGL_OPERATION_AREA_FILTER (operation);
   area->left = area->right = area->top = area->bottom =
       ceil (GEGL_CHANT_PROPERTIES (operation)->radius);
+  gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
 }
 
 static gboolean
@@ -132,7 +128,6 @@
 
   filter_class->process = process;
   operation_class->prepare = prepare;
-  operation_class->tickle  = tickle;
 
   operation_class->name        = "max-envelope";
   operation_class->categories  = "enhance";

Modified: trunk/operations/workshop/min-envelope.c
==============================================================================
--- trunk/operations/workshop/min-envelope.c	(original)
+++ trunk/operations/workshop/min-envelope.c	Sun Jan 27 23:02:46 2008
@@ -85,14 +85,10 @@
 
 static void prepare (GeglOperation *operation)
 {
-  gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
-}
-
-static void tickle (GeglOperation *operation)
-{
   GeglOperationAreaFilter *area = GEGL_OPERATION_AREA_FILTER (operation);
   area->left = area->right = area->top = area->bottom =
       ceil (GEGL_CHANT_PROPERTIES (operation)->radius);
+  gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
 }
 
 static gboolean
@@ -132,7 +128,6 @@
 
   filter_class->process = process;
   operation_class->prepare = prepare;
-  operation_class->tickle  = tickle;
 
   operation_class->name        = "min-envelope";
   operation_class->categories  = "enhance";

Modified: trunk/operations/workshop/snn-percentile.c
==============================================================================
--- trunk/operations/workshop/snn-percentile.c	(original)
+++ trunk/operations/workshop/snn-percentile.c	Sun Jan 27 23:02:46 2008
@@ -213,14 +213,10 @@
 
 static void prepare (GeglOperation *operation)
 {
-  gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
-}
-
-static void tickle (GeglOperation *operation)
-{
   GeglOperationAreaFilter *area = GEGL_OPERATION_AREA_FILTER (operation);
   area->left = area->right = area->top = area->bottom =
       GEGL_CHANT_PROPERTIES (operation)->radius;
+  gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
 }
 
 static gboolean
@@ -261,7 +257,6 @@
 
   filter_class->process = process;
   operation_class->prepare = prepare;
-  operation_class->tickle  = tickle;
 
   operation_class->name        = "snn-percentile";
   operation_class->categories  = "misc";

Modified: trunk/operations/workshop/stress.c
==============================================================================
--- trunk/operations/workshop/stress.c	(original)
+++ trunk/operations/workshop/stress.c	Sun Jan 27 23:02:46 2008
@@ -110,7 +110,7 @@
   g_free (dst_buf);
 }
 
-static void tickle (GeglOperation *operation)
+static void prepare (GeglOperation *operation)
 {
   GeglOperationAreaFilter *area = GEGL_OPERATION_AREA_FILTER (operation);
   area->left = area->right = area->top = area->bottom =
@@ -159,7 +159,7 @@
   filter_class    = GEGL_OPERATION_FILTER_CLASS (klass);
 
   filter_class->process = process;
-  operation_class->tickle  = tickle;
+  operation_class->prepare  = prepare;
   /* we override defined region to avoid growing the size of what is defined
    * by the filter. This also allows the tricks used to treat alpha==0 pixels
    * in the image as source data not to be skipped by the stochastic sampling