GNOME.org
 

gegl r2929 - in trunk: . gegl gegl/buffer gegl/graph gegl/operation gegl/process gegl/property-types

Author: martinn
Date: Sun Feb 22 07:40:26 2009
New Revision: 2929
URL: http://svn.gnome.org/viewvc/gegl?rev=2929&view=rev

Log:
Remove the GEGL_INTERNAL define

Remove the GEGL_INTERNAL define and instead of having incompatible
public and internal APIs kept under control through preprocessing,
make the internals depend on the public API and use the strategy of
having a public API that is a subset of the internal API.

Modified:
   trunk/ChangeLog
   trunk/gegl/buffer/Makefile.am
   trunk/gegl/buffer/gegl-buffer-access.c
   trunk/gegl/buffer/gegl-buffer-iterator.c
   trunk/gegl/buffer/gegl-buffer-linear.c
   trunk/gegl/buffer/gegl-buffer-load.c
   trunk/gegl/buffer/gegl-buffer-save.c
   trunk/gegl/buffer/gegl-buffer-share.c
   trunk/gegl/buffer/gegl-buffer.c
   trunk/gegl/buffer/gegl-cache.c
   trunk/gegl/buffer/gegl-region-generic.c
   trunk/gegl/buffer/gegl-sampler-cubic.c
   trunk/gegl/buffer/gegl-sampler-lanczos.c
   trunk/gegl/buffer/gegl-sampler-linear.c
   trunk/gegl/buffer/gegl-sampler-nearest.c
   trunk/gegl/buffer/gegl-sampler-sharp.c
   trunk/gegl/buffer/gegl-sampler-yafr.c
   trunk/gegl/buffer/gegl-sampler.c
   trunk/gegl/buffer/gegl-tile-backend-file.c
   trunk/gegl/buffer/gegl-tile-handler-cache.c
   trunk/gegl/buffer/gegl-tile-storage.c
   trunk/gegl/buffer/gegl-tile.c
   trunk/gegl/gegl-config.c
   trunk/gegl/gegl-dot.c
   trunk/gegl/gegl-types-internal.h
   trunk/gegl/gegl-types.h
   trunk/gegl/gegl-utils.c
   trunk/gegl/graph/Makefile.am
   trunk/gegl/graph/gegl-connection.c
   trunk/gegl/graph/gegl-node.c
   trunk/gegl/graph/gegl-pad.c
   trunk/gegl/graph/gegl-visitor.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-composer3.c
   trunk/gegl/operation/gegl-operation-context.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-composer3.c
   trunk/gegl/operation/gegl-operation-point-filter.c
   trunk/gegl/operation/gegl-operation-point-render.c
   trunk/gegl/operation/gegl-operation-processors.c
   trunk/gegl/operation/gegl-operation-sink.c
   trunk/gegl/operation/gegl-operation-source.c
   trunk/gegl/operation/gegl-operation-temporal.c
   trunk/gegl/operation/gegl-operation.c
   trunk/gegl/operation/gegl-operations.c
   trunk/gegl/process/Makefile.am
   trunk/gegl/process/gegl-cr-visitor.c
   trunk/gegl/process/gegl-debug-rect-visitor.c
   trunk/gegl/process/gegl-eval-mgr.c
   trunk/gegl/process/gegl-eval-visitor.c
   trunk/gegl/process/gegl-finish-visitor.c
   trunk/gegl/process/gegl-have-visitor.c
   trunk/gegl/process/gegl-prepare-visitor.c
   trunk/gegl/process/gegl-processor.c
   trunk/gegl/process/gegl-processor.h
   trunk/gegl/property-types/gegl-color.c
   trunk/gegl/property-types/gegl-curve.c
   trunk/gegl/property-types/gegl-path.c

Modified: trunk/gegl/buffer/Makefile.am
==============================================================================
--- trunk/gegl/buffer/Makefile.am	(original)
+++ trunk/gegl/buffer/Makefile.am	Sun Feb 22 07:40:26 2009
@@ -74,8 +74,9 @@
 libbuffer_la_SOURCES = $(BUFFER_sources) $(BUFFER_headers)
 
 INCLUDES = \
-	   -I$(top_srcdir)	\
-	   -I$(top_srcdir)/gegl	\
-	   -I$(top_srcdir)/gegl/buffer	\
-	   @DEP_CFLAGS@ @BABL_CFLAGS@
+	-I$(top_srcdir)				\
+	-I$(top_srcdir)/gegl			\
+	-I$(top_srcdir)/gegl/property-types	\
+	-I$(top_srcdir)/gegl/buffer		\
+	@DEP_CFLAGS@ @BABL_CFLAGS@
 

Modified: trunk/gegl/buffer/gegl-buffer-access.c
==============================================================================
--- trunk/gegl/buffer/gegl-buffer-access.c	(original)
+++ trunk/gegl/buffer/gegl-buffer-access.c	Sun Feb 22 07:40:26 2009
@@ -26,6 +26,7 @@
 #include <gio/gio.h>
 #endif
 
+#include "gegl.h"
 #include "gegl-types-internal.h"
 #include "gegl-buffer-types.h"
 #include "gegl-buffer.h"

