GNOME.org
 

gimp r28088 - in branches/gimp-2-6: . app/core app/gegl

Author: neo
Date: Mon Mar  2 08:37:34 2009
New Revision: 28088
URL: http://svn.gnome.org/viewvc/gimp?rev=28088&view=rev

Log:
2009-03-02  Sven Neumann  <sven gimp org>

	Fix compilation with GEGL from trunk:
	
	* app/gegl/Makefile.am
	* app/geg/gegl-types.h: renamed to app/gegl/gimp-gegl-types.h

	* app/core/core-types.h
	* app/gegl/*.c: changed accordingly.



Added:
   branches/gimp-2-6/app/gegl/gimp-gegl-types.h
      - copied, changed from r28079, /branches/gimp-2-6/app/gegl/gegl-types.h
Removed:
   branches/gimp-2-6/app/gegl/gegl-types.h
Modified:
   branches/gimp-2-6/ChangeLog
   branches/gimp-2-6/app/core/core-types.h
   branches/gimp-2-6/app/gegl/Makefile.am
   branches/gimp-2-6/app/gegl/gimp-gegl-utils.c
   branches/gimp-2-6/app/gegl/gimp-gegl.c
   branches/gimp-2-6/app/gegl/gimpbrightnesscontrastconfig.c
   branches/gimp-2-6/app/gegl/gimpcolorbalanceconfig.c
   branches/gimp-2-6/app/gegl/gimpcolorizeconfig.c
   branches/gimp-2-6/app/gegl/gimpcurvesconfig.c
   branches/gimp-2-6/app/gegl/gimpdesaturateconfig.c
   branches/gimp-2-6/app/gegl/gimphuesaturationconfig.c
   branches/gimp-2-6/app/gegl/gimplevelsconfig.c
   branches/gimp-2-6/app/gegl/gimpoperationcolorbalance.c
   branches/gimp-2-6/app/gegl/gimpoperationcolorize.c
   branches/gimp-2-6/app/gegl/gimpoperationcurves.c
   branches/gimp-2-6/app/gegl/gimpoperationdesaturate.c
   branches/gimp-2-6/app/gegl/gimpoperationhuesaturation.c
   branches/gimp-2-6/app/gegl/gimpoperationlevels.c
   branches/gimp-2-6/app/gegl/gimpoperationpointfilter.c
   branches/gimp-2-6/app/gegl/gimpoperationposterize.c
   branches/gimp-2-6/app/gegl/gimpoperationthreshold.c
   branches/gimp-2-6/app/gegl/gimpoperationtilesink.c
   branches/gimp-2-6/app/gegl/gimpoperationtilesource.c
   branches/gimp-2-6/app/gegl/gimpposterizeconfig.c
   branches/gimp-2-6/app/gegl/gimpthresholdconfig.c

Modified: branches/gimp-2-6/app/core/core-types.h
==============================================================================
--- branches/gimp-2-6/app/core/core-types.h	(original)
+++ branches/gimp-2-6/app/core/core-types.h	Mon Mar  2 08:37:34 2009
@@ -206,7 +206,7 @@
 };
 
 
-#include "gegl/gegl-types.h"
+#include "gegl/gimp-gegl-types.h"
 #include "paint/paint-types.h"
 #include "text/text-types.h"
 #include "vectors/vectors-types.h"

Modified: branches/gimp-2-6/app/gegl/Makefile.am
==============================================================================
--- branches/gimp-2-6/app/gegl/Makefile.am	(original)
+++ branches/gimp-2-6/app/gegl/Makefile.am	Mon Mar  2 08:37:34 2009
@@ -15,7 +15,7 @@
 noinst_LIBRARIES = libappgegl.a
 
 libappgegl_a_SOURCES = \
-	gegl-types.h			\
+	gimp-gegl-types.h		\
 	gimp-gegl.c			\
 	gimp-gegl.h			\
 	gimp-gegl-utils.c		\

Copied: branches/gimp-2-6/app/gegl/gimp-gegl-types.h (from r28079, /branches/gimp-2-6/app/gegl/gegl-types.h)
==============================================================================
--- /branches/gimp-2-6/app/gegl/gegl-types.h	(original)
+++ branches/gimp-2-6/app/gegl/gimp-gegl-types.h	Mon Mar  2 08:37:34 2009
@@ -18,8 +18,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef __GEGL_TYPES_H__
-#define __GEGL_TYPES_H__
+#ifndef __GIMP_GEGL_TYPES_H__
+#define __GIMP_GEGL_TYPES_H__
 
 
 #include "core/core-types.h"
@@ -53,4 +53,4 @@
 typedef struct _GimpThresholdConfig          GimpThresholdConfig;
 
 
-#endif /* __GEGL_TYPES_H__ */
+#endif /* __GIMP_GEGL_TYPES_H__ */

