GNOME.org
 

gegl r1870 - in trunk: . gegl gegl/graph gegl/operation operations/affine operations/color operations/core

Author: ok
Date: Fri Jan 18 23:57:34 2008
New Revision: 1870
URL: http://svn.gnome.org/viewvc/gegl?rev=1870&view=rev

Log:
* gegl/operation/Makefile.am: install operation header files in
$(includedir)-0.0/operation/
* gegl/gegl-module.h: do not include gegl-types.h
* gegl/gegl-types.h: added some ad-hoc guards against multiple
typedefs.
* gegl/graph/gegl-node-context.c:
* gegl/graph/gegl-node.c:
* gegl/operation/gegl-operation-area-filter.c:
* gegl/operation/gegl-operation-composer.c:
* gegl/operation/gegl-operation-filter.c:
* gegl/operation/gegl-operation-meta.c:
* gegl/operation/gegl-operation-point-composer.c:
* gegl/operation/gegl-operation-point-filter.c:
* gegl/operation/gegl-operation-sink.c:
* gegl/operation/gegl-operation-source.c:
* gegl/operation/gegl-operation.c:
* gegl/operation/gegl-operation.h:
* operations/affine/module.c:
* operations/color/remap.c:
* operations/core/clone.c:
* operations/core/crop.c:
* operations/core/nop.c:
* operations/core/shift.c: modified to compile with header files
modified to allow the operation headers being installed.


Modified:
   trunk/ChangeLog
   trunk/gegl/gegl-module.h
   trunk/gegl/gegl-types.h
   trunk/gegl/graph/gegl-node-context.c
   trunk/gegl/graph/gegl-node.c
   trunk/gegl/operation/Makefile.am
   trunk/gegl/operation/gegl-operation-area-filter.c
   trunk/gegl/operation/gegl-operation-composer.c
   trunk/gegl/operation/gegl-operation-filter.c
   trunk/gegl/operation/gegl-operation-meta.c
   trunk/gegl/operation/gegl-operation-point-composer.c
   trunk/gegl/operation/gegl-operation-point-filter.c
   trunk/gegl/operation/gegl-operation-sink.c
   trunk/gegl/operation/gegl-operation-source.c
   trunk/gegl/operation/gegl-operation.c
   trunk/gegl/operation/gegl-operation.h
   trunk/operations/affine/module.c
   trunk/operations/color/remap.c
   trunk/operations/core/clone.c
   trunk/operations/core/crop.c
   trunk/operations/core/nop.c
   trunk/operations/core/shift.c

Modified: trunk/gegl/gegl-module.h
==============================================================================
--- trunk/gegl/gegl-module.h	(original)
+++ trunk/gegl/gegl-module.h	Fri Jan 18 23:57:34 2008
@@ -21,7 +21,7 @@
 
 #include <glib-object.h>
 
-#include <gegl/gegl-types.h>
+/*#include <gegl/gegl-types.h>*/
 
 #include <gegl/buffer/gegl-buffer.h>
 #include <gegl/module/geglmoduletypes.h>

Modified: trunk/gegl/gegl-types.h
==============================================================================
--- trunk/gegl/gegl-types.h	(original)
+++ trunk/gegl/gegl-types.h	Fri Jan 18 23:57:34 2008
@@ -22,7 +22,6 @@
 
 G_BEGIN_DECLS
 
-typedef struct _GeglConnection       GeglConnection;
 typedef struct _GeglColor            GeglColor;
 typedef struct _GeglCurve            GeglCurve;
 typedef struct _GeglCRVisitor        GeglCRVisitor;
@@ -34,9 +33,13 @@
 typedef struct _GeglHaveVisitor      GeglHaveVisitor;
 typedef struct _GeglNeedVisitor      GeglNeedVisitor;
 typedef struct _GeglNode             GeglNode;
