Commit d963c17a authored by Øyvind Kolås's avatar Øyvind Kolås

s/ChantInstance/GeglChantOperation

parent 13ac0c2d
2006-09-04 Øyvind Kolås <pippin@gimp.org>
s/ChantInstance/GeglChantOperation/
s/CHANT_OPERATION/GEGL_CHANT_INSTANCE/
* gegl/gegl-chant.h:
* operations/blur/box-blur.c: (process), (get_defined_region),
(calc_source_regions):
* operations/blur/gaussian-blur.c: (process), (get_defined_region),
(calc_source_regions):
* operations/color/brightness-contrast.c: (process):
* operations/color/invert.c: (init):
* operations/color/threshold.c: (init), (process):
* operations/core/crop.c: (process), (get_defined_region):
* operations/core/shift.c: (process), (get_defined_region),
(calc_source_regions):
* operations/display/display.c: (process):
* operations/file-io/jpg-load.c: (process), (get_defined_region):
* operations/file-io/load.c: (prepare), (associate):
* operations/file-io/magick-load.c: (load_cache), (process),
(get_defined_region), (dispose):
* operations/file-io/png-load.c: (process), (get_defined_region):
* operations/file-io/png-save.c: (process):
* operations/file-io/raw-load.c: (process), (get_defined_region),
(dispose), (load_cache):
* operations/generated/math.rb:
* operations/generated/porter-duff.rb:
* operations/generated/svg-blend.rb:
* operations/meta/dropshadow.c: (prepare), (associate):
* operations/meta/layer.c: (prepare), (associate):
* operations/meta/unsharp-mask.c: (associate), (prepare):
* operations/render/checkerboard.c: (process):
* operations/render/noise.c: (process):
* operations/render/text.c: (process), (get_defined_region),
(dispose):
* operations/transform/chant.h:
* operations/transform/rotate.c: (create_matrix):
* operations/transform/scale.c: (create_matrix):
* operations/transform/shear.c: (create_matrix):
* operations/transform/translate.c: (create_matrix):
* operations/transparency/opacity.c: (init), (process):
2006-09-04 Øyvind Kolås <pippin@gimp.org>
s/GEGL_CHANT_CONSTRUCT/GEGL_CHANT_INIT/
......
......@@ -62,7 +62,7 @@
#define GEGL_CHANT_PARENT_CLASS GEGL_OPERATION_CLASS
#endif
typedef struct Generated ChantInstance;
typedef struct Generated GeglChantOperation;
typedef struct GeneratedClass ChantClass;
struct Generated
......@@ -99,14 +99,14 @@ struct GeneratedClass
GEGL_CHANT_PARENT_TypeNameClass parent_class;
};
#define GEGL_CHANT_INSTANCE(obj) ((ChantInstance*)(obj))
#define GEGL_CHANT_OPERATION(obj) ((GeglChantOperation*)(obj))
#include <gegl-module.h>
#ifndef GEGL_CHANT_STATIC
# define M_DEFINE_TYPE_EXTENDED(type_name, TYPE_PARENT, flags, CODE) \
\
static void gegl_chant_init (ChantInstance *self); \
static void gegl_chant_init (GeglChantOperation *self); \
static void gegl_chant_class_init (ChantClass *klass); \
static gpointer gegl_chant_parent_class = NULL; \
\
......@@ -131,7 +131,7 @@ type_name##_get_type (GTypeModule *module) \
(GClassInitFunc) gegl_chant_class_intern_init, \
(GClassFinalizeFunc) NULL, \
NULL, /* class_data */ \
sizeof (ChantInstance), \
sizeof (GeglChantOperation), \
0, /* n_preallocs */ \
(GInstanceInitFunc) gegl_chant_init, \
NULL /* value_table */ \
......@@ -168,7 +168,7 @@ gegl_module_register (GTypeModule *module)\
#else
# define M_DEFINE_TYPE_EXTENDED(type_name, TYPE_PARENT, flags, CODE) \
\
static void gegl_chant_init (ChantInstance *self); \
static void gegl_chant_init (GeglChantOperation *self); \
static void gegl_chant_class_init (ChantClass *klass); \
static gpointer gegl_chant_parent_class = NULL; \
static void gegl_chant_class_intern_init (gpointer klass) \
......@@ -191,7 +191,7 @@ type_name##_get_type (GTypeModule *module) \
(GClassInitFunc) gegl_chant_class_intern_init, \
(GClassFinalizeFunc) NULL, \
NULL, /* class_data */ \
sizeof (ChantInstance), \
sizeof (GeglChantOperation), \
0, /* n_preallocs */ \
(GInstanceInitFunc) gegl_chant_init, \
NULL /* value_table */ \
......@@ -238,7 +238,7 @@ get_property (GObject *gobject,
GValue *value,
GParamSpec *pspec)
{
ChantInstance *self = GEGL_CHANT_INSTANCE (gobject);
GeglChantOperation *self = GEGL_CHANT_OPERATION (gobject);
switch (property_id)
{
......@@ -279,7 +279,7 @@ set_property (GObject *gobject,
const GValue *value,
GParamSpec *pspec)
{
ChantInstance *self = GEGL_CHANT_INSTANCE (gobject);
GeglChantOperation *self = GEGL_CHANT_OPERATION (gobject);
switch (property_id)
{
......@@ -354,13 +354,13 @@ static gboolean process (GeglOperation *operation,
#endif
static void
gegl_chant_init (ChantInstance *self)
gegl_chant_init (GeglChantOperation *self)
{
self->priv = NULL;
}
#ifdef GEGL_CHANT_INIT
static void init (ChantInstance *self);
static void init (GeglChantOperation *self);
static GObject *
gegl_chant_constructor (GType type,
......@@ -372,7 +372,7 @@ gegl_chant_constructor (GType type,
obj = G_OBJECT_CLASS (gegl_chant_parent_class)->constructor (
type, n_construct_properties, construct_properties);
init (GEGL_CHANT_INSTANCE (obj));
init (GEGL_CHANT_OPERATION (obj));
return obj;
}
......
......@@ -50,10 +50,10 @@ process (GeglOperation *operation,
const gchar *output_prop)
{
GeglOperationFilter *filter;
ChantInstance *self;
GeglChantOperation *self;
filter = GEGL_OPERATION_FILTER (operation);
self = GEGL_CHANT_INSTANCE (operation);
self = GEGL_CHANT_OPERATION (operation);
GeglBuffer *input = filter->input;
GeglBuffer *output;
......@@ -226,7 +226,7 @@ get_defined_region (GeglOperation *operation)
{
GeglRect result = {0,0,0,0};
GeglRect *in_rect = gegl_operation_source_get_defined_region (operation, "input");
ChantInstance *blur = GEGL_CHANT_INSTANCE (operation);
GeglChantOperation *blur = GEGL_CHANT_OPERATION (operation);
gint radius = ceil(blur->radius);
if (!in_rect)
return result;
......@@ -243,7 +243,7 @@ get_defined_region (GeglOperation *operation)
static gboolean
calc_source_regions (GeglOperation *self)
{
ChantInstance *blur = GEGL_CHANT_INSTANCE (self);
GeglChantOperation *blur = GEGL_CHANT_OPERATION (self);
GeglRect need = *gegl_operation_get_requested_region (self);
gint radius = ceil(blur->radius);
......
......@@ -65,10 +65,10 @@ process (GeglOperation *operation,
const gchar *output_prop)
{
GeglOperationFilter *filter;
ChantInstance *self;
GeglChantOperation *self;
filter = GEGL_OPERATION_FILTER (operation);
self = GEGL_CHANT_INSTANCE (operation);
self = GEGL_CHANT_OPERATION (operation);
GeglBuffer *input = filter->input;
GeglBuffer *output;
......@@ -292,7 +292,7 @@ get_defined_region (GeglOperation *operation)
GeglRect result = {0,0,0,0};
GeglRect *in_rect = gegl_operation_source_get_defined_region (operation,
"input");
ChantInstance *blur = GEGL_CHANT_INSTANCE (operation);
GeglChantOperation *blur = GEGL_CHANT_OPERATION (operation);
gint radius_x = ceil(blur->radius_x+0.5);
gint radius_y = ceil(blur->radius_y+0.5);
if (!in_rect)
......@@ -311,7 +311,7 @@ static gboolean
calc_source_regions (GeglOperation *self)
{
GeglRect need = *gegl_operation_get_requested_region (self);
ChantInstance *blur = GEGL_CHANT_INSTANCE(self);
GeglChantOperation *blur = GEGL_CHANT_OPERATION(self);
gint radius_x = ceil(blur->radius_x+0.5);
gint radius_y = ceil(blur->radius_y+0.5);
......
......@@ -37,7 +37,7 @@ process (GeglOperation *op,
void *out_buf,
glong n_pixels)
{
ChantInstance *self = GEGL_CHANT_INSTANCE (op);
GeglChantOperation *self = GEGL_CHANT_OPERATION (op);
gint o;
gfloat *p = in_buf; /* it is inplace anyways, and out_but==in_buf) */
......
......@@ -29,7 +29,7 @@
#define GEGL_CHANT_INIT
#include "gegl-chant.h"
static void init (ChantInstance *self)
static void init (GeglChantOperation *self)
{
/* set the babl format this operation prefers to work on */
GEGL_OPERATION_POINT_FILTER (self)->format = babl_format ("RGBA float");
......
......@@ -31,7 +31,7 @@ gegl_chant_double (value, -100.0, 100.0, 0.5, "global threshold level (used when
#define GEGL_CHANT_INIT
#include "gegl-chant.h"
static void init (ChantInstance *self)
static void init (GeglChantOperation *self)
{
GEGL_OPERATION_POINT_COMPOSER (self)->format = babl_format ("YA float");
GEGL_OPERATION_POINT_COMPOSER (self)->aux_format = babl_format ("Y float");
......@@ -52,7 +52,7 @@ process (GeglOperation *op,
if (aux == NULL)
{
gfloat value = GEGL_CHANT_INSTANCE (op)->value;
gfloat value = GEGL_CHANT_OPERATION (op)->value;
for (i=0; i<n_pixels; i++)
{
out[0] = in[0]>=value?1.0:0.0;
......
......@@ -49,7 +49,7 @@ process (GeglOperation *operation,
{
GeglOperationFilter *filter = GEGL_OPERATION_FILTER(operation);
GeglBuffer *input = filter->input;
ChantInstance *crop = GEGL_CHANT_INSTANCE (operation);
GeglChantOperation *crop = GEGL_CHANT_OPERATION (operation);
if(strcmp("output", output_prop))
return FALSE;
......@@ -75,7 +75,7 @@ static GeglRect
get_defined_region (GeglOperation *operation)
{
GeglRect result = {0,0,0,0};
ChantInstance *op_crop = (ChantInstance*)(operation);
GeglChantOperation *op_crop = (GeglChantOperation*)(operation);
GeglRect *in_rect = gegl_operation_source_get_defined_region (operation, "input");
if (!in_rect)
return result;
......
......@@ -45,7 +45,7 @@ process (GeglOperation *operation,
{
GeglOperationFilter *filter = GEGL_OPERATION_FILTER(operation);
GeglBuffer *input = filter->input;
ChantInstance *translate = (ChantInstance*)filter;
GeglChantOperation *translate = (GeglChantOperation*)filter;
if(strcmp("output", output_prop))
return FALSE;
......@@ -71,7 +71,7 @@ static GeglRect
get_defined_region (GeglOperation *operation)
{
GeglRect result = {0,0,0,0};
ChantInstance *op_shift = (ChantInstance*)(operation);
GeglChantOperation *op_shift = (GeglChantOperation*)(operation);
GeglRect *in_rect = gegl_operation_source_get_defined_region (operation, "input");
if (!in_rect)
return result;
......@@ -86,7 +86,7 @@ get_defined_region (GeglOperation *operation)
static gboolean
calc_source_regions (GeglOperation *self)
{
ChantInstance *op_shift = (ChantInstance*)(self);
GeglChantOperation *op_shift = (GeglChantOperation*)(self);
GeglRect rect = *gegl_operation_get_requested_region (self);
rect.x -= op_shift->x;
......
......@@ -82,7 +82,7 @@ process (GeglOperation *operation,
const gchar *output_prop)
{
GeglOperationFilter *op_filter = GEGL_OPERATION_FILTER (operation);
ChantInstance *self = GEGL_CHANT_INSTANCE (operation);
GeglChantOperation *self = GEGL_CHANT_OPERATION (operation);
GeglBuffer *source;
GeglRect *need = gegl_operation_get_requested_region (operation);
SDL_Surface **sdl_outwin = NULL; //op_sym (op, "sdl_outwin");
......
......@@ -49,7 +49,7 @@ process (GeglOperation *operation,
const gchar *output_prop)
{
GeglOperationSource *op_source = GEGL_OPERATION_SOURCE (operation);
ChantInstance *self = GEGL_CHANT_INSTANCE (operation);
GeglChantOperation *self = GEGL_CHANT_OPERATION (operation);
gint width;
gint height;
gint result;
......@@ -105,7 +105,7 @@ static GeglRect
get_defined_region (GeglOperation *operation)
{
GeglRect result = {0,0,0,0};
ChantInstance *self = GEGL_CHANT_INSTANCE (operation);
GeglChantOperation *self = GEGL_CHANT_OPERATION (operation);
gint width, height;
gint status;
status = query_jpg (self->path, &width, &height);
......
......@@ -43,7 +43,7 @@ struct _Priv
static void
prepare (GeglOperation *operation)
{
ChantInstance *self = GEGL_CHANT_INSTANCE (operation);
GeglChantOperation *self = GEGL_CHANT_OPERATION (operation);
Priv *priv;
priv = (Priv*)self->priv;
......@@ -79,7 +79,7 @@ prepare (GeglOperation *operation)
static void associate (GeglOperation *operation)
{
ChantInstance *self = GEGL_CHANT_INSTANCE (operation);
GeglChantOperation *self = GEGL_CHANT_OPERATION (operation);
Priv *priv = (Priv*)self->priv;
GeglGraph *graph;
g_assert (priv == NULL);
......
......@@ -34,7 +34,7 @@ gegl_chant_pointer (cached, "private")
#include <stdio.h>
static void
load_cache (ChantInstance *op_magick_load)
load_cache (GeglChantOperation *op_magick_load)
{
if (!op_magick_load->cached)
{
......@@ -66,7 +66,7 @@ process (GeglOperation *operation,
const gchar *output_prop)
{
GeglOperationSource *op_source = GEGL_OPERATION_SOURCE(operation);
ChantInstance *self = GEGL_CHANT_INSTANCE (operation);
GeglChantOperation *self = GEGL_CHANT_OPERATION (operation);
if(strcmp("output", output_prop))
return FALSE;
......@@ -97,7 +97,7 @@ static GeglRect
get_defined_region (GeglOperation *operation)
{
GeglRect result = {0,0,0,0};
ChantInstance *self = GEGL_CHANT_INSTANCE (operation);
GeglChantOperation *self = GEGL_CHANT_OPERATION (operation);
gint width, height;
load_cache (self);
......@@ -113,7 +113,7 @@ get_defined_region (GeglOperation *operation)
static void dispose (GObject *gobject)
{
ChantInstance *self = GEGL_CHANT_INSTANCE (gobject);
GeglChantOperation *self = GEGL_CHANT_OPERATION (gobject);
if (self->cached)
{
g_object_unref (self->cached);
......
......@@ -49,7 +49,7 @@ static gboolean
process (GeglOperation *operation,
const gchar *output_prop)
{
ChantInstance *self = GEGL_CHANT_INSTANCE (operation);
GeglChantOperation *self = GEGL_CHANT_OPERATION (operation);
GeglOperationSource *op_source = GEGL_OPERATION_SOURCE(operation);
gint result;
......@@ -119,7 +119,7 @@ static GeglRect
get_defined_region (GeglOperation *operation)
{
GeglRect result = {0,0,0,0};
ChantInstance *self = GEGL_CHANT_INSTANCE (operation);
GeglChantOperation *self = GEGL_CHANT_OPERATION (operation);
GeglOperationSource *source = GEGL_OPERATION_SOURCE (operation);
gint width, height;
gint status;
......
......@@ -44,7 +44,7 @@ static gboolean
process (GeglOperation *operation,
const gchar *output_prop)
{
ChantInstance *self = GEGL_CHANT_INSTANCE (operation);
GeglChantOperation *self = GEGL_CHANT_OPERATION (operation);
GeglOperationFilter *op_filter = GEGL_OPERATION_FILTER (operation);
GeglBuffer *input = op_filter->input;
GeglRect *result = gegl_operation_result_rect (operation);
......
......@@ -39,14 +39,14 @@ gegl_chant_pointer (cached, "private")
#define MAX_SAMPLE 65535
#define ERROR -1
static void load_cache (ChantInstance *op_raw_load);
static void load_cache (GeglChantOperation *op_raw_load);
static gboolean
process (GeglOperation *operation,
const gchar *output_prop)
{
GeglOperationSource *op_source = GEGL_OPERATION_SOURCE(operation);
ChantInstance *self = GEGL_CHANT_INSTANCE (operation);
GeglChantOperation *self = GEGL_CHANT_OPERATION (operation);
if(strcmp("output", output_prop))
return FALSE;
......@@ -77,7 +77,7 @@ static GeglRect
get_defined_region (GeglOperation *operation)
{
GeglRect result = {0,0,0,0};
ChantInstance *self = GEGL_CHANT_INSTANCE (operation);
GeglChantOperation *self = GEGL_CHANT_OPERATION (operation);
load_cache (self);
......@@ -88,7 +88,7 @@ get_defined_region (GeglOperation *operation)
static void dispose (GObject *gobject)
{
ChantInstance *self = GEGL_CHANT_INSTANCE (gobject);
GeglChantOperation *self = GEGL_CHANT_OPERATION (gobject);
if (self->cached)
{
g_object_unref (self->cached);
......@@ -114,7 +114,7 @@ static void class_init (GeglOperationClass *klass)
}
static void
load_cache (ChantInstance *op_raw_load)
load_cache (GeglChantOperation *op_raw_load)
{
if (!op_raw_load->cached)
{
......
......@@ -49,7 +49,7 @@ gegl_chant_double (value, -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, \"global value used if
#include <math.h>
static void init (ChantInstance *self)
static void init (GeglChantOperation *self)
{
GEGL_OPERATION_POINT_COMPOSER (self)->format = babl_format (\"RaGaBaA float\");
GEGL_OPERATION_POINT_COMPOSER (self)->aux_format = babl_format (\"RGB float\");
......@@ -69,7 +69,7 @@ process (GeglOperation *op,
if (aux == NULL)
{
gfloat value = GEGL_CHANT_INSTANCE (op)->value;
gfloat value = GEGL_CHANT_OPERATION (op)->value;
for (i=0; i<n_pixels; i++)
{
int j;
......
......@@ -52,7 +52,7 @@ a.each do
#define GEGL_CHANT_INIT
#include \"gegl-chant.h\"
static void init (ChantInstance *self)
static void init (GeglChantOperation *self)
{
GEGL_OPERATION_POINT_COMPOSER (self)->format = babl_format (\"RaGaBaA float\");
GEGL_OPERATION_POINT_COMPOSER (self)->aux_format = babl_format (\"RaGaBaA float\");
......
......@@ -45,7 +45,7 @@ a.each do
#define GEGL_CHANT_INIT
#include \"gegl-chant.h\"
static void init (ChantInstance *self)
static void init (GeglChantOperation *self)
{
GEGL_OPERATION_POINT_COMPOSER (self)->format = babl_format (\"RaGaBaA float\");
GEGL_OPERATION_POINT_COMPOSER (self)->aux_format = babl_format (\"RaGaBaA float\");
......
......@@ -50,7 +50,7 @@ struct _Priv
static void
prepare (GeglOperation *operation)
{
ChantInstance *self = GEGL_CHANT_INSTANCE (operation);
GeglChantOperation *self = GEGL_CHANT_OPERATION (operation);
Priv *priv;
priv = (Priv*)self->priv;
......@@ -68,7 +68,7 @@ prepare (GeglOperation *operation)
static void associate (GeglOperation *operation)
{
ChantInstance *self = GEGL_CHANT_INSTANCE (operation);
GeglChantOperation *self = GEGL_CHANT_OPERATION (operation);
Priv *priv = (Priv*)self->priv;
GeglGraph *graph;
g_assert (priv == NULL);
......
......@@ -52,7 +52,7 @@ struct _Priv
static void
prepare (GeglOperation *operation)
{
ChantInstance *self = GEGL_CHANT_INSTANCE (operation);
GeglChantOperation *self = GEGL_CHANT_OPERATION (operation);
Priv *priv;
priv = (Priv*)self->priv;
......@@ -85,7 +85,7 @@ prepare (GeglOperation *operation)
static void associate (GeglOperation *operation)
{
ChantInstance *self = GEGL_CHANT_INSTANCE (operation);
GeglChantOperation *self = GEGL_CHANT_OPERATION (operation);
Priv *priv = (Priv*)self->priv;
GeglGraph *graph;
g_assert (priv == NULL);
......
......@@ -47,11 +47,11 @@ struct _Priv
static void prepare (GeglOperation *operation);
static void associate (GeglOperation *operation)
{
ChantInstance *self;
GeglChantOperation *self;
Priv *priv;
GeglGraph *graph;
self = GEGL_CHANT_INSTANCE (operation);
self = GEGL_CHANT_OPERATION (operation);
priv = g_malloc0 (sizeof (Priv));
self->priv = (void*) priv;
......@@ -95,7 +95,7 @@ static void associate (GeglOperation *operation)
static void prepare (GeglOperation *operation)
{
ChantInstance *self = GEGL_CHANT_INSTANCE (operation);
GeglChantOperation *self = GEGL_CHANT_OPERATION (operation);
Priv *priv = (Priv*)self->priv;
gegl_node_set (priv->multiply, "value", self->scale,
......
......@@ -40,7 +40,7 @@ process (GeglOperation *operation,
{
GeglRect *need;
GeglOperationSource *op_source = GEGL_OPERATION_SOURCE(operation);
ChantInstance *self = GEGL_CHANT_INSTANCE (operation);
GeglChantOperation *self = GEGL_CHANT_OPERATION (operation);
if(strcmp("output", output_prop))
return FALSE;
......
......@@ -44,7 +44,7 @@ process (GeglOperation *operation,
{
GeglRect *need;
GeglOperationSource *op_source = GEGL_OPERATION_SOURCE(operation);
ChantInstance *self = GEGL_CHANT_INSTANCE (operation);
GeglChantOperation *self = GEGL_CHANT_OPERATION (operation);
if(strcmp("output", output_prop))
return FALSE;
......
......@@ -77,7 +77,7 @@ process (GeglOperation *operation,
const gchar *output_prop)
{
GeglOperationSource *op_source = GEGL_OPERATION_SOURCE(operation);
ChantInstance *self = GEGL_CHANT_INSTANCE (operation);
GeglChantOperation *self = GEGL_CHANT_OPERATION (operation);
gint width;
gint height;
......@@ -148,7 +148,7 @@ static GeglRect
get_defined_region (GeglOperation *operation)
{
GeglRect result = {0,0,0,0};
ChantInstance *self = GEGL_CHANT_INSTANCE (operation);
GeglChantOperation *self = GEGL_CHANT_OPERATION (operation);
gint status = FALSE;
{ /* get extents */
......@@ -183,7 +183,7 @@ get_defined_region (GeglOperation *operation)
static void dispose (GObject *gobject)
{
ChantInstance *self = GEGL_CHANT_INSTANCE (gobject);
GeglChantOperation *self = GEGL_CHANT_OPERATION (gobject);
if (self->cached)
{
g_object_unref (self->cached);
......
......@@ -18,7 +18,7 @@
#define GEGL_CHANT_PARENT_TYPE TYPE_OP_AFFINE
#define GEGL_CHANT_PARENT_CLASS OP_AFFINE_CLASS
typedef struct Generated ChantInstance;
typedef struct Generated GeglChantOperation;
typedef struct GeneratedClass ChantClass;
struct Generated
......@@ -53,13 +53,13 @@ struct GeneratedClass
GEGL_CHANT_PARENT_TypeNameClass parent_class;
};
#define GEGL_CHANT_INSTANCE(obj) ((ChantInstance*)(obj))
#define GEGL_CHANT_OPERATION(obj) ((GeglChantOperation*)(obj))
#include <gegl-module.h>
#define M_DEFINE_TYPE_EXTENDED(type_name, TYPE_PARENT, flags, CODE) \
\
static void gegl_chant_init (ChantInstance *self); \
static void gegl_chant_init (GeglChantOperation *self); \
static void gegl_chant_class_init (ChantClass *klass); \
static gpointer gegl_chant_parent_class = NULL; \
\
......@@ -84,7 +84,7 @@ type_name##_get_type (void) \
(GClassInitFunc) gegl_chant_class_intern_init, \
(GClassFinalizeFunc) NULL, \
NULL, /* class_data */ \
sizeof (ChantInstance), \
sizeof (GeglChantOperation), \
0, /* n_preallocs */ \
(GInstanceInitFunc) gegl_chant_init, \
NULL /* value_table */ \
......@@ -131,7 +131,7 @@ get_property (GObject *gobject,
GValue *value,
GParamSpec *pspec)
{
ChantInstance *self = GEGL_CHANT_INSTANCE (gobject);
GeglChantOperation *self = GEGL_CHANT_OPERATION (gobject);
switch (property_id)
{
......@@ -172,7 +172,7 @@ set_property (GObject *gobject,
const GValue *value,
GParamSpec *pspec)
{
ChantInstance *self = GEGL_CHANT_INSTANCE (gobject);
GeglChantOperation *self = GEGL_CHANT_OPERATION (gobject);
switch (property_id)
{
......@@ -226,12 +226,12 @@ set_property (GObject *gobject,
self = NULL; /* silence GCC if no properties were defined */
}
static void gegl_chant_init (ChantInstance *self)
static void gegl_chant_init (GeglChantOperation *self)
{
}
#ifdef GEGL_CHANT_INIT
static void init (ChantInstance *self);
static void init (GeglChantOperation *self);
static GObject *
gegl_chant_constructor (GType type,
......@@ -243,7 +243,7 @@ gegl_chant_constructor (GType type,
obj = G_OBJECT_CLASS (gegl_chant_parent_class)->constructor (
type, n_construct_properties, construct_properties);
init (GEGL_CHANT_INSTANCE (obj));
init (GEGL_CHANT_OPERATION (obj));
return obj;
}
......@@ -253,7 +253,7 @@ gegl_chant_constructor (GType type,
static void class_init (GeglOperationClass *operation_class);
#endif
static void create_matrix (ChantInstance *operation,
static void create_matrix (GeglChantOperation *operation,
Matrix3 matrix);
static void
......
......@@ -31,7 +31,7 @@ gegl_chant_double (degrees, -G_MAXDOUBLE, G_MAXDOUBLE, 0., "")
#include <math.h>
static void
create_matrix (ChantInstance *op,
create_matrix (GeglChantOperation *op,
Matrix3 matrix)
{
gdouble radians = op->degrees * (2 * G_PI / 360.);
......
......@@ -32,7 +32,7 @@ gegl_chant_double (y, -G_MAXDOUBLE, G_MAXDOUBLE, 1., "")
#include <math.h>
static void
create_matrix (ChantInstance *op,
create_matrix (GeglChantOperation *op,
Matrix3 matrix)
{
matrix [0][0] = op->x;
......
......@@ -32,7 +32,7 @@ gegl_chant_double (y, -G_MAXDOUBLE, G_MAXDOUBLE, 1., "")
#include <math.h>
static void
create_matrix (ChantInstance *op,
create_matrix (GeglChantOperation *op,
Matrix3 matrix)
{
matrix [0][1] = op->x;
......
......@@ -32,7 +32,7 @@ gegl_chant_double (y, -G_MAXDOUBLE, G_MAXDOUBLE, 1., "")
#include <math.h>
static void
create_matrix (ChantInstance *op,
create_matrix (GeglChantOperation *op,
Matrix3 matrix)
{
matrix [0][2] = op->x;
......
......@@ -29,7 +29,7 @@ gegl_chant_double (value, -10.0, 10.0, 0.5, "global opacity value, used if no au
#define GEGL_CHANT_INIT
#include "gegl-chant.h"
static void init (ChantInstance *self)
static void init (GeglChantOperation *self)
{
GEGL_OPERATION_POINT_COMPOSER (self)->format = babl_format ("RaGaBaA float");
GEGL_OPERATION_POINT_COMPOSER (self)->aux_format = babl_format ("Y float");
......@@ -50,7 +50,7 @@ process (GeglOperation *op,
if (aux == NULL)
{
gfloat value = GEGL_CHANT_INSTANCE (op)->value;
gfloat value = GEGL_CHANT_OPERATION (op)->value;
for (i=0; i<n_pixels; i++)
{
gint j;
......
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