Modified: branches/gimp-2-6/app/gegl/gimp-gegl-utils.c
==============================================================================
--- branches/gimp-2-6/app/gegl/gimp-gegl-utils.c	(original)
+++ branches/gimp-2-6/app/gegl/gimp-gegl-utils.c	Mon Mar  2 08:37:34 2009
@@ -23,7 +23,7 @@
 
 #include <gegl.h>
 
-#include "gegl-types.h"
+#include "gimp-gegl-types.h"
 
 #include "gimp-gegl-utils.h"
 

Modified: branches/gimp-2-6/app/gegl/gimp-gegl.c
==============================================================================
--- branches/gimp-2-6/app/gegl/gimp-gegl.c	(original)
+++ branches/gimp-2-6/app/gegl/gimp-gegl.c	Mon Mar  2 08:37:34 2009
@@ -23,7 +23,7 @@
 
 #include <gegl.h>
 
-#include "gegl-types.h"
+#include "gimp-gegl-types.h"
 
 #include "base/tile.h"
 

Modified: branches/gimp-2-6/app/gegl/gimpbrightnesscontrastconfig.c
==============================================================================
--- branches/gimp-2-6/app/gegl/gimpbrightnesscontrastconfig.c	(original)
+++ branches/gimp-2-6/app/gegl/gimpbrightnesscontrastconfig.c	Mon Mar  2 08:37:34 2009
@@ -26,7 +26,7 @@
 #include "libgimpmath/gimpmath.h"
 #include "libgimpconfig/gimpconfig.h"
 
-#include "gegl-types.h"
+#include "gimp-gegl-types.h"
 
 #include "gimpbrightnesscontrastconfig.h"
 #include "gimplevelsconfig.h"

Modified: branches/gimp-2-6/app/gegl/gimpcolorbalanceconfig.c
==============================================================================
--- branches/gimp-2-6/app/gegl/gimpcolorbalanceconfig.c	(original)
+++ branches/gimp-2-6/app/gegl/gimpcolorbalanceconfig.c	Mon Mar  2 08:37:34 2009
@@ -27,7 +27,7 @@
 #include "libgimpmath/gimpmath.h"
 #include "libgimpconfig/gimpconfig.h"
 
-#include "gegl-types.h"
+#include "gimp-gegl-types.h"
 
 /*  temp cruft  */
 #include "base/color-balance.h"

Modified: branches/gimp-2-6/app/gegl/gimpcolorizeconfig.c
==============================================================================
--- branches/gimp-2-6/app/gegl/gimpcolorizeconfig.c	(original)
+++ branches/gimp-2-6/app/gegl/gimpcolorizeconfig.c	Mon Mar  2 08:37:34 2009
@@ -25,7 +25,7 @@
 
 #include "libgimpconfig/gimpconfig.h"
 
-#include "gegl-types.h"
+#include "gimp-gegl-types.h"
 
 /*  temp cruft  */
 #include "base/colorize.h"

Modified: branches/gimp-2-6/app/gegl/gimpcurvesconfig.c
==============================================================================
--- branches/gimp-2-6/app/gegl/gimpcurvesconfig.c	(original)
+++ branches/gimp-2-6/app/gegl/gimpcurvesconfig.c	Mon Mar  2 08:37:34 2009
@@ -30,7 +30,7 @@
 #include "libgimpmath/gimpmath.h"
 #include "libgimpconfig/gimpconfig.h"
 
-#include "gegl-types.h"
+#include "gimp-gegl-types.h"
 
 #include "base/gimphistogram.h"
 

Modified: branches/gimp-2-6/app/gegl/gimpdesaturateconfig.c
==============================================================================
--- branches/gimp-2-6/app/gegl/gimpdesaturateconfig.c	(original)
+++ branches/gimp-2-6/app/gegl/gimpdesaturateconfig.c	Mon Mar  2 08:37:34 2009
@@ -25,7 +25,7 @@
 
 #include "libgimpconfig/gimpconfig.h"
 
