GNOME.org
 

gimp r24554 - in trunk: . app/gegl/gegl app/gegl/gegl/buffer

Author: mitch
Date: Sun Jan  6 15:40:11 2008
New Revision: 24554
URL: http://svn.gnome.org/viewvc/gimp?rev=24554&view=rev

Log:
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.



Modified:
   trunk/ChangeLog
   trunk/app/gegl/gegl/buffer/gegl-buffer-types.h
   trunk/app/gegl/gegl/gegl-operation-filter.h
   trunk/app/gegl/gegl/gegl-operation-point-filter.h
   trunk/app/gegl/gegl/gegl-operation-sink.h
   trunk/app/gegl/gegl/gegl-operation-source.h
   trunk/app/gegl/gegl/gegl-operation.h

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	(original)
+++ trunk/ChangeLog	Sun Jan  6 15:40:11 2008
@@ -1,5 +1,14 @@
 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>
+
 	* app/tools/gimpimagemaptool.c (gimp_image_map_tool_create_map):
 	don't call a NULL GimpImageMapToolClass::get_operation().
 

Modified: trunk/app/gegl/gegl/buffer/gegl-buffer-types.h
==============================================================================
--- trunk/app/gegl/gegl/buffer/gegl-buffer-types.h	(original)
+++ trunk/app/gegl/gegl/buffer/gegl-buffer-types.h	Sun Jan  6 15:40:11 2008
@@ -15,8 +15,9 @@
  *
  * 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;
 
@@ -38,7 +39,7 @@
 typedef struct _GeglStorage              GeglStorage;
 typedef struct _GeglStorageClass         GeglStorageClass;
 
-#ifndef _GEGL_BUFFER_H
+#ifndef __GEGL_BUFFER_H__
 typedef struct _GeglBuffer               GeglBuffer;
 #endif
 typedef struct _GeglBufferClass          GeglBufferClass;

Modified: trunk/app/gegl/gegl/gegl-operation-filter.h
==============================================================================
--- trunk/app/gegl/gegl/gegl-operation-filter.h	(original)
+++ trunk/app/gegl/gegl/gegl-operation-filter.h	Sun Jan  6 15:40:11 2008
@@ -15,8 +15,9 @@
  *
  * 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 "gegl-types.h"
@@ -24,10 +25,12 @@
 
 G_BEGIN_DECLS
 
-#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_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_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_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  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;
 struct _GeglOperationFilter
@@ -40,8 +43,9 @@
 {
   GeglOperationClass parent_class;
 
-  gboolean (* process) (GeglOperation *self,
-                        gpointer       context_id);
+  gboolean (* process) (GeglOperation       *self,
+                        GeglNodeContext     *context,
+                        const GeglRectangle *result);
 };
 
 GType gegl_operation_filter_get_type (void) G_GNUC_CONST;

Modified: trunk/app/gegl/gegl/gegl-operation-point-filter.h
==============================================================================
--- trunk/app/gegl/gegl/gegl-operation-point-filter.h	(original)
+++ trunk/app/gegl/gegl/gegl-operation-point-filter.h	Sun Jan  6 15:40:11 2008
@@ -15,19 +15,20 @@
  *
  * Copyright 2006 Ãyvind KolÃs
  */
-#ifndef _GEGL_OPERATION_POINT_FILTER_H
-#define _GEGL_OPERATION_POINT_FILTER_H
 
-#include <glib-object.h>
-#include "gegl-types.h"
+#ifndef __GEGL_OPERATION_POINT_FILTER_H__
+#define __GEGL_OPERATION_POINT_FILTER_H__
+
 #include "gegl-operation-filter.h"
 
 G_BEGIN_DECLS
 
-#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_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_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_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  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;
 struct _GeglOperationPointFilter
@@ -44,7 +45,6 @@
                         void          *in_buf,    /* input buffer */
                         void          *out_buf,   /* output buffer */
                         glong          samples);  /* number of samples   */
-
 };
 
 GType gegl_operation_point_filter_get_type (void) G_GNUC_CONST;

Modified: trunk/app/gegl/gegl/gegl-operation-sink.h
==============================================================================
--- trunk/app/gegl/gegl/gegl-operation-sink.h	(original)
+++ trunk/app/gegl/gegl/gegl-operation-sink.h	Sun Jan  6 15:40:11 2008
@@ -15,11 +15,10 @@
  *
  * Copyright 2006 Ãyvind KolÃs
  */
-#ifndef _GEGL_OPERATION_SINK_H
-#define _GEGL_OPERATION_SINK_H
 
-#include <glib-object.h>
-#include "gegl-types.h"
+#ifndef __GEGL_OPERATION_SINK_H__
+#define __GEGL_OPERATION_SINK_H__
+
 #include "gegl-operation.h"
 
 G_BEGIN_DECLS
