callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app/gegl/gegl/buffer/gegl-buffer-types.h

Browse Source 
2008-01-06  Michael Natterer  <mitch@gimp.org>

	* app/gegl/gegl/buffer/gegl-buffer-types.h
	* app/gegl/gegl/gegl-operation-filter.h
	* app/gegl/gegl/gegl-operation-point-filter.h
	* app/gegl/gegl/gegl-operation-sink.h
	* app/gegl/gegl/gegl-operation-source.h
	* app/gegl/gegl/gegl-operation.h: updated from GEGL.


svn path=/trunk/; revision=24554
This commit is contained in:
Michael Natterer
2008-01-06 15:40:11 +00:00
committed by Michael Natterer
parent 4324d68141
commit 7acc5de91f
7 changed files with 68 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2008-01-06 Michael Natterer <mitch@gimp.org>
* app/gegl/gegl/buffer/gegl-buffer-types.h
* app/gegl/gegl/gegl-operation-filter.h
* app/gegl/gegl/gegl-operation-point-filter.h
* app/gegl/gegl/gegl-operation-sink.h
* app/gegl/gegl/gegl-operation-source.h
* app/gegl/gegl/gegl-operation.h: updated from GEGL.
2008-01-06 Michael Natterer <mitch@gimp.org> 2008-01-06 Michael Natterer <mitch@gimp.org>
* app/tools/gimpimagemaptool.c (gimp_image_map_tool_create_map): * app/tools/gimpimagemaptool.c (gimp_image_map_tool_create_map):

7
app/gegl/gegl/buffer/gegl-buffer-types.h
View File

@ -15,8 +15,9 @@
* *
* Copyright 2006,2007 Øyvind Kolås <pippin@gimp.org> * Copyright 2006,2007 Øyvind Kolås <pippin@gimp.org>
*/ */
#ifndef _GEGL_BUFFER_TYPES_H
#define _GEGL_BUFFER_TYPES_H #ifndef __GEGL_BUFFER_TYPES_H__
#define __GEGL_BUFFER_TYPES_H__
typedef struct _GeglSampler GeglSampler; typedef struct _GeglSampler GeglSampler;
@ -38,7 +39,7 @@ typedef struct _GeglHandlersClass GeglHandlersClass;
typedef struct _GeglStorage GeglStorage; typedef struct _GeglStorage GeglStorage;
typedef struct _GeglStorageClass GeglStorageClass; typedef struct _GeglStorageClass GeglStorageClass;
#ifndef _GEGL_BUFFER_H #ifndef __GEGL_BUFFER_H__
typedef struct _GeglBuffer GeglBuffer; typedef struct _GeglBuffer GeglBuffer;
#endif #endif
typedef struct _GeglBufferClass GeglBufferClass; typedef struct _GeglBufferClass GeglBufferClass;

20
app/gegl/gegl/gegl-operation-filter.h
View File

@ -15,8 +15,9 @@
* *
* Copyright 2006 Øyvind Kolås * Copyright 2006 Øyvind Kolås
*/ */
#ifndef _GEGL_OPERATION_FILTER_H
#define _GEGL_OPERATION_FILTER_H #ifndef __GEGL_OPERATION_FILTER_H__
#define __GEGL_OPERATION_FILTER_H__
#include <glib-object.h> #include <glib-object.h>
#include "gegl-types.h" #include "gegl-types.h"
@ -24,10 +25,12 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#define GEGL_TYPE_OPERATION_FILTER (gegl_operation_filter_get_type ()) #define GEGL_TYPE_OPERATION_FILTER (gegl_operation_filter_get_type ())
#define GEGL_OPERATION_FILTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_OPERATION_FILTER, GeglOperationFilter)) #define GEGL_OPERATION_FILTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_OPERATION_FILTER, GeglOperationFilter))
#define GEGL_OPERATION_FILTER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_OPERATION_FILTER, GeglOperationFilterClass)) #define GEGL_OPERATION_FILTER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_OPERATION_FILTER, GeglOperationFilterClass))
#define GEGL_OPERATION_FILTER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_OPERATION_FILTER, GeglOperationFilterClass)) #define GEGL_IS_OPERATION_FILTER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_OPERATION_FILTER))
#define GEGL_IS_OPERATION_FILTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_OPERATION_FILTER))
#define GEGL_OPERATION_FILTER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_OPERATION_FILTER, GeglOperationFilterClass))
typedef struct _GeglOperationFilter GeglOperationFilter; typedef struct _GeglOperationFilter GeglOperationFilter;
struct _GeglOperationFilter struct _GeglOperationFilter
@ -40,8 +43,9 @@ struct _GeglOperationFilterClass
{ {
GeglOperationClass parent_class; GeglOperationClass parent_class;
gboolean (* process) (GeglOperation *self, gboolean (* process) (GeglOperation *self,
gpointer context_id); GeglNodeContext *context,
const GeglRectangle *result);
}; };
GType gegl_operation_filter_get_type (void) G_GNUC_CONST; GType gegl_operation_filter_get_type (void) G_GNUC_CONST;