-#include "gegl-types.h"
+#include "gimp-gegl-types.h"
 
 #include "gimpdesaturateconfig.h"
 

Modified: branches/gimp-2-6/app/gegl/gimphuesaturationconfig.c
==============================================================================
--- branches/gimp-2-6/app/gegl/gimphuesaturationconfig.c	(original)
+++ branches/gimp-2-6/app/gegl/gimphuesaturationconfig.c	Mon Mar  2 08:37:34 2009
@@ -25,7 +25,7 @@
 
 #include "libgimpconfig/gimpconfig.h"
 
-#include "gegl-types.h"
+#include "gimp-gegl-types.h"
 
 /*  temp cruft  */
 #include "base/hue-saturation.h"

Modified: branches/gimp-2-6/app/gegl/gimplevelsconfig.c
==============================================================================
--- branches/gimp-2-6/app/gegl/gimplevelsconfig.c	(original)
+++ branches/gimp-2-6/app/gegl/gimplevelsconfig.c	Mon Mar  2 08:37:34 2009
@@ -31,7 +31,7 @@
 #include "libgimpmath/gimpmath.h"
 #include "libgimpconfig/gimpconfig.h"
 
-#include "gegl-types.h"
+#include "gimp-gegl-types.h"
 
 #include "base/gimphistogram.h"
 

Modified: branches/gimp-2-6/app/gegl/gimpoperationcolorbalance.c
==============================================================================
--- branches/gimp-2-6/app/gegl/gimpoperationcolorbalance.c	(original)
+++ branches/gimp-2-6/app/gegl/gimpoperationcolorbalance.c	Mon Mar  2 08:37:34 2009
@@ -26,7 +26,7 @@
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
 
-#include "gegl-types.h"
+#include "gimp-gegl-types.h"
 
 #include "gimpcolorbalanceconfig.h"
 #include "gimpoperationcolorbalance.h"

Modified: branches/gimp-2-6/app/gegl/gimpoperationcolorize.c
==============================================================================
--- branches/gimp-2-6/app/gegl/gimpoperationcolorize.c	(original)
+++ branches/gimp-2-6/app/gegl/gimpoperationcolorize.c	Mon Mar  2 08:37:34 2009
@@ -25,7 +25,7 @@
 
 #include "libgimpcolor/gimpcolor.h"
 
-#include "gegl-types.h"
+#include "gimp-gegl-types.h"
 
 #include "gimpcolorizeconfig.h"
 #include "gimpoperationcolorize.h"

Modified: branches/gimp-2-6/app/gegl/gimpoperationcurves.c
==============================================================================
--- branches/gimp-2-6/app/gegl/gimpoperationcurves.c	(original)
+++ branches/gimp-2-6/app/gegl/gimpoperationcurves.c	Mon Mar  2 08:37:34 2009
@@ -26,7 +26,7 @@
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
 
-#include "gegl-types.h"
+#include "gimp-gegl-types.h"
 
 #include "core/gimpcurve.h"
 #include "core/gimpcurve-map.h"

Modified: branches/gimp-2-6/app/gegl/gimpoperationdesaturate.c
==============================================================================
--- branches/gimp-2-6/app/gegl/gimpoperationdesaturate.c	(original)
+++ branches/gimp-2-6/app/gegl/gimpoperationdesaturate.c	Mon Mar  2 08:37:34 2009
@@ -25,7 +25,7 @@
 
 #include "libgimpcolor/gimpcolor.h"
 
-#include "gegl-types.h"
+#include "gimp-gegl-types.h"
 
 #include "gimpoperationdesaturate.h"
 #include "gimpdesaturateconfig.h"

Modified: branches/gimp-2-6/app/gegl/gimpoperationhuesaturation.c
==============================================================================
--- branches/gimp-2-6/app/gegl/gimpoperationhuesaturation.c	(original)
+++ branches/gimp-2-6/app/gegl/gimpoperationhuesaturation.c	Mon Mar  2 08:37:34 2009
@@ -26,7 +26,7 @@
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
 
-#include "gegl-types.h"
+#include "gimp-gegl-types.h"
 
 #include "gimphuesaturationconfig.h"
 #include "gimpoperationhuesaturation.h"

