From ff5507dfa776de4e04af6c8f3c4f42dc9c318b20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20Kol=C3=A5s?= Date: Tue, 8 Jan 2008 19:48:38 +0000 Subject: [PATCH] removed no longer needed context_id. resynced from GEGL. resynced from * app/gegl/gimpoperationtilesink.c: removed no longer needed context_id. * app/gegl/gegl/gegl-operation-sink.h: resynced from GEGL. * app/gegl/gegl/gegl-types.h: resynced from GEGL. svn path=/trunk/; revision=24571 --- ChangeLog | 7 +++++++ app/gegl/gegl/gegl-operation-sink.h | 1 - app/gegl/gegl/gegl-types.h | 10 ---------- app/gegl/gimpoperationtilesink.c | 2 -- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index a15e25e80e..842954dd51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-01-08 Øyvind Kolås + + * app/gegl/gimpoperationtilesink.c: removed no longer needed + context_id. + * app/gegl/gegl/gegl-operation-sink.h: resynced from GEGL. + * app/gegl/gegl/gegl-types.h: resynced from GEGL. + 2008-01-08 Sven Neumann * app/core/gimpitem.[ch]: removed "add_alpha" parameter from diff --git a/app/gegl/gegl/gegl-operation-sink.h b/app/gegl/gegl/gegl-operation-sink.h index 7963d8ef50..c51d507224 100644 --- a/app/gegl/gegl/gegl-operation-sink.h +++ b/app/gegl/gegl/gegl-operation-sink.h @@ -44,7 +44,6 @@ struct _GeglOperationSinkClass gboolean needs_full; gboolean (* process) (GeglOperation *self, - GeglNodeContext *context, GeglBuffer *input, const GeglRectangle *result); }; diff --git a/app/gegl/gegl/gegl-types.h b/app/gegl/gegl/gegl-types.h index 9ceaf55dcd..42665020b4 100644 --- a/app/gegl/gegl/gegl-types.h +++ b/app/gegl/gegl/gegl-types.h @@ -23,10 +23,8 @@ G_BEGIN_DECLS typedef struct _GeglConnection GeglConnection; -#ifndef __GEGL_H__ typedef struct _GeglColor GeglColor; typedef struct _GeglCurve GeglCurve; -#endif typedef struct _GeglCRVisitor GeglCRVisitor; typedef struct _GeglDebugRectVisitor GeglDebugRectVisitor; typedef struct _GeglEvalMgr GeglEvalMgr; @@ -35,27 +33,20 @@ typedef struct _GeglFinishVisitor GeglFinishVisitor; typedef struct _GeglGraph GeglGraph; typedef struct _GeglHaveVisitor GeglHaveVisitor; typedef struct _GeglNeedVisitor GeglNeedVisitor; -#ifndef __GEGL_H__ typedef struct _GeglNode GeglNode; -#endif typedef struct _GeglNodeContext GeglNodeContext; typedef struct _GeglOperation GeglOperation; typedef struct _GeglPad GeglPad; -#ifndef __GEGL_H__ typedef struct _GeglVector GeglVector; typedef struct _GeglProcessor GeglProcessor; -#endif typedef struct _GeglPrepareVisitor GeglPrepareVisitor; typedef struct _GeglVisitable GeglVisitable; /* dummy typedef */ typedef struct _GeglVisitor GeglVisitor; -#ifndef __GEGL_H__ typedef struct _GeglRectangle GeglRectangle; -#endif typedef struct _GeglPoint GeglPoint; typedef struct _GeglDimension GeglDimension; -#ifndef __GEGL_H__ struct _GeglRectangle { gint x; @@ -63,7 +54,6 @@ struct _GeglRectangle gint width; gint height; }; -#endif struct _GeglPoint { diff --git a/app/gegl/gimpoperationtilesink.c b/app/gegl/gimpoperationtilesink.c index 891bd8dc0d..2f40ce9c07 100644 --- a/app/gegl/gimpoperationtilesink.c +++ b/app/gegl/gimpoperationtilesink.c @@ -66,7 +66,6 @@ static void gimp_operation_tile_sink_set_property (GObject *object, GParamSpec *pspec); static gboolean gimp_operation_tile_sink_process (GeglOperation *operation, - GeglNodeContext *context, GeglBuffer *input, const GeglRectangle *result); @@ -194,7 +193,6 @@ gimp_operation_tile_sink_set_property (GObject *object, static gboolean gimp_operation_tile_sink_process (GeglOperation *operation, - GeglNodeContext *context, GeglBuffer *input, const GeglRectangle *result) {