gegl r2928 - in trunk: . gegl

[martinn svn gnome org]

Author: martinn
Date: Sat Feb 21 15:11:46 2009
New Revision: 2928
URL: http://svn.gnome.org/viewvc/gegl?rev=2928&view=rev

Log:
Move types in gegl.h to gegl-types.h

Move types in gegl.h to a new installed header file gegl-types.h

Added:
   trunk/gegl/gegl-types.h
Modified:
   trunk/ChangeLog
   trunk/gegl/Makefile.am
   trunk/gegl/gegl.h

Modified: trunk/gegl/Makefile.am
==============================================================================
--- trunk/gegl/Makefile.am	(original)
+++ trunk/gegl/Makefile.am	Sat Feb 21 15:11:46 2009
@@ -65,6 +65,7 @@
 
 libgegl_ GEGL_API_VERSION@include_HEADERS =	\
     gegl.h				\
+    gegl-types.h			\
     gegl-utils.h			\
     gegl-matrix.h			\
     gegl-chant.h			\

Added: trunk/gegl/gegl-types.h
==============================================================================
--- (empty file)
+++ trunk/gegl/gegl-types.h	Sat Feb 21 15:11:46 2009
@@ -0,0 +1,91 @@
+/* This file is part of GEGL
+ *
+ * GEGL is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * GEGL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * 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 2003 Calvin Williamson
+ *           2006 Ãyvind KolÃs
+ */
+
+#ifndef __GEGL_TYPES_H__
+#define __GEGL_TYPES_H__
+
+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;
+#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;
+#define GEGL_TYPE_RECTANGLE   (gegl_rectangle_get_type())
+#endif
+
+#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
+
+#ifndef GEGL_AUTO_ROWSTRIDE
+#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
+{
+  gint x;
+  gint y;
+  gint width;
+  gint height;
+};
+
+#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;
+
+typedef struct _GeglCurve  GeglCurve;
+typedef struct _GeglPath   GeglPath;
+typedef struct _GeglColor  GeglColor;
+#endif
+
+G_END_DECLS
+
+#endif /* __GEGL_TYPES_H__ */

Modified: trunk/gegl/gegl.h
==============================================================================
--- trunk/gegl/gegl.h	(original)
+++ trunk/gegl/gegl.h	Sat Feb 21 15:11:46 2009
@@ -22,6 +22,7 @@
 #include <glib-object.h>
 #include <babl/babl.h>
 
+#include <gegl-types.h>
 #include <gegl-version.h>
 
 /***
@@ -178,20 +179,6 @@
  *                                  "contrast",   1.5,
  *                                  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;
-#define GEGL_TYPE_RECTANGLE   (gegl_rectangle_get_type())
-#endif
 
 /**
  * gegl_node_new:
@@ -375,20 +362,6 @@
  * sample.
  */
 
-#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
-
-#ifndef GEGL_AUTO_ROWSTRIDE
-#define GEGL_AUTO_ROWSTRIDE 0
-#endif
-
 /**
  * gegl_node_blit:
  * @node: a #GeglNode
@@ -767,13 +740,6 @@
  * should be sufficient. See #gegl_processor_work for a code sample.
  *
  */
-#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
 
 /**
  * gegl_node_new_processor:
@@ -833,9 +799,6 @@
  *
  * GEGL uses a singleton configuration object
  */
-#ifndef GEGL_INTERNAL
-typedef struct _GeglConfig GeglConfig;
-#endif
 
 /**
  * gegl_config:
@@ -850,30 +813,6 @@
 GeglConfig      * gegl_config (void);
 
 
-#ifndef GEGL_INTERNAL
-
-struct _GeglRectangle
-{
-  gint x;
-  gint y;
-  gint width;
-  gint height;
-};
-
-#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;
-
-typedef struct _GeglCurve  GeglCurve;
-typedef struct _GeglPath   GeglPath;
-typedef struct _GeglColor  GeglColor;
-#endif
-
-
 /*** foo
  */
 #include <gegl-buffer.h>