18
app/gegl/gegl/gegl-operation-point-filter.h
View File

@ -15,19 +15,20 @@
* *
* Copyright 2006 Øyvind Kolås * Copyright 2006 Øyvind Kolås
*/ */
#ifndef _GEGL_OPERATION_POINT_FILTER_H
#define _GEGL_OPERATION_POINT_FILTER_H
#include <glib-object.h> #ifndef __GEGL_OPERATION_POINT_FILTER_H__
#include "gegl-types.h" #define __GEGL_OPERATION_POINT_FILTER_H__
#include "gegl-operation-filter.h" #include "gegl-operation-filter.h"
G_BEGIN_DECLS G_BEGIN_DECLS
#define GEGL_TYPE_OPERATION_POINT_FILTER (gegl_operation_point_filter_get_type ()) #define GEGL_TYPE_OPERATION_POINT_FILTER (gegl_operation_point_filter_get_type ())
#define GEGL_OPERATION_POINT_FILTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_OPERATION_POINT_FILTER, GeglOperationPointFilter)) #define GEGL_OPERATION_POINT_FILTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_OPERATION_POINT_FILTER, GeglOperationPointFilter))
#define GEGL_OPERATION_POINT_FILTER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_OPERATION_POINT_FILTER, GeglOperationPointFilterClass)) #define GEGL_OPERATION_POINT_FILTER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_OPERATION_POINT_FILTER, GeglOperationPointFilterClass))
#define GEGL_OPERATION_POINT_FILTER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_OPERATION_POINT_FILTER, GeglOperationPointFilterClass)) #define GEGL_IS_OPERATION_POINT_FILTER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_OPERATION_POINT_FILTER))
#define GEGL_IS_OPERATION_POINT_FILTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_OPERATION_POINT_FILTER))
#define GEGL_OPERATION_POINT_FILTER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_OPERATION_POINT_FILTER, GeglOperationPointFilterClass))
typedef struct _GeglOperationPointFilter GeglOperationPointFilter; typedef struct _GeglOperationPointFilter GeglOperationPointFilter;
struct _GeglOperationPointFilter struct _GeglOperationPointFilter
@ -44,7 +45,6 @@ struct _GeglOperationPointFilterClass
void *in_buf, /* input buffer */ void *in_buf, /* input buffer */
void *out_buf, /* output buffer */ void *out_buf, /* output buffer */
glong samples); /* number of samples */ glong samples); /* number of samples */
}; };
GType gegl_operation_point_filter_get_type (void) G_GNUC_CONST; GType gegl_operation_point_filter_get_type (void) G_GNUC_CONST;

13
app/gegl/gegl/gegl-operation-sink.h
View File

