GNOME.org
 

gegl r1885 - in trunk: . bin bin/node-editors gegl gegl/graph gegl/operation operations/affine tools

Author: ok
Date: Mon Jan 21 21:47:16 2008
New Revision: 1885
URL: http://svn.gnome.org/viewvc/gegl?rev=1885&view=rev

Log:
Started work towards a gegl-plugin.h file which will be similar to
gegl.h in that it duplicates and documents API from internal header
files. This file might replace some of the now installed headers as
we get closer to the next release.
* gegl/Makefile.am: install gegl-plugin.h
* gegl/gegl-plugin.h: replaced contents with the installed plugin-api
related headers.
* gegl/gegl-chant.h: rewrote to only include gegl-plugin.h
* gegl/gegl.h: modified multi include guards.
* gegl/graph/gegl-node.h: modified multi include guards.
* gegl/operation/gegl-operation.h: added GeglConnection to set of
types defined here (these typedefs should be moved to gegl-plugin.h)
* operations/affine/affine.c: modified to build with gegl-plugin.h as
the core include.
* tools/Makefile.am:
* bin/Makefile.am:
* bin/node-editors/Makefile.am: modified include paths to respect
needs of gegl-plugin.h


Modified:
   trunk/ChangeLog
   trunk/bin/Makefile.am
   trunk/bin/node-editors/Makefile.am
   trunk/gegl/Makefile.am
   trunk/gegl/gegl-chant.h
   trunk/gegl/gegl-plugin.h
   trunk/gegl/gegl.h
   trunk/gegl/graph/gegl-node.h
   trunk/gegl/operation/gegl-operation.h
   trunk/operations/affine/affine.c
   trunk/tools/Makefile.am

Modified: trunk/bin/Makefile.am
==============================================================================
--- trunk/bin/Makefile.am	(original)
+++ trunk/bin/Makefile.am	Mon Jan 21 21:47:16 2008
@@ -36,6 +36,9 @@
 INCLUDES = \
 	-I$(top_srcdir)	-I$(top_srcdir)/gegl -I$(top_srcdir)/gegl/buffer \
 	-I$(top_srcdir)/gegl/property-types \
+	-I$(top_srcdir)/gegl/buffer \
+	-I$(top_srcdir)/gegl/operation \
+	-I$(top_srcdir)/gegl/module \
 	@DEP_CFLAGS@ @GTK_CFLAGS@ @BABL_CFLAGS@ @PNG_CFLAGS@
 
 AM_LDFLAGS =  \

Modified: trunk/bin/node-editors/Makefile.am
==============================================================================
--- trunk/bin/node-editors/Makefile.am	(original)
+++ trunk/bin/node-editors/Makefile.am	Mon Jan 21 21:47:16 2008
@@ -10,7 +10,10 @@
 CFLAGS  += @DEP_CFLAGS@ @BABL_CFLAGS@ @GTK_CFLAGS@ \
            -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/gegl \
 	   -I$(top_srcdir)/bin -I. \
-	   -I$(top_srcdir)/gegl/buffer -fPIC
+	   -I$(top_srcdir)/gegl/buffer \
+	   -I$(top_srcdir)/gegl/operation \
+	   -I$(top_srcdir)/gegl/module \
+	   -I$(top_srcdir)/gegl/property-types -fPIC
 LDFLAGS += -shared 
 
 LDADD    = @DEP_LIBS@ @BABL_LIBS@ @GTK_LIBS@

Modified: trunk/gegl/Makefile.am
==============================================================================
--- trunk/gegl/Makefile.am	(original)
+++ trunk/gegl/Makefile.am	Mon Jan 21 21:47:16 2008
@@ -56,6 +56,7 @@
     gegl.h				\
     gegl-utils.h			\
     gegl-chant.h			\
+    gegl-plugin.h			\
     buffer/gegl-buffer.h		\
     module/geglmoduletypes.h		\
     module/geglmoduledb.h		\

Modified: trunk/gegl/gegl-chant.h
==============================================================================
--- trunk/gegl/gegl-chant.h	(original)
+++ trunk/gegl/gegl-chant.h	Mon Jan 21 21:47:16 2008
@@ -30,15 +30,7 @@
 
 /****************************************************************************/
 