Modified: trunk/gegl/buffer/gegl-buffer-iterator.c
==============================================================================
--- trunk/gegl/buffer/gegl-buffer-iterator.c	(original)
+++ trunk/gegl/buffer/gegl-buffer-iterator.c	Sun Feb 22 07:40:26 2009
@@ -24,6 +24,7 @@
 #include <glib-object.h>
 #include <glib/gprintf.h>
 
+#include "gegl.h"
 #include "gegl-types-internal.h"
 #include "gegl-buffer-types.h"
 #include "gegl-buffer-iterator.h"

Modified: trunk/gegl/buffer/gegl-buffer-linear.c
==============================================================================
--- trunk/gegl/buffer/gegl-buffer-linear.c	(original)
+++ trunk/gegl/buffer/gegl-buffer-linear.c	Sun Feb 22 07:40:26 2009
@@ -5,6 +5,7 @@
 #include <glib-object.h>
 #include <glib/gprintf.h>
 
+#include "gegl.h"
 #include "gegl-types-internal.h"
 #include "gegl-buffer-types.h"
 #include "gegl-buffer-private.h"

Modified: trunk/gegl/buffer/gegl-buffer-load.c
==============================================================================
--- trunk/gegl/buffer/gegl-buffer-load.c	(original)
+++ trunk/gegl/buffer/gegl-buffer-load.c	Sun Feb 22 07:40:26 2009
@@ -31,6 +31,7 @@
 #endif
 #include <glib-object.h>
 
+#include "gegl.h"
 #include "gegl-types-internal.h"
 #include "gegl-buffer-types.h"
 #include "gegl-buffer.h"

Modified: trunk/gegl/buffer/gegl-buffer-save.c
==============================================================================
--- trunk/gegl/buffer/gegl-buffer-save.c	(original)
+++ trunk/gegl/buffer/gegl-buffer-save.c	Sun Feb 22 07:40:26 2009
@@ -33,6 +33,7 @@
 
 #include "gegl-types-internal.h"
 
+#include "gegl.h"
 #include "gegl-buffer-types.h"
 #include "gegl-buffer.h"
 #include "gegl-buffer-private.h"

Modified: trunk/gegl/buffer/gegl-buffer-share.c
==============================================================================
--- trunk/gegl/buffer/gegl-buffer-share.c	(original)
+++ trunk/gegl/buffer/gegl-buffer-share.c	Sun Feb 22 07:40:26 2009
@@ -22,6 +22,7 @@
 #include <glib-object.h>
 #include <glib/gprintf.h>
 
+#include "gegl.h"
 #include "gegl-types-internal.h"
 #include "gegl-buffer-types.h"
 #include "gegl-buffer.h"

Modified: trunk/gegl/buffer/gegl-buffer.c
==============================================================================
--- trunk/gegl/buffer/gegl-buffer.c	(original)
+++ trunk/gegl/buffer/gegl-buffer.c	Sun Feb 22 07:40:26 2009
@@ -45,8 +45,8 @@
 #include <gio/gio.h>
 #endif
 
+#include "gegl.h"
 #include "gegl-types-internal.h"
-
 #include "gegl-buffer-types.h"
 #include "gegl-buffer.h"
 #include "gegl-buffer-private.h"

Modified: trunk/gegl/buffer/gegl-cache.c
==============================================================================
--- trunk/gegl/buffer/gegl-cache.c	(original)
+++ trunk/gegl/buffer/gegl-cache.c	Sun Feb 22 07:40:26 2009
@@ -24,6 +24,7 @@
 
 #include <babl/babl.h>
 
+#include "gegl.h"
 #include "gegl-types-internal.h"
 #include "gegl-utils.h"
 