Modified: branches/gimp-2-6/app/gegl/gimpoperationlevels.c
==============================================================================
--- branches/gimp-2-6/app/gegl/gimpoperationlevels.c	(original)
+++ branches/gimp-2-6/app/gegl/gimpoperationlevels.c	Mon Mar  2 08:37:34 2009
@@ -26,7 +26,7 @@
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
 
-#include "gegl-types.h"
+#include "gimp-gegl-types.h"
 
 #include "gimplevelsconfig.h"
 #include "gimpoperationlevels.h"

Modified: branches/gimp-2-6/app/gegl/gimpoperationpointfilter.c
==============================================================================
--- branches/gimp-2-6/app/gegl/gimpoperationpointfilter.c	(original)
+++ branches/gimp-2-6/app/gegl/gimpoperationpointfilter.c	Mon Mar  2 08:37:34 2009
@@ -23,7 +23,7 @@
 
 #include <gegl.h>
 
-#include "gegl-types.h"
+#include "gimp-gegl-types.h"
 
 #include "gimpoperationpointfilter.h"
 

Modified: branches/gimp-2-6/app/gegl/gimpoperationposterize.c
==============================================================================
--- branches/gimp-2-6/app/gegl/gimpoperationposterize.c	(original)
+++ branches/gimp-2-6/app/gegl/gimpoperationposterize.c	Mon Mar  2 08:37:34 2009
@@ -26,7 +26,7 @@
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
 
-#include "gegl-types.h"
+#include "gimp-gegl-types.h"
 
 #include "gimpoperationposterize.h"
 #include "gimpposterizeconfig.h"

Modified: branches/gimp-2-6/app/gegl/gimpoperationthreshold.c
==============================================================================
--- branches/gimp-2-6/app/gegl/gimpoperationthreshold.c	(original)
+++ branches/gimp-2-6/app/gegl/gimpoperationthreshold.c	Mon Mar  2 08:37:34 2009
@@ -25,7 +25,7 @@
 
 #include "libgimpcolor/gimpcolor.h"
 
-#include "gegl-types.h"
+#include "gimp-gegl-types.h"
 
 #include "gimpoperationthreshold.h"
 #include "gimpthresholdconfig.h"

Modified: branches/gimp-2-6/app/gegl/gimpoperationtilesink.c
==============================================================================
--- branches/gimp-2-6/app/gegl/gimpoperationtilesink.c	(original)
+++ branches/gimp-2-6/app/gegl/gimpoperationtilesink.c	Mon Mar  2 08:37:34 2009
@@ -26,7 +26,7 @@
 #include <gegl.h>
 #include <gegl-buffer.h>
 
-#include "gegl-types.h"
+#include "gimp-gegl-types.h"
 
 #include "base/base-types.h"
 #include "base/tile-manager.h"

Modified: branches/gimp-2-6/app/gegl/gimpoperationtilesource.c
==============================================================================
--- branches/gimp-2-6/app/gegl/gimpoperationtilesource.c	(original)
+++ branches/gimp-2-6/app/gegl/gimpoperationtilesource.c	Mon Mar  2 08:37:34 2009
@@ -26,7 +26,7 @@
 #include <gegl.h>
 #include <gegl-buffer.h>
 
-#include "gegl-types.h"
+#include "gimp-gegl-types.h"
 
 #include "base/tile-manager.h"
 #include "base/pixel-region.h"

Modified: branches/gimp-2-6/app/gegl/gimpposterizeconfig.c
==============================================================================
--- branches/gimp-2-6/app/gegl/gimpposterizeconfig.c	(original)
+++ branches/gimp-2-6/app/gegl/gimpposterizeconfig.c	Mon Mar  2 08:37:34 2009
@@ -25,7 +25,7 @@
 
 #include "libgimpconfig/gimpconfig.h"
 
-#include "gegl-types.h"
+#include "gimp-gegl-types.h"
 
 #include "gimpposterizeconfig.h"
 

Modified: branches/gimp-2-6/app/gegl/gimpthresholdconfig.c
==============================================================================
--- branches/gimp-2-6/app/gegl/gimpthresholdconfig.c	(original)
+++ branches/gimp-2-6/app/gegl/gimpthresholdconfig.c	Mon Mar  2 08:37:34 2009
@@ -25,7 +25,7 @@
 
 #include "libgimpconfig/gimpconfig.h"
 
-#include "gegl-types.h"
+#include "gimp-gegl-types.h"
 
 /*  temp cruft  */
 #include "base/threshold.h"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]