-typedef struct _GeglNodeContext      GeglNodeContext;
-typedef struct _GeglOperation        GeglOperation;
+#ifndef GEGL_OPERATION_TYPE
+#define GEGL_OPERATION_TYPE
 typedef struct _GeglPad              GeglPad;
+typedef struct _GeglOperation        GeglOperation;
+typedef struct _GeglNodeContext      GeglNodeContext;
+typedef struct _GeglConnection       GeglConnection;
+#endif
 typedef struct _GeglVector           GeglVector;
 typedef struct _GeglProcessor        GeglProcessor;
 typedef struct _GeglPrepareVisitor   GeglPrepareVisitor;

Modified: trunk/gegl/graph/gegl-node-context.c
==============================================================================
--- trunk/gegl/graph/gegl-node-context.c	(original)
+++ trunk/gegl/graph/gegl-node-context.c	Fri Jan 18 23:57:34 2008
@@ -19,6 +19,8 @@
 
 #include "config.h"
 
+#define GEGL_INTERNAL
+
 #include <stdio.h>
 #include <string.h>
 

Modified: trunk/gegl/graph/gegl-node.c
==============================================================================
--- trunk/gegl/graph/gegl-node.c	(original)
+++ trunk/gegl/graph/gegl-node.c	Fri Jan 18 23:57:34 2008
@@ -17,6 +17,8 @@
  *           2006 Ãyvind KolÃs
  */
 
+#define GEGL_INTERNAL
+
 #include "config.h"
 
 #include <stdio.h>

Modified: trunk/gegl/operation/Makefile.am
==============================================================================
--- trunk/gegl/operation/Makefile.am	(original)
+++ trunk/gegl/operation/Makefile.am	Fri Jan 18 23:57:34 2008
@@ -15,7 +15,18 @@
 
 OPERATION_headers = \
 	gegl-extension-handler.h	\
-    	gegl-operation.h        	\
+	gegl-operation.h        	\
+	gegl-operation-composer.h     	\
+	gegl-operation-area-filter.h    \
+	gegl-operation-filter.h       	\
+	gegl-operation-meta.h       	\
+	gegl-operation-point-composer.h \
+	gegl-operation-point-filter.h   \
+	gegl-operation-sink.h       	\
+	gegl-operation-source.h
+
+public_headers = \
+	gegl-operation.h        	\
 	gegl-operation-composer.h     	\
 	gegl-operation-area-filter.h    \
 	gegl-operation-filter.h       	\
@@ -26,9 +37,9 @@
 	gegl-operation-source.h
 
 
-liboperation_la_SOURCES = $(OPERATION_sources) $(OPERATION_headers)
-#liboperationinclude_HEADERS = #
-#liboperationincludedir = $(includedir)/gegl-$(GEGL_API_VERSION)/gegl/operation
+liboperation_la_SOURCES = $(OPERATION_sources) $(public_headers)
+liboperationinclude_HEADERS = $(OPERATION_headers)
+liboperationincludedir = $(includedir)/gegl-$(GEGL_API_VERSION)/operation
 
 INCLUDES = \
 	   -I$(top_srcdir)		\

Modified: trunk/gegl/operation/gegl-operation-area-filter.c
==============================================================================
--- trunk/gegl/operation/gegl-operation-area-filter.c	(original)
+++ trunk/gegl/operation/gegl-operation-area-filter.c	Fri Jan 18 23:57:34 2008
@@ -15,7 +15,21 @@
  *
  * Copyright 2007 Ãyvind KolÃs
  */
+#define GEGL_INTERNAL
+
+#include "config.h"
+
+#include <glib-object.h>
+#include <string.h>
+#include "gegl-types.h"
 #include "gegl-operation-area-filter.h"
+#include "gegl-utils.h"
+#include "graph/gegl-node.h"
+#include "graph/gegl-connection.h"
+#include "graph/gegl-pad.h"
+#include "buffer/gegl-region.h"
+#include "buffer/gegl-buffer.h"
+
 #include <string.h>
 
 G_DEFINE_TYPE (GeglOperationAreaFilter, gegl_operation_area_filter, GEGL_TYPE_OPERATION_FILTER)