-#include <string.h>
-#include <glib-object.h>
-
-#include <gegl.h>
-#include <gegl-utils.h>
-#include <gegl-buffer.h>
-#include <operation/gegl-operation.h>
-/*#include "property-types/gegl-color.h"*/
-#include <gegl-paramspecs.h>
+#include <gegl-plugin.h>
 
 
 #ifdef GEGL_CHANT_SOURCE
@@ -148,9 +140,6 @@
 
 #define GEGL_CHANT_OPERATION(obj) ((GeglChantOperation*)(obj))
 
-#include <geglmoduletypes.h>
-#include <geglmodule.h>
-
 #ifndef GEGL_CHANT_STATIC
 #  define M_DEFINE_TYPE_EXTENDED(type_name, TYPE_PARENT, flags, CODE) \
   \

Modified: trunk/gegl/gegl-plugin.h
==============================================================================
--- trunk/gegl/gegl-plugin.h	(original)
+++ trunk/gegl/gegl-plugin.h	Mon Jan 21 21:47:16 2008
@@ -1,4 +1,5 @@
-/* This file is part of GEGL
+/* This file is the public operation GEGL API, this API will change to much
+ * larger degrees than the api provided by gegl.h
  *
  * GEGL is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -13,32 +14,20 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with GEGL; if not, see <http://www.gnu.org/licenses/>.
  *
- * Copyright 2006,2007 Ãyvind KolÃs
+ * 2000-2008 Ãyvind KolÃs.
  */
 
 #ifndef __GEGL_PLUGIN_H__
 #define __GEGL_PLUGIN_H__
 
+#include <string.h>
 #include <glib-object.h>
-
-#include <gegl/gegl-types.h>
-#include <gegl/graph/gegl-connection.h>
-#include <gegl/graph/gegl-node.h>
-#include <gegl/graph/gegl-pad.h>
-#include <gegl/graph/gegl-visitable.h>
-#include <gegl/graph/gegl-visitor.h>
-#include <gegl/property-types/gegl-color.h>
-#include <gegl/property-types/gegl-curve.h>
-#include <gegl/property-types/gegl-vector.h>
-#include <gegl/gegl-init.h>
-#include <gegl/gegl-utils.h>
-#include <gegl/buffer/gegl-buffer.h>
-#include <gegl/gegl-xml.h>
-#include <gegl/operation/gegl-operation.h>
-
-#define GEGL_INTERNAL /* to avoid conflicts, when we include gegl.h just
-                         to get warnings about conflicts in the prototypes
-                         of functions. */
 #include <gegl.h>
-#include <gegl/property-types/gegl-paramspecs.h>
-#endif  /* __GEGL_H__ */
+#include <operation/gegl-operation.h>
+#include <gegl-utils.h>
+#include <gegl-buffer.h>
+#include <gegl-paramspecs.h>
+#include <geglmoduletypes.h>
+#include <geglmodule.h>
+
+#endif  /* __GEGL_PLUGIN_H__ */

Modified: trunk/gegl/gegl.h
==============================================================================
--- trunk/gegl/gegl.h	(original)
+++ trunk/gegl/gegl.h	Mon Jan 21 21:47:16 2008
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with GEGL; if not, see <http://www.gnu.org/licenses/>.
  *
- * 2000-2007 Â Calvin Williamson, Ãyvind KolÃs.
+ * 2000-2008 Â Calvin Williamson, Ãyvind KolÃs.
  */
 
 #ifndef __GEGL_H__
@@ -177,11 +177,14 @@
  *                                  NULL);
  */
 #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;
 #define GEGL_TYPE_NODE    (gegl_node_get_type())
 #define GEGL_NODE(obj)    (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_NODE, GeglNode))
 #define GEGL_IS_NODE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_NODE))
+#endif
 
 typedef struct _GeglRectangle GeglRectangle;
 GType gegl_rectangle_get_type (void) G_GNUC_CONST;
@@ -370,7 +373,8 @@
  * sample.
  */
 
