Commit 530fd639 authored by Øyvind Kolås's avatar Øyvind Kolås

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:

svn path=/trunk/; revision=1917
parent 3a985e08
2008-01-27 Øyvind Kolås <pippin@gimp.org>
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:
2008-01-26 Kevin Cozens <kcozens@cvs.gnome.org>
* operations/Makefile-operations.am:
......
......@@ -37,7 +37,7 @@ static void ver_blur (GeglBuffer *src,
#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 @@ operation_class_init (GeglChantClass *klass)
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";
......
......@@ -78,7 +78,7 @@ fir_ver_blur (GeglBuffer *src,
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 @@ operation_class_init (GeglChantClass *klass)
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";
......
......@@ -40,7 +40,7 @@ bilateral_filter (GeglBuffer *src,
#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 @@ operation_class_init (GeglChantClass *klass)
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";
......
......@@ -38,7 +38,7 @@ snn_mean (GeglBuffer *src,
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 @@ operation_class_init (GeglChantClass *klass)
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";
......
......@@ -40,3 +40,13 @@ gtk-display$(SHREXT): gtk-display.c $(GEGLHEADERS)
@[ ! -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
......@@ -142,16 +142,12 @@ ver_max (GeglBuffer *src,
}
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 @@ operation_class_init (GeglChantClass *klass)
filter_class->process = process;
operation_class->prepare = prepare;
operation_class->tickle = tickle;
operation_class->name = "box-max";
operation_class->categories = "misc";
......
......@@ -142,18 +142,13 @@ ver_min (GeglBuffer *src,
}
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 @@ operation_class_init (GeglChantClass *klass)
filter_class->process = process;
operation_class->prepare = prepare;
operation_class->tickle = tickle;
operation_class->name = "box-min";
operation_class->categories = "misc";
......
......@@ -41,15 +41,12 @@ static void median (GeglBuffer *src,
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 @@ operation_class_init (GeglChantClass *klass)
filter_class->process = process;
operation_class->prepare = prepare;
operation_class->tickle = tickle;
operation_class->name = "box-percentile";
operation_class->categories = "misc";
......
......@@ -50,15 +50,12 @@ static void c2g (GeglBuffer *src,
gfloat gamma);
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 @@ operation_class_init (GeglChantClass *klass)
filter_class->process = process;
operation_class->prepare = prepare;
operation_class->tickle = tickle;
operation_class->name = "c2g";
operation_class->categories = "enhance";
......
......@@ -168,7 +168,7 @@ demosaic (GeglChantO *op,
/* 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 @@ operation_class_init (GeglChantClass *klass)
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";
......
......@@ -99,14 +99,10 @@ demosaic (GeglChantO *op,
}
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 @@ operation_class_init (GeglChantClass *klass)
filter_class->process = process;
operation_class->prepare = prepare;
operation_class->tickle = tickle;
operation_class->name = "demosaic-simple";
operation_class->categories = "blur";
......
......@@ -172,17 +172,12 @@ median (GeglBuffer *src,
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 @@ operation_class_init (GeglChantClass *klass)
filter_class->process = process;
operation_class->prepare = prepare;
operation_class->tickle = tickle;
operation_class->name = "disc-percentile";
operation_class->categories = "misc";
......
......@@ -191,16 +191,12 @@ kuwahara (GeglBuffer *src,
}
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 @@ operation_class_init (GeglChantClass *klass)
filter_class->process = process;
operation_class->prepare = prepare;
operation_class->tickle = tickle;
operation_class->name = "kuwahara-max";
operation_class->categories = "misc";
......
......@@ -191,16 +191,12 @@ kuwahara (GeglBuffer *src,
}
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 @@ operation_class_init (GeglChantClass *klass)
filter_class->process = process;
operation_class->prepare = prepare;
operation_class->tickle = tickle;
operation_class->name = "kuwahara-min";
operation_class->categories = "misc";
......
......@@ -191,16 +191,12 @@ kuwahara (GeglBuffer *src,
}
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 @@ operation_class_init (GeglChantClass *klass)
filter_class->process = process;
operation_class->prepare = prepare;
operation_class->tickle = tickle;
operation_class->name = "kuwahara";
operation_class->categories = "misc";
......
......@@ -84,15 +84,11 @@ static void max_envelope (GeglBuffer *src,
}
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 @@ operation_class_init (GeglChantClass *klass)
filter_class->process = process;
operation_class->prepare = prepare;
operation_class->tickle = tickle;
operation_class->name = "max-envelope";
operation_class->categories = "enhance";
......
......@@ -84,15 +84,11 @@ static void min_envelope (GeglBuffer *src,
}
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 @@ operation_class_init (GeglChantClass *klass)
filter_class->process = process;
operation_class->prepare = prepare;
operation_class->tickle = tickle;
operation_class->name = "min-envelope";
operation_class->categories = "enhance";
......
......@@ -212,15 +212,11 @@ snn_percentile (GeglBuffer *src,
}
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 @@ operation_class_init (GeglChantClass *klass)
filter_class->process = process;
operation_class->prepare = prepare;
operation_class->tickle = tickle;
operation_class->name = "snn-percentile";
operation_class->categories = "misc";
......
......@@ -110,7 +110,7 @@ static void stress (GeglBuffer *src,
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 @@ operation_class_init (GeglChantClass *klass)
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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment