Commit 7b8fa4c3 authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer

Fix gegl types and includes so we can include operations from app/gegl in

2008-01-16  Michael Natterer  <mitch@gimp.org>

	Fix gegl types and includes so we can include operations from
	app/gegl in other gimp files (needed soon):

	* app/gegl/gegl/gegl-types.h: not copied from gegl any longer.
	Now contains only two typedefs needed by the copied operation
	headers.

	* app/gegl/gegl-types.h: include above types file.

	* app/gegl/gimp-gegl.c
	* app/gegl/gimpoperationcolorbalance.c
	* app/gegl/gimpoperationcolorize.c
	* app/gegl/gimpoperationdesaturate.c
	* app/gegl/gimpoperationhuesaturation.c
	* app/gegl/gimpoperationlevels.c
	* app/gegl/gimpoperationposterize.c
	* app/gegl/gimpoperationthreshold.c
	* app/gegl/gimpoperationtilesink.c
	* app/gegl/gimpoperationtilesource.c: include only <gegl.h> and
	"gegl-types.h" from this directory, which is much more gimpish
	now. Include "gegl/buffer/gegl-buffer.h" in the source and sink
	operations.

	* app/tools/gimpimagemaptool.h: warn about inclusion of <gegl.h>
	only if it hasn't been included before, so it only warns in the
	files where we still have to address this issue.