-#ifndef GEGL_INTERNAL
+#ifndef GEGL_BLIT_FLAGS
+#define  GEGL_BLIT_FLAGS
 typedef enum
 {
   GEGL_BLIT_DEFAULT  = 0,
@@ -934,13 +938,13 @@
                                        gdouble     *ys);
 
 #ifndef GEGL_INTERNAL
+#define GEGL_PAD_TYPE
 
 typedef enum
 {
   GEGL_PARAM_PAD_OUTPUT = 1 << G_PARAM_USER_SHIFT,
   GEGL_PARAM_PAD_INPUT  = 1 << (G_PARAM_USER_SHIFT + 1)
 } GeglPadType;
-
 #endif
 
 G_END_DECLS

Modified: trunk/gegl/graph/gegl-node.h
==============================================================================
--- trunk/gegl/graph/gegl-node.h	(original)
+++ trunk/gegl/graph/gegl-node.h	Mon Jan 21 21:47:16 2008
@@ -26,12 +26,14 @@
 
 G_BEGIN_DECLS
 
+#ifndef GEGL_TYPE_NODE
 #define GEGL_TYPE_NODE            (gegl_node_get_type ())
 #define GEGL_NODE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_NODE, GeglNode))
 #define GEGL_NODE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GEGL_TYPE_NODE, GeglNodeClass))
 #define GEGL_IS_NODE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_NODE))
 #define GEGL_IS_NODE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GEGL_TYPE_NODE))
 #define GEGL_NODE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GEGL_TYPE_NODE, GeglNodeClass))
+#endif
 
 
 typedef struct _GeglNodeClass   GeglNodeClass;
@@ -65,12 +67,15 @@
   GeglNodePrivate *priv;
 };
 
+#ifndef GEGL_BLIT_FLAGS
+#define GEGL_BLIT_FLAGS
 typedef enum
 {
   GEGL_BLIT_DEFAULT  = 0,
   GEGL_BLIT_CACHE    = 1 << 0,
   GEGL_BLIT_DIRTY    = 1 << 1,
 } GeglBlitFlags;
+#endif
 
 struct _GeglNodeClass
 {

Modified: trunk/gegl/operation/gegl-operation.h
==============================================================================
--- trunk/gegl/operation/gegl-operation.h	(original)
+++ trunk/gegl/operation/gegl-operation.h	Mon Jan 21 21:47:16 2008
@@ -29,6 +29,7 @@
 typedef struct _GeglOperation        GeglOperation;
 typedef struct _GeglNodeContext      GeglNodeContext;
 typedef struct _GeglPad              GeglPad;
+typedef struct _GeglConnection       GeglConnection;
 #endif
 
 #include "gegl-buffer.h"

Modified: trunk/operations/affine/affine.c
==============================================================================
--- trunk/operations/affine/affine.c	(original)
+++ trunk/operations/affine/affine.c	Mon Jan 21 21:47:16 2008
@@ -23,15 +23,17 @@
 /* TODO: make rect calculations depend on the sampling kernel of the
  *       interpolation filter used */
 
-#include <string.h>
 #include <math.h>
 #include <gegl-plugin.h>
-#include <gegl-module.h>
+#include <gegl-types.h>
+#include <graph/gegl-pad.h>
+#include <graph/gegl-node.h>
+#include <graph/gegl-connection.h>
+#include "buffer/gegl-sampler.h"
 
 #include "affine.h"
 #include "module.h"
 #include "matrix.h"
-#include "buffer/gegl-sampler.h"
 
 enum
 {

Modified: trunk/tools/Makefile.am
==============================================================================
--- trunk/tools/Makefile.am	(original)
+++ trunk/tools/Makefile.am	Mon Jan 21 21:47:16 2008
@@ -10,5 +10,7 @@
 INCLUDES = -I$(top_srcdir) 		\
 	   -I$(top_srcdir)/gegl		\
 	   -I$(top_srcdir)/gegl/buffer	\
+	   -I$(top_srcdir)/gegl/module	\
+	   -I$(top_srcdir)/gegl/property-types\
 	   @DEP_CFLAGS@ @BABL_CFLAGS@
 AM_LDFLAGS =  @DEP_LIBS@ @BABL_LIBS@ $(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]