Modified: trunk/gegl/buffer/gegl-region-generic.c
==============================================================================
--- trunk/gegl/buffer/gegl-region-generic.c	(original)
+++ trunk/gegl/buffer/gegl-region-generic.c	Sun Feb 22 07:40:26 2009
@@ -74,7 +74,9 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <gegl-region.h>
+
+#include "gegl.h"
+#include "gegl-region.h"
 #include "gegl-region-generic.h"
 
 typedef void (* overlapFunc)    (GeglRegion    *pReg,

Modified: trunk/gegl/buffer/gegl-sampler-cubic.c
==============================================================================
--- trunk/gegl/buffer/gegl-sampler-cubic.c	(original)
+++ trunk/gegl/buffer/gegl-sampler-cubic.c	Sun Feb 22 07:40:26 2009
@@ -14,14 +14,17 @@
  * License along with GEGL; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <string.h>
+#include <math.h>
+
 #include <glib-object.h>
 #include <glib/gstdio.h>
 #include <glib/gprintf.h>
+
+#include "gegl.h"
 #include "gegl-types-internal.h"
 #include "gegl-buffer-private.h"
 #include "gegl-sampler-cubic.h"
-#include <string.h>
-#include <math.h>
 
 enum
 {

Modified: trunk/gegl/buffer/gegl-sampler-lanczos.c
==============================================================================
--- trunk/gegl/buffer/gegl-sampler-lanczos.c	(original)
+++ trunk/gegl/buffer/gegl-sampler-lanczos.c	Sun Feb 22 07:40:26 2009
@@ -19,14 +19,17 @@
  * currently not used by the rest of GeglBuffer */
 
 
+#include <string.h>
+#include <math.h>
+
 #include <glib-object.h>
 #include <glib/gstdio.h>
 #include <glib/gprintf.h>
+
+#include "gegl.h"
 #include "gegl-types-internal.h"
 #include "gegl-buffer-private.h"
 #include "gegl-sampler-lanczos.h"
-#include <string.h>
-#include <math.h>
 
 
 enum

Modified: trunk/gegl/buffer/gegl-sampler-linear.c
==============================================================================
--- trunk/gegl/buffer/gegl-sampler-linear.c	(original)
+++ trunk/gegl/buffer/gegl-sampler-linear.c	Sun Feb 22 07:40:26 2009
@@ -61,6 +61,8 @@
 #include <glib-object.h>
 #include <glib/gstdio.h>
 #include <glib/gprintf.h>
+
+#include "gegl.h"
 #include "gegl-types-internal.h"
 #include "gegl-buffer-private.h"
 #include "gegl-sampler-linear.h"

Modified: trunk/gegl/buffer/gegl-sampler-nearest.c
==============================================================================
--- trunk/gegl/buffer/gegl-sampler-nearest.c	(original)
+++ trunk/gegl/buffer/gegl-sampler-nearest.c	Sun Feb 22 07:40:26 2009
@@ -15,11 +15,15 @@
  *
  */
 
+#include <string.h>
+
 #include <glib-object.h>
+
+#include "gegl.h"
 #include "gegl-types-internal.h"
 #include "gegl-buffer-private.h"
 #include "gegl-sampler-nearest.h"
-#include <string.h>
+
 
 enum
 {

Modified: trunk/gegl/buffer/gegl-sampler-sharp.c
==============================================================================
--- trunk/gegl/buffer/gegl-sampler-sharp.c	(original)
+++ trunk/gegl/buffer/gegl-sampler-sharp.c	Sun Feb 22 07:40:26 2009
@@ -174,6 +174,8 @@
  */
 
 #include <glib-object.h>
+
+#include "gegl.h"
 #include "gegl-types-internal.h"
 #include "gegl-buffer-private.h"
 #include "gegl-sampler-sharp.h"

Modified: trunk/gegl/buffer/gegl-sampler-yafr.c
==============================================================================
--- trunk/gegl/buffer/gegl-sampler-yafr.c	(original)
+++ trunk/gegl/buffer/gegl-sampler-yafr.c	Sun Feb 22 07:40:26 2009
@@ -23,6 +23,8 @@
  */
 
 #include <glib-object.h>
+
+#include "gegl.h"
 #include "gegl-types-internal.h"
 #include "gegl-buffer-private.h"
 #include "gegl-sampler-yafr.h"

Modified: trunk/gegl/buffer/gegl-sampler.c
==============================================================================
--- trunk/gegl/buffer/gegl-sampler.c	(original)
+++ trunk/gegl/buffer/gegl-sampler.c	Sun Feb 22 07:40:26 2009
@@ -21,6 +21,7 @@
 #include <glib-object.h>
 #include <string.h>
 
+#include "gegl.h"
 #include "gegl-types-internal.h"
 #include "gegl-buffer.h"
 #include "gegl-utils.h"

Modified: trunk/gegl/buffer/gegl-tile-backend-file.c
==============================================================================
--- trunk/gegl/buffer/gegl-tile-backend-file.c	(original)
+++ trunk/gegl/buffer/gegl-tile-backend-file.c	Sun Feb 22 07:40:26 2009
@@ -32,6 +32,7 @@
 #include <glib-object.h>
 #include <glib/gprintf.h>
 
+#include "gegl.h"
 #include "gegl-tile-backend.h"
 #include "gegl-tile-backend-file.h"
 #include "gegl-buffer-index.h"

Modified: trunk/gegl/buffer/gegl-tile-handler-cache.c
==============================================================================
--- trunk/gegl/buffer/gegl-tile-handler-cache.c	(original)
+++ trunk/gegl/buffer/gegl-tile-handler-cache.c	Sun Feb 22 07:40:26 2009
@@ -21,7 +21,8 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include "../gegl-types-internal.h"
+#include "gegl.h"
+#include "gegl-types-internal.h"
 #include "gegl-config.h"
 #include "gegl-buffer.h"
 #include "gegl-buffer-private.h"

Modified: trunk/gegl/buffer/gegl-tile-storage.c
==============================================================================
--- trunk/gegl/buffer/gegl-tile-storage.c	(original)
+++ trunk/gegl/buffer/gegl-tile-storage.c	Sun Feb 22 07:40:26 2009
@@ -20,6 +20,7 @@
 
 #include <glib-object.h>
 
+#include "gegl.h"
 #include "gegl-tile-storage.h"
 #include "gegl-tile.h"
 #include "gegl-tile-backend-file.h"

Modified: trunk/gegl/buffer/gegl-tile.c
==============================================================================
--- trunk/gegl/buffer/gegl-tile.c	(original)
+++ trunk/gegl/buffer/gegl-tile.c	Sun Feb 22 07:40:26 2009
@@ -28,6 +28,7 @@
 
 #include "gegl-types-internal.h"
 
+#include "gegl.h"
 #include "gegl-buffer.h"
 #include "gegl-buffer-private.h"
 #include "gegl-tile.h"

Modified: trunk/gegl/gegl-config.c
==============================================================================
--- trunk/gegl/gegl-config.c	(original)
+++ trunk/gegl/gegl-config.c	Sun Feb 22 07:40:26 2009
@@ -20,6 +20,7 @@
 #include <string.h>
 #include <glib/gprintf.h>
 
+#include "gegl.h"
 #include "gegl-types-internal.h"
 #include "gegl-config.h"
 

Modified: trunk/gegl/gegl-dot.c
==============================================================================
--- trunk/gegl/gegl-dot.c	(original)
+++ trunk/gegl/gegl-dot.c	Sun Feb 22 07:40:26 2009
@@ -21,7 +21,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <glib-object.h>
-#define  GEGL_INTERNAL
+
+#include "gegl.h"
 #include "gegl-types-internal.h"
 #include "graph/gegl-node.h"
 #include "graph/gegl-pad.h"

Modified: trunk/gegl/gegl-types-internal.h
==============================================================================
--- trunk/gegl/gegl-types-internal.h	(original)
+++ trunk/gegl/gegl-types-internal.h	Sun Feb 22 07:40:26 2009
@@ -22,30 +22,6 @@
 
 G_BEGIN_DECLS
 
-#ifndef __GEGL_H__
-typedef struct _GeglColor            GeglColor;
-typedef struct _GeglConfig           GeglConfig;
-typedef struct _GeglCurve            GeglCurve;
-typedef struct _GeglNode             GeglNode;
-typedef struct _GeglPath             GeglPath;
-typedef struct _GeglProcessor        GeglProcessor;
-typedef struct _GeglRectangle        GeglRectangle;
-
-struct _GeglRectangle
-{
-  gint x;
-  gint y;
-  gint width;
-  gint height;
-};
-
-typedef enum
-{
-  GEGL_PARAM_PAD_OUTPUT = 1 << G_PARAM_USER_SHIFT,
-  GEGL_PARAM_PAD_INPUT  = 1 << (G_PARAM_USER_SHIFT + 1)
-} GeglPadType;
-
-#endif
 typedef struct _GeglCRVisitor        GeglCRVisitor;
 typedef struct _GeglDebugRectVisitor GeglDebugRectVisitor;
 typedef struct _GeglEvalMgr          GeglEvalMgr;

Modified: trunk/gegl/gegl-types.h
==============================================================================
--- trunk/gegl/gegl-types.h	(original)
+++ trunk/gegl/gegl-types.h	Sun Feb 22 07:40:26 2009
@@ -22,8 +22,6 @@
 
 G_BEGIN_DECLS
 
-#ifndef GEGL_INTERNAL /* These declarations duplicate internal ones in GEGL */
-
 #ifndef GEGL_TYPE_NODE
 typedef struct _GeglNode  GeglNode;
 GType gegl_node_get_type  (void) G_GNUC_CONST;
@@ -35,7 +33,6 @@
 typedef struct _GeglRectangle GeglRectangle;
 GType gegl_rectangle_get_type (void) G_GNUC_CONST;
 #define GEGL_TYPE_RECTANGLE   (gegl_rectangle_get_type())
-#endif
 
 #ifndef GEGL_BLIT_FLAGS
 #define  GEGL_BLIT_FLAGS
@@ -51,19 +48,14 @@
 #define GEGL_AUTO_ROWSTRIDE 0
 #endif
 
-#ifndef GEGL_INTERNAL
 typedef struct _GeglProcessor  GeglProcessor;
 GType gegl_processor_get_type  (void) G_GNUC_CONST;
 #define GEGL_TYPE_PROCESSOR    (gegl_processor_get_type())
 #define GEGL_PROCESSOR(obj)    (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_PROCESSOR, GeglProcessor))
 #define GEGL_IS_PROCESSOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_PROCESSOR))
-#endif
 
-#ifndef GEGL_INTERNAL
 typedef struct _GeglConfig GeglConfig;
-#endif
 
-#ifndef GEGL_INTERNAL
 
 struct _GeglRectangle
 {
@@ -84,7 +76,6 @@
 typedef struct _GeglCurve  GeglCurve;
 typedef struct _GeglPath   GeglPath;
 typedef struct _GeglColor  GeglColor;
-#endif
 
 G_END_DECLS
 

Modified: trunk/gegl/gegl-utils.c
==============================================================================
--- trunk/gegl/gegl-utils.c	(original)
+++ trunk/gegl/gegl-utils.c	Sun Feb 22 07:40:26 2009
@@ -20,8 +20,8 @@
 
 #include <glib-object.h>
 
+#include "gegl.h"
 #include "gegl-types-internal.h"
-
 #include "gegl-utils.h"
 #include "gegl-types-internal.h"
 

Modified: trunk/gegl/graph/Makefile.am
==============================================================================
--- trunk/gegl/graph/Makefile.am	(original)
+++ trunk/gegl/graph/Makefile.am	Sun Feb 22 07:40:26 2009
@@ -21,8 +21,9 @@
 #libgraphincludedir = $(includedir)/gegl-$(GEGL_API_VERSION)/gegl/graph
 
 INCLUDES = \
-	   -I$(top_srcdir)		\
-	   -I$(top_srcdir)/gegl		\
-	   -I$(top_srcdir)/gegl/buffer	\
-	   @DEP_CFLAGS@ @BABL_CFLAGS@
+	-I$(top_srcdir)				\
+	-I$(top_srcdir)/gegl			\
+	-I$(top_srcdir)/gegl/property-types	\
+	-I$(top_srcdir)/gegl/buffer		\
+	@DEP_CFLAGS@ @BABL_CFLAGS@
 

Modified: trunk/gegl/graph/gegl-connection.c
==============================================================================
--- trunk/gegl/graph/gegl-connection.c	(original)
+++ trunk/gegl/graph/gegl-connection.c	Sun Feb 22 07:40:26 2009
@@ -18,6 +18,8 @@
 
 #include "config.h"
 #include <glib-object.h>
+
+#include "gegl.h"
 #include "gegl-types-internal.h"
 #include "gegl-connection.h"
 

Modified: trunk/gegl/graph/gegl-node.c
==============================================================================
--- trunk/gegl/graph/gegl-node.c	(original)
+++ trunk/gegl/graph/gegl-node.c	Sun Feb 22 07:40:26 2009
@@ -17,8 +17,6 @@
  *           2006 Ãyvind KolÃs
  */
 
-#define GEGL_INTERNAL
-
 #include "config.h"
 
 #include <string.h>
@@ -28,6 +26,7 @@
 
 #include "gegl-types-internal.h"
 
+#include "gegl.h"
 #include "gegl-node.h"
 #include "gegl-connection.h"
 #include "gegl-pad.h"

Modified: trunk/gegl/graph/gegl-pad.c
==============================================================================
--- trunk/gegl/graph/gegl-pad.c	(original)
+++ trunk/gegl/graph/gegl-pad.c	Sun Feb 22 07:40:26 2009
@@ -21,8 +21,9 @@
 
 #include <glib-object.h>
 
+#include "gegl.h"
 #include "gegl-types-internal.h"
-
+#include "gegl-buffer-types.h"
 #include "gegl-node.h"
 #include "gegl-pad.h"
 #include "gegl-visitor.h"

Modified: trunk/gegl/graph/gegl-visitor.c
==============================================================================
--- trunk/gegl/graph/gegl-visitor.c	(original)
+++ trunk/gegl/graph/gegl-visitor.c	Sun Feb 22 07:40:26 2009
@@ -22,6 +22,7 @@
 
 #include "gegl-types-internal.h"
 
+#include "gegl.h"
 #include "graph/gegl-node.h"
 #include "graph/gegl-pad.h"
 #include "gegl-visitor.h"

Modified: trunk/gegl/operation/Makefile.am
==============================================================================
--- trunk/gegl/operation/Makefile.am	(original)
+++ trunk/gegl/operation/Makefile.am	Sun Feb 22 07:40:26 2009
@@ -58,8 +58,9 @@
 liboperationincludedir = $(includedir)/gegl-$(GEGL_API_VERSION)/operation
 
 INCLUDES = \
-	   -I$(top_srcdir)		\
-	   -I$(top_srcdir)/gegl		\
-	   -I$(top_srcdir)/gegl/buffer	\
-	   @DEP_CFLAGS@ @BABL_CFLAGS@
+	-I$(top_srcdir)			\
+	-I$(top_srcdir)/gegl			\
+	-I$(top_srcdir)/gegl/property-types	\
+	-I$(top_srcdir)/gegl/buffer		\
+	@DEP_CFLAGS@ @BABL_CFLAGS@
 

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	Sun Feb 22 07:40:26 2009
@@ -16,15 +16,15 @@
  * Copyright 2007 Ãyvind KolÃs
  */
 
-#define GEGL_INTERNAL
-
 #include "config.h"
 
-#include <glib-object.h>
+#include <math.h>
 #include <string.h>
+#include <glib-object.h>
+
+#include "gegl.h"
 #include "gegl-types-internal.h"
 #include "gegl-operation-area-filter.h"
-#include <math.h>
 #include "gegl-utils.h"
 #include "graph/gegl-node.h"
 #include "graph/gegl-connection.h"

Modified: trunk/gegl/operation/gegl-operation-composer.c
==============================================================================
--- trunk/gegl/operation/gegl-operation-composer.c	(original)
+++ trunk/gegl/operation/gegl-operation-composer.c	Sun Feb 22 07:40:26 2009
@@ -16,12 +16,12 @@
  * Copyright 2006 Ãyvind KolÃs
  */
 
-#define GEGL_INTERNAL
-
 #include "config.h"
 
 #include <glib-object.h>
 #include <string.h>
+
+#include "gegl.h"
 #include "gegl-types-internal.h"
 #include "gegl-operation-composer.h"
 #include "gegl-utils.h"

Modified: trunk/gegl/operation/gegl-operation-composer3.c
==============================================================================
--- trunk/gegl/operation/gegl-operation-composer3.c	(original)
+++ trunk/gegl/operation/gegl-operation-composer3.c	Sun Feb 22 07:40:26 2009
@@ -16,12 +16,12 @@
  * Copyright 2006 Ãyvind KolÃs
  */
 
-#define GEGL_INTERNAL
-
 #include "config.h"
 
 #include <glib-object.h>
 #include <string.h>
+
+#include "gegl.h"
 #include "gegl-types-internal.h"
 #include "gegl-operation-composer3.h"
 #include "gegl-utils.h"

Modified: trunk/gegl/operation/gegl-operation-context.c
==============================================================================
--- trunk/gegl/operation/gegl-operation-context.c	(original)
+++ trunk/gegl/operation/gegl-operation-context.c	Sun Feb 22 07:40:26 2009
@@ -19,14 +19,12 @@
 
 #include "config.h"
 
-#define GEGL_INTERNAL
-
 #include <string.h>
 
 #include <glib-object.h>
 
+#include "gegl.h"
 #include "gegl-types-internal.h"
-
 #include "gegl-operation-context.h"
 #include "gegl/graph/gegl-node.h"
 #include "gegl-config.h"

Modified: trunk/gegl/operation/gegl-operation-filter.c
==============================================================================
--- trunk/gegl/operation/gegl-operation-filter.c	(original)
+++ trunk/gegl/operation/gegl-operation-filter.c	Sun Feb 22 07:40:26 2009
@@ -16,12 +16,12 @@
  * Copyright 2006 Ãyvind KolÃs
  */
 
-#define GEGL_INTERNAL
-
 #include "config.h"
 
 #include <glib-object.h>
 #include <string.h>
+
+#include "gegl.h"
 #include "gegl-types-internal.h"
 #include "gegl-operation-filter.h"
 #include "gegl-utils.h"

Modified: trunk/gegl/operation/gegl-operation-meta.c
==============================================================================
--- trunk/gegl/operation/gegl-operation-meta.c	(original)
+++ trunk/gegl/operation/gegl-operation-meta.c	Sun Feb 22 07:40:26 2009
@@ -16,10 +16,11 @@
  * Copyright 2006 Ãyvind KolÃs
  */
 
-#define GEGL_INTERNAL
 #include "config.h"
 
 #include <glib-object.h>
+
+#include "gegl.h"
 #include "gegl-types-internal.h"
 #include "gegl-operation-meta.h"
 #include "graph/gegl-node.h"

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	Sun Feb 22 07:40:26 2009
@@ -17,10 +17,11 @@
  */
 
 
-#define GEGL_INTERNAL
 #include "config.h"
 
 #include <glib-object.h>
+
+#include "gegl.h"
 #include "gegl-types-internal.h"
 #include "gegl-operation-point-composer.h"
 #include "gegl-utils.h"

Modified: trunk/gegl/operation/gegl-operation-point-composer3.c
==============================================================================
--- trunk/gegl/operation/gegl-operation-point-composer3.c	(original)
+++ trunk/gegl/operation/gegl-operation-point-composer3.c	Sun Feb 22 07:40:26 2009
@@ -17,10 +17,11 @@
  */
 
 
-#define GEGL_INTERNAL
 #include "config.h"
 
 #include <glib-object.h>
+
+#include "gegl.h"
 #include "gegl-types-internal.h"
 #include "gegl-operation-point-composer3.h"
 #include "gegl-utils.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	Sun Feb 22 07:40:26 2009
@@ -17,10 +17,11 @@
  */
 
 
-#define GEGL_INTERNAL
 #include "config.h"
 
 #include <glib-object.h>
+
+#include "gegl.h"
 #include "gegl-types-internal.h"
 #include "gegl-operation-point-filter.h"
 #include "graph/gegl-pad.h"

Modified: trunk/gegl/operation/gegl-operation-point-render.c
==============================================================================
--- trunk/gegl/operation/gegl-operation-point-render.c	(original)
+++ trunk/gegl/operation/gegl-operation-point-render.c	Sun Feb 22 07:40:26 2009
@@ -17,17 +17,18 @@
  */
 
 
-#define GEGL_INTERNAL
 #include "config.h"
 
+#include <string.h>
+
 #include <glib-object.h>
+
+#include "gegl.h"
 #include "gegl-types-internal.h"
 #include "gegl-operation-point-render.h"
 #include "graph/gegl-pad.h"
 #include "graph/gegl-node.h"
 #include "gegl-utils.h"
-#include <string.h>
-
 #include "gegl-buffer-private.h"
 #include "gegl-tile-storage.h"
 

Modified: trunk/gegl/operation/gegl-operation-processors.c
==============================================================================
--- trunk/gegl/operation/gegl-operation-processors.c	(original)
+++ trunk/gegl/operation/gegl-operation-processors.c	Sun Feb 22 07:40:26 2009
@@ -17,15 +17,14 @@
  *           2005-2008 Ãyvind KolÃs
  */
 
-#define GEGL_INTERNAL
-
 #include "config.h"
 
 #include <glib-object.h>
 #include <string.h>
 
+#include "gegl.h"
 #include "gegl-types-internal.h"
-#include  "gegl-config.h"
+#include "gegl-config.h"
 #include "gegl-operation.h"
 #include "gegl-utils.h"
 #include "gegl-cpuaccel.h"

Modified: trunk/gegl/operation/gegl-operation-sink.c
==============================================================================
--- trunk/gegl/operation/gegl-operation-sink.c	(original)
+++ trunk/gegl/operation/gegl-operation-sink.c	Sun Feb 22 07:40:26 2009
@@ -16,15 +16,17 @@
  * Copyright 2006 Ãyvind KolÃs
  */
 
-#define GEGL_INTERNAL
 #include "config.h"
 
+#include <string.h>
+
 #include <glib-object.h>
+
+#include "gegl.h"
 #include "gegl-types-internal.h"
 #include "gegl-operation-sink.h"
 #include "graph/gegl-node.h"
 #include "graph/gegl-pad.h"
-#include <string.h>
 
 
 enum

Modified: trunk/gegl/operation/gegl-operation-source.c
==============================================================================
--- trunk/gegl/operation/gegl-operation-source.c	(original)
+++ trunk/gegl/operation/gegl-operation-source.c	Sun Feb 22 07:40:26 2009
@@ -16,15 +16,17 @@
  * Copyright 2006 Ãyvind KolÃs
  */
 
-#define GEGL_INTERNAL
 #include "config.h"
 
+#include <string.h>
+
 #include <glib-object.h>
+
+#include "gegl.h"
 #include "gegl-types-internal.h"
 #include "gegl-operation-source.h"
 #include "graph/gegl-node.h"
 #include "graph/gegl-pad.h"
-#include <string.h>
 
 enum
 {

Modified: trunk/gegl/operation/gegl-operation-temporal.c
==============================================================================
--- trunk/gegl/operation/gegl-operation-temporal.c	(original)
+++ trunk/gegl/operation/gegl-operation-temporal.c	Sun Feb 22 07:40:26 2009
@@ -16,12 +16,12 @@
  * Copyright 2008 Ãyvind KolÃs
  */
 
-#define GEGL_INTERNAL
-
 #include "config.h"
 
 #include <glib-object.h>
 #include <string.h>
+
+#include "gegl.h"
 #include "gegl-types-internal.h"
 #include "gegl-operation-temporal.h"
 #include "gegl-utils.h"

Modified: trunk/gegl/operation/gegl-operation.c
==============================================================================
--- trunk/gegl/operation/gegl-operation.c	(original)
+++ trunk/gegl/operation/gegl-operation.c	Sun Feb 22 07:40:26 2009
@@ -17,13 +17,12 @@
  *           2005-2008 Ãyvind KolÃs
  */
 
-#define GEGL_INTERNAL
-
 #include "config.h"
 
 #include <glib-object.h>
 #include <string.h>
 
+#include "gegl.h"
 #include "gegl-types-internal.h"
 #include "gegl-operation.h"
 #include "gegl-utils.h"

Modified: trunk/gegl/operation/gegl-operations.c
==============================================================================
--- trunk/gegl/operation/gegl-operations.c	(original)
+++ trunk/gegl/operation/gegl-operations.c	Sun Feb 22 07:40:26 2009
@@ -17,13 +17,12 @@
  *           2005-2008 Ãyvind KolÃs
  */
 
-#define GEGL_INTERNAL
-
 #include "config.h"
 
 #include <glib-object.h>
 #include <string.h>
 
+#include "gegl.h"
 #include "gegl-types-internal.h"
 #include "gegl-utils.h"
 #include "gegl-operation.h"

Modified: trunk/gegl/process/Makefile.am
==============================================================================
--- trunk/gegl/process/Makefile.am	(original)
+++ trunk/gegl/process/Makefile.am	Sun Feb 22 07:40:26 2009
@@ -28,7 +28,8 @@
 #libprocessincludedir = $(includedir)/gegl-$(GEGL_API_VERSION)/gegl/process
 
 INCLUDES = \
-	   -I$(top_srcdir)		\
-	   -I$(top_srcdir)/gegl		\
-	   -I$(top_srcdir)/gegl/buffer	\
-	   @DEP_CFLAGS@ @BABL_CFLAGS@
+	-I$(top_srcdir)				\
+	-I$(top_srcdir)/gegl			\
+	-I$(top_srcdir)/gegl/property-types	\
+	-I$(top_srcdir)/gegl/buffer		\
+	@DEP_CFLAGS@ @BABL_CFLAGS@

Modified: trunk/gegl/process/gegl-cr-visitor.c
==============================================================================
--- trunk/gegl/process/gegl-cr-visitor.c	(original)
+++ trunk/gegl/process/gegl-cr-visitor.c	Sun Feb 22 07:40:26 2009
@@ -21,8 +21,8 @@
 #include <glib-object.h>
 #include <string.h>
 
+#include "gegl.h"
 #include "gegl-types-internal.h"
-
 #include "gegl-cr-visitor.h"
 #include "operation/gegl-operation.h"
 #include "operation/gegl-operation-context.h"

Modified: trunk/gegl/process/gegl-debug-rect-visitor.c
==============================================================================
--- trunk/gegl/process/gegl-debug-rect-visitor.c	(original)
+++ trunk/gegl/process/gegl-debug-rect-visitor.c	Sun Feb 22 07:40:26 2009
@@ -23,8 +23,8 @@
 
 #include <glib-object.h>
 
+#include "gegl.h"
 #include "gegl-types-internal.h"
-
 #include "gegl-debug-rect-visitor.h"
 #include "operation/gegl-operation.h"
 #include "operation/gegl-operation-context.h"

Modified: trunk/gegl/process/gegl-eval-mgr.c
==============================================================================
--- trunk/gegl/process/gegl-eval-mgr.c	(original)
+++ trunk/gegl/process/gegl-eval-mgr.c	Sun Feb 22 07:40:26 2009
@@ -21,8 +21,8 @@
 
 #include <glib-object.h>
 
+#include "gegl.h"
 #include "gegl-types-internal.h"
-
 #include "gegl-eval-mgr.h"
 #include "gegl-eval-visitor.h"
 #include "gegl-debug-rect-visitor.h"

Modified: trunk/gegl/process/gegl-eval-visitor.c
==============================================================================
--- trunk/gegl/process/gegl-eval-visitor.c	(original)
+++ trunk/gegl/process/gegl-eval-visitor.c	Sun Feb 22 07:40:26 2009
@@ -21,8 +21,8 @@
 #include <glib-object.h>
 #include <string.h>
 
+#include "gegl.h"
 #include "gegl-types-internal.h"
-
 #include "gegl-eval-visitor.h"
 #include "graph/gegl-node.h"
 #include "operation/gegl-operation.h"

Modified: trunk/gegl/process/gegl-finish-visitor.c
==============================================================================
--- trunk/gegl/process/gegl-finish-visitor.c	(original)
+++ trunk/gegl/process/gegl-finish-visitor.c	Sun Feb 22 07:40:26 2009
@@ -20,6 +20,7 @@
 #include <string.h>
 #include <glib-object.h>
 
+#include "gegl.h"
 #include "gegl-types-internal.h"
 #include "gegl-finish-visitor.h"
 #include "graph/gegl-node.h"

Modified: trunk/gegl/process/gegl-have-visitor.c
==============================================================================
--- trunk/gegl/process/gegl-have-visitor.c	(original)
+++ trunk/gegl/process/gegl-have-visitor.c	Sun Feb 22 07:40:26 2009
@@ -21,8 +21,8 @@
 #include <glib-object.h>
 #include <string.h>
 
+#include "gegl.h"
 #include "gegl-types-internal.h"
-
 #include "gegl-have-visitor.h"
 #include "graph/gegl-node.h"
 #include "graph/gegl-pad.h"

Modified: trunk/gegl/process/gegl-prepare-visitor.c
==============================================================================
--- trunk/gegl/process/gegl-prepare-visitor.c	(original)
+++ trunk/gegl/process/gegl-prepare-visitor.c	Sun Feb 22 07:40:26 2009
@@ -20,6 +20,7 @@
 #include <string.h>
 #include <glib-object.h>
 
+#include "gegl.h"
 #include "gegl-types-internal.h"
 #include "gegl-prepare-visitor.h"
 #include "graph/gegl-node.h"

Modified: trunk/gegl/process/gegl-processor.c
==============================================================================
--- trunk/gegl/process/gegl-processor.c	(original)
+++ trunk/gegl/process/gegl-processor.c	Sun Feb 22 07:40:26 2009
@@ -20,8 +20,8 @@
 
 #include <glib-object.h>
 
+#include "gegl.h"
 #include "buffer/gegl-region.h"
-
 #include "graph/gegl-node.h"
 
 #include "operation/gegl-operation-sink.h"

Modified: trunk/gegl/process/gegl-processor.h
==============================================================================
--- trunk/gegl/process/gegl-processor.h	(original)
+++ trunk/gegl/process/gegl-processor.h	Sun Feb 22 07:40:26 2009
@@ -23,12 +23,14 @@
 
 G_BEGIN_DECLS
 
+#ifndef GEGL_TYPE_PROCESSOR
 #define GEGL_TYPE_PROCESSOR            (gegl_processor_get_type ())
 #define GEGL_PROCESSOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_PROCESSOR, GeglProcessor))
 #define GEGL_PROCESSOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GEGL_TYPE_PROCESSOR, GeglProcessorClass))
 #define GEGL_IS_PROCESSOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_PROCESSOR))
 #define GEGL_IS_PROCESSOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GEGL_TYPE_PROCESSOR))
 #define GEGL_PROCESSOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GEGL_TYPE_PROCESSOR, GeglProcessorClass))
+#endif
 
 typedef struct _GeglProcessorClass GeglProcessorClass;
 

Modified: trunk/gegl/property-types/gegl-color.c
==============================================================================
--- trunk/gegl/property-types/gegl-color.c	(original)
+++ trunk/gegl/property-types/gegl-color.c	Sun Feb 22 07:40:26 2009
@@ -22,8 +22,8 @@
 
 #include <glib-object.h>
 
+#include "gegl.h"
 #include "gegl-types-internal.h"
-
 #include "gegl-color.h"
 
 

Modified: trunk/gegl/property-types/gegl-curve.c
==============================================================================
--- trunk/gegl/property-types/gegl-curve.c	(original)
+++ trunk/gegl/property-types/gegl-curve.c	Sun Feb 22 07:40:26 2009
@@ -24,8 +24,8 @@
 
 #include <glib-object.h>
 
+#include "gegl.h"
 #include "gegl-types-internal.h"
-
 #include "gegl-curve.h"
 
 

Modified: trunk/gegl/property-types/gegl-path.c
==============================================================================
--- trunk/gegl/property-types/gegl-path.c	(original)
+++ trunk/gegl/property-types/gegl-path.c	Sun Feb 22 07:40:26 2009
@@ -23,11 +23,6 @@
 
 #include <glib-object.h>
 
-#include "gegl-types-internal.h"
-
-#include "gegl-buffer-private.h"
-
-
 #define GEGL_PATH_INTERNAL
 typedef struct Point
 {
@@ -41,7 +36,9 @@
   Point  point[]; /* variable length internally */
 } GeglPathItem;
 
-
+#include "gegl.h"
+#include "gegl-types-internal.h"
+#include "gegl-buffer-private.h"
 #include "gegl-path.h"
 #include "gegl-color.h"
 #include "gegl-utils.h"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]