@ -15,11 +15,10 @@
* *
* Copyright 2006 Øyvind Kolås * Copyright 2006 Øyvind Kolås
*/ */
#ifndef _GEGL_OPERATION_SINK_H
#define _GEGL_OPERATION_SINK_H
#include <glib-object.h> #ifndef __GEGL_OPERATION_SINK_H__
#include "gegl-types.h" #define __GEGL_OPERATION_SINK_H__
#include "gegl-operation.h" #include "gegl-operation.h"
G_BEGIN_DECLS G_BEGIN_DECLS
@ -27,9 +26,9 @@ G_BEGIN_DECLS
#define GEGL_TYPE_OPERATION_SINK (gegl_operation_sink_get_type ()) #define GEGL_TYPE_OPERATION_SINK (gegl_operation_sink_get_type ())
#define GEGL_OPERATION_SINK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_OPERATION_SINK, GeglOperationSink)) #define GEGL_OPERATION_SINK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_OPERATION_SINK, GeglOperationSink))
#define GEGL_OPERATION_SINK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_OPERATION_SINK, GeglOperationSinkClass)) #define GEGL_OPERATION_SINK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_OPERATION_SINK, GeglOperationSinkClass))
#define GEGL_OPERATION_SINK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_OPERATION_SINK, GeglOperationSinkClass))
#define GEGL_IS_OPERATION_SINK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_OPERATION_SINK)) #define GEGL_IS_OPERATION_SINK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_OPERATION_SINK))
#define GEGL_IS_OPERATION_SINK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_OPERATION_SINK)) #define GEGL_IS_OPERATION_SINK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_OPERATION_SINK))
#define GEGL_OPERATION_SINK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_OPERATION_SINK, GeglOperationSinkClass))
typedef struct _GeglOperationSink GeglOperationSink; typedef struct _GeglOperationSink GeglOperationSink;
struct _GeglOperationSink struct _GeglOperationSink
@ -44,8 +43,8 @@ struct _GeglOperationSinkClass
gboolean needs_full; gboolean needs_full;
gboolean (* process) (GeglOperation *self, gboolean (* process) (GeglOperation *self,
GeglNodeContext *context, GeglNodeContext *context,
const GeglRectangle *result); const GeglRectangle *result);
}; };

20
app/gegl/gegl/gegl-operation-source.h
View File

@ -15,19 +15,20 @@
* *
* Copyright 2006 Øyvind Kolås * Copyright 2006 Øyvind Kolås
*/ */
#ifndef __GEGL_OPERATION_SOURCE_H__ #ifndef __GEGL_OPERATION_SOURCE_H__
#define __GEGL_OPERATION_SOURCE_H__ #define __GEGL_OPERATION_SOURCE_H__
#include <glib-object.h>
#include "gegl-types.h"
#include "gegl-operation.h" #include "gegl-operation.h"
G_BEGIN_DECLS G_BEGIN_DECLS
#define GEGL_TYPE_OPERATION_SOURCE (gegl_operation_source_get_type ()) #define GEGL_TYPE_OPERATION_SOURCE (gegl_operation_source_get_type ())
#define GEGL_OPERATION_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_OPERATION_SOURCE, GeglOperationSource)) #define GEGL_OPERATION_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_OPERATION_SOURCE, GeglOperationSource))
#define GEGL_OPERATION_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_OPERATION_SOURCE, GeglOperationSourceClass)) #define GEGL_OPERATION_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_OPERATION_SOURCE, GeglOperationSourceClass))
#define GEGL_OPERATION_SOURCE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_OPERATION_SOURCE, GeglOperationSourceClass)) #define GEGL_IS_OPERATION_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_OPERATION_SOURCE, GeglOperationSource))
#define GEGL_IS_OPERATION_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEGL_TYPE_OPERATION_SOURCE, GeglOperationSourceClass))
#define GEGL_OPERATION_SOURCE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEGL_TYPE_OPERATION_SOURCE, GeglOperationSourceClass))
typedef struct _GeglOperationSource GeglOperationSource; typedef struct _GeglOperationSource GeglOperationSource;
struct _GeglOperationSource struct _GeglOperationSource
@ -38,9 +39,10 @@ struct _GeglOperationSource
typedef struct _GeglOperationSourceClass GeglOperationSourceClass; typedef struct _GeglOperationSourceClass GeglOperationSourceClass;
struct _GeglOperationSourceClass struct _GeglOperationSourceClass
{ {
GeglOperationClass parent_class; GeglOperationClass parent_class;
gboolean (*process) (GeglOperation *self,
GeglNodeContext *context, gboolean (* process) (GeglOperation *self,
GeglNodeContext *context,
const GeglRectangle *result); const GeglRectangle *result);
}; };

