diff --git a/ChangeLog b/ChangeLog index c2aac9d941..528fef307e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,35 @@ +2009-02-21 Martin Nordholts + + Rename gegl-types.h to gimp-gegl-types.h as gegl-types.h invades + on the GEGL namespace + + * app/core/core-types.h + * app/gegl/Makefile.am + * app/gegl/gimp-gegl-types.h (renamed from app/gegl/gegl-types.h) + * app/gegl/gimp-gegl-utils.c + * app/gegl/gimp-gegl.c + * app/gegl/gimpbrightnesscontrastconfig.c + * app/gegl/gimpcolorbalanceconfig.c + * app/gegl/gimpcolorizeconfig.c + * app/gegl/gimpcurvesconfig.c + * app/gegl/gimpdesaturateconfig.c + * app/gegl/gimphuesaturationconfig.c + * app/gegl/gimplevelsconfig.c + * app/gegl/gimpoperationcolorbalance.c + * app/gegl/gimpoperationcolorize.c + * app/gegl/gimpoperationcurves.c + * app/gegl/gimpoperationdesaturate.c + * app/gegl/gimpoperationhuesaturation.c + * app/gegl/gimpoperationlevels.c + * app/gegl/gimpoperationpointfilter.c + * app/gegl/gimpoperationpointlayermode.c + * app/gegl/gimpoperationposterize.c + * app/gegl/gimpoperationthreshold.c + * app/gegl/gimpoperationtilesink.c + * app/gegl/gimpoperationtilesource.c + * app/gegl/gimpposterizeconfig.c + * app/gegl/gimpthresholdconfig.c + 2009-02-20 Michael Natterer Bug 572156 – top left pixel position/coordinate is not 0,0 but 1,1 diff --git a/app/core/core-types.h b/app/core/core-types.h index a0ff45fe42..b831adca0c 100644 --- a/app/core/core-types.h +++ b/app/core/core-types.h @@ -203,7 +203,7 @@ struct _GimpCoords }; -#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" diff --git a/app/gegl/Makefile.am b/app/gegl/Makefile.am index d7b632a605..8e505c2f0a 100644 --- a/app/gegl/Makefile.am +++ b/app/gegl/Makefile.am @@ -15,7 +15,7 @@ INCLUDES = \ noinst_LIBRARIES = libappgegl.a libappgegl_a_SOURCES = \ - gegl-types.h \ + gimp-gegl-types.h \ gimp-gegl.c \ gimp-gegl.h \ gimp-gegl-utils.c \ diff --git a/app/gegl/gegl-types.h b/app/gegl/gimp-gegl-types.h similarity index 95% rename from app/gegl/gegl-types.h rename to app/gegl/gimp-gegl-types.h index ae1da3a494..d146c508cb 100644 --- a/app/gegl/gegl-types.h +++ b/app/gegl/gimp-gegl-types.h @@ -1,7 +1,7 @@ /* GIMP - The GNU Image Manipulation Program * Copyright (C) 1995 Spencer Kimball and Peter Mattis * - * gegl-types.h + * gimp-gegl-types.h * * 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 @@ -17,9 +17,8 @@ * along with this program. If not, see . */ -#ifndef __GEGL_TYPES_H__ -#define __GEGL_TYPES_H__ - +#ifndef __GIMP_GEGL_TYPES_H__ +#define __GIMP_GEGL_TYPES_H__ #include "core/core-types.h" @@ -55,4 +54,4 @@ typedef struct _GimpPosterizeConfig GimpPosterizeConfig; typedef struct _GimpThresholdConfig GimpThresholdConfig; -#endif /* __GEGL_TYPES_H__ */ +#endif /* __GIMP_GEGL_TYPES_H__ */ diff --git a/app/gegl/gimp-gegl-utils.c b/app/gegl/gimp-gegl-utils.c index 966a176684..9cccfa7779 100644 --- a/app/gegl/gimp-gegl-utils.c +++ b/app/gegl/gimp-gegl-utils.c @@ -22,7 +22,7 @@ #include -#include "gegl-types.h" +#include "gimp-gegl-types.h" #include "gimp-gegl-utils.h" diff --git a/app/gegl/gimp-gegl.c b/app/gegl/gimp-gegl.c index 9b1f24afa1..feda36c98a 100644 --- a/app/gegl/gimp-gegl.c +++ b/app/gegl/gimp-gegl.c @@ -22,7 +22,7 @@ #include -#include "gegl-types.h" +#include "gimp-gegl-types.h" #include "base/tile.h" diff --git a/app/gegl/gimpbrightnesscontrastconfig.c b/app/gegl/gimpbrightnesscontrastconfig.c index faf33fcb76..f546f6afcd 100644 --- a/app/gegl/gimpbrightnesscontrastconfig.c +++ b/app/gegl/gimpbrightnesscontrastconfig.c @@ -25,7 +25,7 @@ #include "libgimpmath/gimpmath.h" #include "libgimpconfig/gimpconfig.h" -#include "gegl-types.h" +#include "gimp-gegl-types.h" #include "gimpbrightnesscontrastconfig.h" #include "gimplevelsconfig.h" diff --git a/app/gegl/gimpcolorbalanceconfig.c b/app/gegl/gimpcolorbalanceconfig.c index 30c30bc51c..6646ad7691 100644 --- a/app/gegl/gimpcolorbalanceconfig.c +++ b/app/gegl/gimpcolorbalanceconfig.c @@ -26,7 +26,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" diff --git a/app/gegl/gimpcolorizeconfig.c b/app/gegl/gimpcolorizeconfig.c index 38d54caa13..5d31bfefc2 100644 --- a/app/gegl/gimpcolorizeconfig.c +++ b/app/gegl/gimpcolorizeconfig.c @@ -24,7 +24,7 @@ #include "libgimpconfig/gimpconfig.h" -#include "gegl-types.h" +#include "gimp-gegl-types.h" /* temp cruft */ #include "base/colorize.h" diff --git a/app/gegl/gimpcurvesconfig.c b/app/gegl/gimpcurvesconfig.c index e39f764b54..c5f7a85d57 100644 --- a/app/gegl/gimpcurvesconfig.c +++ b/app/gegl/gimpcurvesconfig.c @@ -29,7 +29,7 @@ #include "libgimpmath/gimpmath.h" #include "libgimpconfig/gimpconfig.h" -#include "gegl-types.h" +#include "gimp-gegl-types.h" #include "base/gimphistogram.h" diff --git a/app/gegl/gimpdesaturateconfig.c b/app/gegl/gimpdesaturateconfig.c index 5c7cc5a3f1..f188974258 100644 --- a/app/gegl/gimpdesaturateconfig.c +++ b/app/gegl/gimpdesaturateconfig.c @@ -24,7 +24,7 @@ #include "libgimpconfig/gimpconfig.h" -#include "gegl-types.h" +#include "gimp-gegl-types.h" #include "gimpdesaturateconfig.h" diff --git a/app/gegl/gimphuesaturationconfig.c b/app/gegl/gimphuesaturationconfig.c index f79014507e..c85364f1d3 100644 --- a/app/gegl/gimphuesaturationconfig.c +++ b/app/gegl/gimphuesaturationconfig.c @@ -24,7 +24,7 @@ #include "libgimpconfig/gimpconfig.h" -#include "gegl-types.h" +#include "gimp-gegl-types.h" /* temp cruft */ #include "base/hue-saturation.h" diff --git a/app/gegl/gimplevelsconfig.c b/app/gegl/gimplevelsconfig.c index dc91f7e5f9..36a9f6a961 100644 --- a/app/gegl/gimplevelsconfig.c +++ b/app/gegl/gimplevelsconfig.c @@ -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" diff --git a/app/gegl/gimpoperationcolorbalance.c b/app/gegl/gimpoperationcolorbalance.c index e29b5ce875..4c187f47ec 100644 --- a/app/gegl/gimpoperationcolorbalance.c +++ b/app/gegl/gimpoperationcolorbalance.c @@ -25,7 +25,7 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpmath/gimpmath.h" -#include "gegl-types.h" +#include "gimp-gegl-types.h" #include "gimpcolorbalanceconfig.h" #include "gimpoperationcolorbalance.h" diff --git a/app/gegl/gimpoperationcolorize.c b/app/gegl/gimpoperationcolorize.c index f2d3528608..469750d924 100644 --- a/app/gegl/gimpoperationcolorize.c +++ b/app/gegl/gimpoperationcolorize.c @@ -24,7 +24,7 @@ #include "libgimpcolor/gimpcolor.h" -#include "gegl-types.h" +#include "gimp-gegl-types.h" #include "gimpcolorizeconfig.h" #include "gimpoperationcolorize.h" diff --git a/app/gegl/gimpoperationcurves.c b/app/gegl/gimpoperationcurves.c index 0779657db3..d43a84f6a7 100644 --- a/app/gegl/gimpoperationcurves.c +++ b/app/gegl/gimpoperationcurves.c @@ -25,7 +25,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" diff --git a/app/gegl/gimpoperationdesaturate.c b/app/gegl/gimpoperationdesaturate.c index d7e57c5967..6e8688eb50 100644 --- a/app/gegl/gimpoperationdesaturate.c +++ b/app/gegl/gimpoperationdesaturate.c @@ -24,7 +24,7 @@ #include "libgimpcolor/gimpcolor.h" -#include "gegl-types.h" +#include "gimp-gegl-types.h" #include "gimpoperationdesaturate.h" #include "gimpdesaturateconfig.h" diff --git a/app/gegl/gimpoperationhuesaturation.c b/app/gegl/gimpoperationhuesaturation.c index 2fb9082c06..06c0aaa35b 100644 --- a/app/gegl/gimpoperationhuesaturation.c +++ b/app/gegl/gimpoperationhuesaturation.c @@ -25,7 +25,7 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpmath/gimpmath.h" -#include "gegl-types.h" +#include "gimp-gegl-types.h" #include "gimphuesaturationconfig.h" #include "gimpoperationhuesaturation.h" diff --git a/app/gegl/gimpoperationlevels.c b/app/gegl/gimpoperationlevels.c index 89de577a23..01cc7b112e 100644 --- a/app/gegl/gimpoperationlevels.c +++ b/app/gegl/gimpoperationlevels.c @@ -25,7 +25,7 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpmath/gimpmath.h" -#include "gegl-types.h" +#include "gimp-gegl-types.h" #include "gimplevelsconfig.h" #include "gimpoperationlevels.h" diff --git a/app/gegl/gimpoperationpointfilter.c b/app/gegl/gimpoperationpointfilter.c index 598a352ac4..9bbb55f6c9 100644 --- a/app/gegl/gimpoperationpointfilter.c +++ b/app/gegl/gimpoperationpointfilter.c @@ -22,7 +22,7 @@ #include -#include "gegl-types.h" +#include "gimp-gegl-types.h" #include "gimpoperationpointfilter.h" diff --git a/app/gegl/gimpoperationpointlayermode.c b/app/gegl/gimpoperationpointlayermode.c index 5a6d1c14e8..6ace46624c 100644 --- a/app/gegl/gimpoperationpointlayermode.c +++ b/app/gegl/gimpoperationpointlayermode.c @@ -25,7 +25,7 @@ #include "libgimpcolor/gimpcolor.h" -#include "gegl-types.h" +#include "gimp-gegl-types.h" #include "paint-funcs/paint-funcs.h" diff --git a/app/gegl/gimpoperationposterize.c b/app/gegl/gimpoperationposterize.c index 2ff6aa87a2..47d4a05f6b 100644 --- a/app/gegl/gimpoperationposterize.c +++ b/app/gegl/gimpoperationposterize.c @@ -25,7 +25,7 @@ #include "libgimpcolor/gimpcolor.h" #include "libgimpmath/gimpmath.h" -#include "gegl-types.h" +#include "gimp-gegl-types.h" #include "gimpoperationposterize.h" #include "gimpposterizeconfig.h" diff --git a/app/gegl/gimpoperationthreshold.c b/app/gegl/gimpoperationthreshold.c index 2d3403367e..2b21a283c3 100644 --- a/app/gegl/gimpoperationthreshold.c +++ b/app/gegl/gimpoperationthreshold.c @@ -24,7 +24,7 @@ #include "libgimpcolor/gimpcolor.h" -#include "gegl-types.h" +#include "gimp-gegl-types.h" #include "gimpoperationthreshold.h" #include "gimpthresholdconfig.h" diff --git a/app/gegl/gimpoperationtilesink.c b/app/gegl/gimpoperationtilesink.c index e5988a6bdd..f8f6395e8e 100644 --- a/app/gegl/gimpoperationtilesink.c +++ b/app/gegl/gimpoperationtilesink.c @@ -25,7 +25,7 @@ #include #include -#include "gegl-types.h" +#include "gimp-gegl-types.h" #include "base/base-types.h" #include "base/tile-manager.h" diff --git a/app/gegl/gimpoperationtilesource.c b/app/gegl/gimpoperationtilesource.c index 82c20686d4..3b2cc0ee78 100644 --- a/app/gegl/gimpoperationtilesource.c +++ b/app/gegl/gimpoperationtilesource.c @@ -25,7 +25,7 @@ #include #include -#include "gegl-types.h" +#include "gimp-gegl-types.h" #include "base/tile-manager.h" #include "base/pixel-region.h" diff --git a/app/gegl/gimpposterizeconfig.c b/app/gegl/gimpposterizeconfig.c index 151235d5d6..5bf9fda573 100644 --- a/app/gegl/gimpposterizeconfig.c +++ b/app/gegl/gimpposterizeconfig.c @@ -24,7 +24,7 @@ #include "libgimpconfig/gimpconfig.h" -#include "gegl-types.h" +#include "gimp-gegl-types.h" #include "gimpposterizeconfig.h" diff --git a/app/gegl/gimpthresholdconfig.c b/app/gegl/gimpthresholdconfig.c index 66d6d2f7be..8892f8d0b7 100644 --- a/app/gegl/gimpthresholdconfig.c +++ b/app/gegl/gimpthresholdconfig.c @@ -24,7 +24,7 @@ #include "libgimpconfig/gimpconfig.h" -#include "gegl-types.h" +#include "gimp-gegl-types.h" /* temp cruft */ #include "base/threshold.h"