@@ -27,9 +26,9 @@
 #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_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_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;
 struct _GeglOperationSink
@@ -44,8 +43,8 @@
 
   gboolean           needs_full;
 
-  gboolean (* process) (GeglOperation        *self,
-                        GeglNodeContext      *context,
+  gboolean (* process) (GeglOperation       *self,
+                        GeglNodeContext     *context,
                         const GeglRectangle *result);
 };
 

Modified: trunk/app/gegl/gegl/gegl-operation-source.h
==============================================================================
--- trunk/app/gegl/gegl/gegl-operation-source.h	(original)
+++ trunk/app/gegl/gegl/gegl-operation-source.h	Sun Jan  6 15:40:11 2008
@@ -15,19 +15,20 @@
  *
  * Copyright 2006 Ãyvind KolÃs
  */
+
 #ifndef __GEGL_OPERATION_SOURCE_H__
 #define __GEGL_OPERATION_SOURCE_H__
 
-#include <glib-object.h>
-#include "gegl-types.h"
 #include "gegl-operation.h"
 
 G_BEGIN_DECLS
 
-#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_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_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_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  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;
 struct _GeglOperationSource
@@ -38,9 +39,10 @@
 typedef struct _GeglOperationSourceClass GeglOperationSourceClass;
 struct _GeglOperationSourceClass
 {
-   GeglOperationClass parent_class;
-   gboolean (*process) (GeglOperation *self,
-                        GeglNodeContext *context,
+  GeglOperationClass parent_class;
+
+  gboolean (* process) (GeglOperation       *self,
+                        GeglNodeContext     *context,
                         const GeglRectangle *result);
 };
 

Modified: trunk/app/gegl/gegl/gegl-operation.h
==============================================================================
--- trunk/app/gegl/gegl/gegl-operation.h	(original)
+++ trunk/app/gegl/gegl/gegl-operation.h	Sun Jan  6 15:40:11 2008
@@ -20,13 +20,13 @@
 #ifndef __GEGL_OPERATION_H__
 #define __GEGL_OPERATION_H__
 
+#include <glib-object.h>
+#include <babl/babl.h>
 #include "gegl-types.h"
 #include "buffer/gegl-buffer-types.h"
-#include <babl/babl.h>
 
 G_BEGIN_DECLS
 
-
 #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_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GEGL_TYPE_OPERATION, GeglOperationClass))
@@ -87,9 +87,9 @@
    * graph. A default implementation of this, if not provided should probably
    * be to report that the entire defined region is dirtied.
    */
-  GeglRectangle   (*compute_affected_region)  (GeglOperation *operation,
-                                               const gchar   *input_pad,
-                                               GeglRectangle  region);
+  GeglRectangle   (*compute_affected_region)  (GeglOperation       *operation,
+                                               const gchar         *input_pad,
+                                               const GeglRectangle *input_region);
 
   /* computes the rectangle needed to be correctly computed in a buffer
    * on the named input_pad, for a given result rectangle
@@ -107,17 +107,14 @@
 
   /* Returns the node providing data for a specific location
    */
-  GeglNode*       (*detect)               (GeglOperation *operation,
-                                           gint           x,
-                                           gint           y);
-
-  gboolean        (*process) (GeglOperation       *operation,
-                              GeglNodeContext     *context,
-                              const gchar         *output_pad,
-                              const GeglRectangle *result_rect
-                              );
-
-
+  GeglNode*       (*detect)                (GeglOperation       *operation,
+                                            gint                 x,
+                                            gint                 y);
+
+  gboolean        (*process)               (GeglOperation       *operation,
+                                            GeglNodeContext     *context,
+                                            const gchar         *output_pad,
+                                            const GeglRectangle *result_rect);
 };
 
 /* returns|registers the gtype for GeglOperation */
@@ -129,10 +126,10 @@
 
 
 /* sets the ROI needed to be computed on one of the sources */
-void            gegl_operation_set_source_region    (GeglOperation *operation,
-                                                     gpointer       context_id,
-                                                     const gchar   *pad_name,
-                                                     GeglRectangle *region);
+void            gegl_operation_set_source_region    (GeglOperation       *operation,
+                                                     gpointer             context_id,
+                                                     const gchar         *pad_name,
+                                                     const GeglRectangle *region);
 
 
 /* virtual method invokers that depends only on the set properties of a
@@ -144,7 +141,7 @@
                                                      const gchar   *pad_name);
 GeglRectangle   gegl_operation_compute_affected_region (GeglOperation *operation,
                                                      const gchar   *input_pad,
-                                                     GeglRectangle  region);
+                                                     const GeglRectangle *input_region);
 GeglRectangle   gegl_operation_get_defined_region   (GeglOperation *operation);
 GeglRectangle   gegl_operation_adjust_result_region (GeglOperation *operation,
                                                      const GeglRectangle *roi);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]