37
app/gegl/gegl/gegl-operation.h
View File

@ -20,13 +20,13 @@
#ifndef __GEGL_OPERATION_H__ #ifndef __GEGL_OPERATION_H__
#define __GEGL_OPERATION_H__ #define __GEGL_OPERATION_H__
#include <glib-object.h>
#include <babl/babl.h>
#include "gegl-types.h" #include "gegl-types.h"
#include "buffer/gegl-buffer-types.h" #include "buffer/gegl-buffer-types.h"
#include <babl/babl.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GEGL_TYPE_OPERATION (gegl_operation_get_type ()) #define GEGL_TYPE_OPERATION (gegl_operation_get_type ())
#define GEGL_OPERATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_OPERATION, GeglOperation)) #define GEGL_OPERATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_OPERATION, GeglOperation))
#define GEGL_OPERATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_OPERATION, GeglOperationClass)) #define GEGL_OPERATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEGL_TYPE_OPERATION, GeglOperationClass))
@ -87,9 +87,9 @@ struct _GeglOperationClass
* graph. A default implementation of this, if not provided should probably * graph. A default implementation of this, if not provided should probably
* be to report that the entire defined region is dirtied. * be to report that the entire defined region is dirtied.
*/ */
GeglRectangle (*compute_affected_region) (GeglOperation *operation, GeglRectangle (*compute_affected_region) (GeglOperation *operation,
const gchar *input_pad, const gchar *input_pad,
GeglRectangle region); const GeglRectangle *input_region);
/* computes the rectangle needed to be correctly computed in a buffer /* computes the rectangle needed to be correctly computed in a buffer
* on the named input_pad, for a given result rectangle * on the named input_pad, for a given result rectangle
@ -107,17 +107,14 @@ struct _GeglOperationClass
/* Returns the node providing data for a specific location /* Returns the node providing data for a specific location
*/ */
GeglNode* (*detect) (GeglOperation *operation, GeglNode* (*detect) (GeglOperation *operation,
gint x, gint x,
gint y); gint y);
gboolean (*process) (GeglOperation *operation,
GeglNodeContext *context,
const gchar *output_pad,
const GeglRectangle *result_rect
);
gboolean (*process) (GeglOperation *operation,
GeglNodeContext *context,
const gchar *output_pad,
const GeglRectangle *result_rect);
}; };
/* returns|registers the gtype for GeglOperation */ /* returns|registers the gtype for GeglOperation */
@ -129,10 +126,10 @@ GeglRectangle * gegl_operation_source_get_defined_region (GeglOperation *operati
/* sets the ROI needed to be computed on one of the sources */ /* sets the ROI needed to be computed on one of the sources */
void gegl_operation_set_source_region (GeglOperation *operation, void gegl_operation_set_source_region (GeglOperation *operation,
gpointer context_id, gpointer context_id,
const gchar *pad_name, const gchar *pad_name,
GeglRectangle *region); const GeglRectangle *region);
/* virtual method invokers that depends only on the set properties of a /* virtual method invokers that depends only on the set properties of a
@ -144,7 +141,7 @@ GeglNode * gegl_operation_get_source_node (GeglOperation *operation,
const gchar *pad_name); const gchar *pad_name);
GeglRectangle gegl_operation_compute_affected_region (GeglOperation *operation, GeglRectangle gegl_operation_compute_affected_region (GeglOperation *operation,
const gchar *input_pad, const gchar *input_pad,
GeglRectangle region); const GeglRectangle *input_region);
GeglRectangle gegl_operation_get_defined_region (GeglOperation *operation); GeglRectangle gegl_operation_get_defined_region (GeglOperation *operation);
GeglRectangle gegl_operation_adjust_result_region (GeglOperation *operation, GeglRectangle gegl_operation_adjust_result_region (GeglOperation *operation,
const GeglRectangle *roi); const GeglRectangle *roi);