Modified: trunk/gegl/operation/gegl-operation-composer.c
==============================================================================
--- trunk/gegl/operation/gegl-operation-composer.c	(original)
+++ trunk/gegl/operation/gegl-operation-composer.c	Fri Jan 18 23:57:34 2008
@@ -16,11 +16,20 @@
  * Copyright 2006 Ãyvind KolÃs
  */
 
+#define GEGL_INTERNAL
+
+#include "config.h"
+
+#include <glib-object.h>
+#include <string.h>
+#include "gegl-types.h"
 #include "gegl-operation-composer.h"
 #include "gegl-utils.h"
-#include "graph/gegl-pad.h"
 #include "graph/gegl-node.h"
-#include <string.h>
+#include "graph/gegl-connection.h"
+#include "graph/gegl-pad.h"
+#include "buffer/gegl-region.h"
+#include "buffer/gegl-buffer.h"
 
 enum
 {
@@ -28,7 +37,6 @@
   PROP_OUTPUT,
   PROP_INPUT,
   PROP_AUX,
-  PROP_LAST
 };
 
 static void     get_property (GObject             *gobject,

Modified: trunk/gegl/operation/gegl-operation-filter.c
==============================================================================
--- trunk/gegl/operation/gegl-operation-filter.c	(original)
+++ trunk/gegl/operation/gegl-operation-filter.c	Fri Jan 18 23:57:34 2008
@@ -15,18 +15,27 @@
  *
  * Copyright 2006 Ãyvind KolÃs
  */
+
+#define GEGL_INTERNAL
+
+#include "config.h"
+
+#include <glib-object.h>
+#include <string.h>
+#include "gegl-types.h"
 #include "gegl-operation-filter.h"
-#include "graph/gegl-pad.h"
+#include "gegl-utils.h"
 #include "graph/gegl-node.h"
+#include "graph/gegl-connection.h"
+#include "graph/gegl-pad.h"
+#include "buffer/gegl-region.h"
 #include "buffer/gegl-buffer.h"
-#include <string.h>
 
 enum
 {
   PROP_0,
   PROP_OUTPUT,
   PROP_INPUT,
-  PROP_LAST
 };
 
 static void     get_property            (GObject       *gobject,

Modified: trunk/gegl/operation/gegl-operation-meta.c
==============================================================================
--- trunk/gegl/operation/gegl-operation-meta.c	(original)
+++ trunk/gegl/operation/gegl-operation-meta.c	Fri Jan 18 23:57:34 2008
@@ -15,10 +15,17 @@
  *
  * Copyright 2006 Ãyvind KolÃs
  */
+
+#define GEGL_INTERNAL
+#include "config.h"
+
+#include <glib-object.h>
+#include "gegl-types.h"
 #include "gegl-operation-meta.h"
 #include "graph/gegl-node.h"
 #include <string.h>
 
+
 enum
 {
   PROP_0,

Modified: trunk/gegl/operation/gegl-operation-point-composer.c
==============================================================================
--- trunk/gegl/operation/gegl-operation-point-composer.c	(original)
+++ trunk/gegl/operation/gegl-operation-point-composer.c	Fri Jan 18 23:57:34 2008
@@ -15,6 +15,13 @@
  *
  * Copyright 2006 Ãyvind KolÃs
  */
+
+
+#define GEGL_INTERNAL
+#include "config.h"
+
+#include <glib-object.h>
+#include "gegl-types.h"
 #include "gegl-operation-point-composer.h"
 #include "gegl-utils.h"
 #include "graph/gegl-node.h"

Modified: trunk/gegl/operation/gegl-operation-point-filter.c
==============================================================================
--- trunk/gegl/operation/gegl-operation-point-filter.c	(original)
+++ trunk/gegl/operation/gegl-operation-point-filter.c	Fri Jan 18 23:57:34 2008
@@ -15,6 +15,13 @@
  *
  * Copyright 2006 Ãyvind KolÃs
  */
+
+
+#define GEGL_INTERNAL
+#include "config.h"
+
+#include <glib-object.h>
+#include "gegl-types.h"
 #include "gegl-operation-point-filter.h"
 #include "graph/gegl-pad.h"
 #include "graph/gegl-node.h"

Modified: trunk/gegl/operation/gegl-operation-sink.c
==============================================================================
--- trunk/gegl/operation/gegl-operation-sink.c	(original)
+++ trunk/gegl/operation/gegl-operation-sink.c	Fri Jan 18 23:57:34 2008
@@ -15,6 +15,12 @@
  *
  * Copyright 2006 Ãyvind KolÃs
  */
+
+#define GEGL_INTERNAL
+#include "config.h"
+
+#include <glib-object.h>
+#include "gegl-types.h"
 #include "gegl-operation-sink.h"
 #include "graph/gegl-node.h"
 #include "graph/gegl-pad.h"

Modified: trunk/gegl/operation/gegl-operation-source.c
==============================================================================
--- trunk/gegl/operation/gegl-operation-source.c	(original)
+++ trunk/gegl/operation/gegl-operation-source.c	Fri Jan 18 23:57:34 2008
@@ -15,6 +15,12 @@
  *
  * Copyright 2006 Ãyvind KolÃs
  */
+
+#define GEGL_INTERNAL
+#include "config.h"
+
+#include <glib-object.h>
+#include "gegl-types.h"
 #include "gegl-operation-source.h"
 #include "graph/gegl-node.h"
 #include "graph/gegl-pad.h"

Modified: trunk/gegl/operation/gegl-operation.c
==============================================================================
--- trunk/gegl/operation/gegl-operation.c	(original)
+++ trunk/gegl/operation/gegl-operation.c	Fri Jan 18 23:57:34 2008
@@ -17,6 +17,8 @@
  *           2005, 2006 Ãyvind KolÃs
  */
 
+#define GEGL_INTERNAL
+
 #include "config.h"
 
 #include <glib-object.h>

Modified: trunk/gegl/operation/gegl-operation.h
==============================================================================
--- trunk/gegl/operation/gegl-operation.h	(original)
+++ trunk/gegl/operation/gegl-operation.h	Fri Jan 18 23:57:34 2008
@@ -22,7 +22,15 @@
 
 #include <glib-object.h>
 #include <babl/babl.h>
-#include "gegl-types.h"
+
+/* Evil hack to make sure types are defined */
+#ifndef GEGL_OPERATION_TYPE
+#define GEGL_OPERATION_TYPE
+typedef struct _GeglOperation        GeglOperation;
+typedef struct _GeglNodeContext      GeglNodeContext;
+typedef struct _GeglPad              GeglPad;
+#endif
+
 #include "gegl-buffer.h"
 
 G_BEGIN_DECLS
@@ -199,8 +207,6 @@
 void     gegl_operation_vector_prop_changed  (GeglVector    *vector,
                                               GeglOperation *operation);
 
-void     gegl_extension_handler_cleanup      (void);
-
 void     gegl_operation_gtype_cleanup        (void);
 
 G_END_DECLS

Modified: trunk/operations/affine/module.c
==============================================================================
--- trunk/operations/affine/module.c	(original)
+++ trunk/operations/affine/module.c	Fri Jan 18 23:57:34 2008
@@ -17,8 +17,8 @@
  */
 
 #include <glib-object.h>
+#include "gegl-types.h"
 #include <gegl-module.h>
-
 #include "module.h"
 #include "affine.h"
 

Modified: trunk/operations/color/remap.c
==============================================================================
--- trunk/operations/color/remap.c	(original)
+++ trunk/operations/color/remap.c	Fri Jan 18 23:57:34 2008
@@ -19,9 +19,17 @@
 #ifndef __GEGL_OPERATION_REMAP_H__
 #define __GEGL_OPERATION_REMAP_H__
 
+#define GEGL_INTERNAL
+#include <glib-object.h>
+#include "gegl-types.h"
+#include "graph/gegl-node.h"
+#include "gegl.h"
+#include "gegl-utils.h"
 #include "operation/gegl-operation.h"
 #include "gegl-module.h"
 
+
+
 G_BEGIN_DECLS
 
 #define GEGL_TYPE_OPERATION_REMAP            (gegl_operation_remap_get_type ())
@@ -52,7 +60,8 @@
 
 /***************************************************************************/
 
-#include "graph/gegl-pad.h"
+#include "gegl-types.h"  /* FIXME: this include should not be needed */
+#include "graph/gegl-pad.h"  /*FIXME: neither should these */
 #include "graph/gegl-node.h"
 #include <math.h>
 #include <string.h>

Modified: trunk/operations/core/clone.c
==============================================================================
--- trunk/operations/core/clone.c	(original)
+++ trunk/operations/core/clone.c	Fri Jan 18 23:57:34 2008
@@ -19,6 +19,11 @@
 #ifndef __GEGL_OPERATION_CLONE_H__
 #define __GEGL_OPERATION_CLONE_H__
 
+#define GEGL_INTERNAL
+#include <glib-object.h>
+#include "gegl-types.h"
+#include "graph/gegl-node.h"
+#include "gegl.h"
 #include "operation/gegl-operation.h"
 #include "gegl-module.h"
 

Modified: trunk/operations/core/crop.c
==============================================================================
--- trunk/operations/core/crop.c	(original)
+++ trunk/operations/core/crop.c	Fri Jan 18 23:57:34 2008
@@ -19,11 +19,18 @@
 #ifndef __GEGL_OPERATION_CROP_H__
 #define __GEGL_OPERATION_CROP_H__
 
-#include "operation/gegl-operation.h"
+
+#define GEGL_INTERNAL
+#include <glib-object.h>
+#include "gegl-types.h"
+#include "graph/gegl-node.h"
+#include "gegl.h"
 #include "gegl-utils.h"
+#include "operation/gegl-operation.h"
 #include "gegl-module.h"
 
 
+
 G_BEGIN_DECLS
 
 #define GEGL_TYPE_OPERATION_CROP            (gegl_operation_crop_get_type ())

Modified: trunk/operations/core/nop.c
==============================================================================
--- trunk/operations/core/nop.c	(original)
+++ trunk/operations/core/nop.c	Fri Jan 18 23:57:34 2008
@@ -19,9 +19,16 @@
 #ifndef __GEGL_OPERATION_NOP_H__
 #define __GEGL_OPERATION_NOP_H__
 
+#define GEGL_INTERNAL
+#include <glib-object.h>
+#include "gegl-types.h"
+#include "graph/gegl-node.h"
+#include "gegl.h"
+#include "gegl-utils.h"
 #include "operation/gegl-operation.h"
 #include "gegl-module.h"
 
+
 G_BEGIN_DECLS
 
 #define GEGL_TYPE_OPERATION_NOP            (gegl_operation_nop_get_type ())

Modified: trunk/operations/core/shift.c
==============================================================================
--- trunk/operations/core/shift.c	(original)
+++ trunk/operations/core/shift.c	Fri Jan 18 23:57:34 2008
@@ -19,9 +19,17 @@
 #ifndef __GEGL_OPERATION_SHIFT_H__
 #define __GEGL_OPERATION_SHIFT_H__
 
+
+#define GEGL_INTERNAL
+#include <glib-object.h>
+#include "gegl-types.h"
+#include "graph/gegl-node.h"
+#include "gegl.h"
+#include "gegl-utils.h"
 #include "operation/gegl-operation.h"
 #include "gegl-module.h"
 
+
 G_BEGIN_DECLS
 
 #define GEGL_TYPE_OPERATION_SHIFT            (gegl_operation_shift_get_type ())
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]