svn path=/trunk/; revision=24625
parent 7ff30375
2008-01-16 Michael Natterer <mitch@gimp.org>
Fix gegl types and includes so we can include operations from
app/gegl in other gimp files (needed soon):
* app/gegl/gegl/gegl-types.h: not copied from gegl any longer.
Now contains only two typedefs needed by the copied operation
headers.
* app/gegl/gegl-types.h: include above types file.
* app/gegl/gimp-gegl.c
* app/gegl/gimpoperationcolorbalance.c
* app/gegl/gimpoperationcolorize.c
* app/gegl/gimpoperationdesaturate.c
* app/gegl/gimpoperationhuesaturation.c
* app/gegl/gimpoperationlevels.c
* app/gegl/gimpoperationposterize.c
* app/gegl/gimpoperationthreshold.c
* app/gegl/gimpoperationtilesink.c
* app/gegl/gimpoperationtilesource.c: include only <gegl.h> and
"gegl-types.h" from this directory, which is much more gimpish
now. Include "gegl/buffer/gegl-buffer.h" in the source and sink
operations.
* app/tools/gimpimagemaptool.h: warn about inclusion of <gegl.h>
only if it hasn't been included before, so it only warns in the
files where we still have to address this issue.
2008-01-16 Sven Neumann <sven@gimp.org>
* app/display/gimpdisplayshell-callbacks.c
......
......@@ -18,11 +18,12 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __OUR_GEGL_TYPES_H__
#define __OUR_GEGL_TYPES_H__
#ifndef __GEGL_TYPES_H__
#define __GEGL_TYPES_H__
#include "base/base-types.h"
#include "gegl/gegl-types.h"
typedef struct _GimpOperationColorBalance GimpOperationColorBalance;
......@@ -36,4 +37,4 @@ typedef struct _GimpOperationTileSink GimpOperationTileSink;
typedef struct _GimpOperationTileSource GimpOperationTileSource;
#endif /* __OUR_GEGL_TYPES_H__ */
#endif /* __GEGL_TYPES_H__ */
/* This file is part of GEGL
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* 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.
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* GEGL is distributed in the hope that it will be useful,
* This program 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.
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU 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
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __GEGL_TYPES_H__
#define __GEGL_TYPES_H__
G_BEGIN_DECLS
typedef struct _GeglConnection GeglConnection;
typedef struct _GeglColor GeglColor;
typedef struct _GeglCurve GeglCurve;
typedef struct _GeglCRVisitor GeglCRVisitor;
typedef struct _GeglDebugRectVisitor GeglDebugRectVisitor;
typedef struct _GeglEvalMgr GeglEvalMgr;
typedef struct _GeglEvalVisitor GeglEvalVisitor;
typedef struct _GeglFinishVisitor GeglFinishVisitor;
typedef struct _GeglGraph GeglGraph;
typedef struct _GeglHaveVisitor GeglHaveVisitor;
typedef struct _GeglNeedVisitor GeglNeedVisitor;
typedef struct _GeglNode GeglNode;
typedef struct _GeglNodeContext GeglNodeContext;
typedef struct _GeglOperation GeglOperation;
typedef struct _GeglPad GeglPad;
typedef struct _GeglVector GeglVector;
typedef struct _GeglProcessor GeglProcessor;
typedef struct _GeglPrepareVisitor GeglPrepareVisitor;
typedef struct _GeglVisitable GeglVisitable; /* dummy typedef */
typedef struct _GeglVisitor GeglVisitor;
#ifndef __UGLY_GEGL_TYPES_H__
#define __UGLY_GEGL_TYPES_H__
typedef struct _GeglRectangle GeglRectangle;
typedef struct _GeglPoint GeglPoint;
typedef struct _GeglDimension GeglDimension;
struct _GeglRectangle
{
gint x;
gint y;
gint width;
gint height;
};
struct _GeglPoint
{
gint x;
gint y;
};
struct _GeglDimension
{
gint width;
gint height;
};
/* FIXME: typedefs needed by the headers copied here.
* They are supposed to be removed at some point.
*/
typedef struct _GeglOperation GeglOperation;
typedef struct _GeglNodeContext GeglNodeContext;
G_END_DECLS
#endif /* __GEGL_TYPES_H__ */
#endif /* __UGLY_GEGL_TYPES_H__ */
......@@ -21,8 +21,7 @@
#include "config.h"
#include <glib-object.h>
#include "gegl/gegl-types.h"
#include <gegl.h>
#include "gegl-types.h"
......
......@@ -21,7 +21,7 @@
#include "config.h"
#include <glib-object.h>
#include <gegl.h>
#include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h"
......
......@@ -21,13 +21,10 @@
#include "config.h"
#include <glib-object.h>
#include <gegl.h>
#include "libgimpcolor/gimpcolor.h"
#include "gegl/gegl-types.h"
#include <gegl/buffer/gegl-buffer.h>
#include "gegl-types.h"
#include "gimpoperationcolorize.h"
......
......@@ -21,13 +21,10 @@
#include "config.h"
#include <glib-object.h>
#include <gegl.h>
#include "libgimpcolor/gimpcolor.h"
#include "gegl/gegl-types.h"
#include <gegl/buffer/gegl-buffer.h>
#include "gegl-types.h"
#include "gimpoperationdesaturate.h"
......
......@@ -21,7 +21,7 @@
#include "config.h"
#include <glib-object.h>
#include <gegl.h>
#include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h"
......
......@@ -21,14 +21,11 @@
#include "config.h"
#include <glib-object.h>
#include <gegl.h>
#include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h"
#include "gegl/gegl-types.h"
#include <gegl/buffer/gegl-buffer.h>
#include "gegl-types.h"
#include "gimpoperationlevels.h"
......
......@@ -21,14 +21,11 @@
#include "config.h"
#include <glib-object.h>
#include <gegl.h>
#include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h"
#include "gegl/gegl-types.h"
#include <gegl/buffer/gegl-buffer.h>
#include "gegl-types.h"
#include "gimpoperationposterize.h"
......
......@@ -21,13 +21,10 @@
#include "config.h"
#include <glib-object.h>
#include <gegl.h>
#include "libgimpcolor/gimpcolor.h"
#include "gegl/gegl-types.h"
#include <gegl/buffer/gegl-buffer.h>
#include "gegl-types.h"
#include "gimpoperationthreshold.h"
......
......@@ -23,11 +23,8 @@
#include <string.h>
#include <glib-object.h>
#include "gegl/gegl-types.h"
#include "gegl/graph/gegl-node-context.h"
#include <gegl/buffer/gegl-buffer.h>
#include <gegl.h>
#include "gegl/buffer/gegl-buffer.h"
#include "gegl-types.h"
......
......@@ -23,10 +23,8 @@
#include <string.h>
#include <glib-object.h>
#include "gegl/gegl-types.h"
#include <gegl/buffer/gegl-buffer.h>
#include <gegl.h>
#include "gegl/buffer/gegl-buffer.h"
#include "gegl-types.h"
......@@ -34,7 +32,6 @@
#include "base/pixel-region.h"
#include "gimp-gegl-utils.h"
#include "gegl/graph/gegl-node-context.h"
#include "gimpoperationtilesource.h"
......
......@@ -19,10 +19,12 @@
#ifndef __GIMP_IMAGE_MAP_TOOL_H__
#define __GIMP_IMAGE_MAP_TOOL_H__
#ifndef __GEGL_H__
#ifdef __GNUC__
#warning FIXME: dont include gegl.h here
#endif
#include <gegl.h>
#endif /* __GEGL_H__ */
#include "gimpcolortool.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment