From 3e119c5af7dafc32f96b9d091a12ab11fecd6f24 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Fri, 30 Mar 2012 15:08:54 +0200 Subject: [PATCH] libgimpcolor: add gimp_rgb[a]_set,get_pixel() which converts from/to any pixel format using Babl. Added tons of includes and CFLAGS now that libgimpcolor publically uses Babl. --- app/base/Makefile.am | 1 + app/base/temp-buf.c | 1 + app/composite/Makefile.am | 1 + app/composite/gimp-composite-generic.c | 1 + app/config/Makefile.am | 1 + app/config/gimpconfig-dump.c | 1 + app/config/gimpcoreconfig.c | 1 + app/config/gimpdisplayconfig.c | 1 + app/config/gimpdisplayoptions.c | 1 + app/config/gimprc-deserialize.c | 1 + app/core/gimpgradient-load.c | 2 +- app/core/gimpgrid.c | 2 +- app/core/gimppalette-load.c | 2 +- app/core/gimppalette-save.c | 2 +- app/display/gimpcanvas.c | 1 + app/gui/color-history.c | 1 + app/gui/splash.c | 1 + app/paint-funcs/Makefile.am | 1 + app/paint-funcs/paint-funcs.c | 1 + app/pdb/gimp-pdb-compat.c | 2 +- app/plug-in/plug-in-params.c | 2 +- app/text/gimptext-parasite.c | 2 +- app/widgets/gimpcairo.c | 1 + app/widgets/gimpcolorbar.c | 1 + app/widgets/gimpcurveview.c | 1 + app/widgets/gimpdynamicsoutputeditor.c | 1 + app/widgets/gimppaletteview.c | 1 + app/widgets/gimprender.c | 1 + app/widgets/gimptexttag.c | 1 + app/widgets/gimpviewrenderergradient.c | 1 + app/widgets/gimpviewrendererpalette.c | 1 + app/widgets/gimpwidgets-utils.c | 1 + libgimpcolor/Makefile.am | 2 + libgimpcolor/gimpadaptivesupersample.c | 1 + libgimpcolor/gimpcolor.def | 4 + libgimpcolor/gimpcolorspace.c | 1 + libgimpcolor/gimprgb-parse.c | 1 + libgimpcolor/gimprgb.c | 105 +++++++++++++++++++++++++ libgimpcolor/gimprgb.h | 14 ++++ libgimpconfig/Makefile.am | 2 + libgimpconfig/gimpcolorconfig.c | 1 + libgimpconfig/gimpconfig-deserialize.c | 1 + libgimpconfig/gimpconfig-serialize.c | 1 + libgimpconfig/gimpscanner.c | 1 + libgimpwidgets/Makefile.am | 2 + libgimpwidgets/gimpcairo-utils.c | 1 + libgimpwidgets/gimpcellrenderercolor.c | 1 + libgimpwidgets/gimpcolorarea.c | 1 + libgimpwidgets/gimpcolorbutton.c | 1 + libgimpwidgets/gimpcolordisplay.c | 1 + libgimpwidgets/gimpcolordisplaystack.c | 1 + libgimpwidgets/gimpcolorhexentry.c | 1 + libgimpwidgets/gimpcolornotebook.c | 1 + libgimpwidgets/gimpcolorscale.c | 1 + libgimpwidgets/gimpcolorscales.c | 1 + libgimpwidgets/gimpcolorselect.c | 1 + libgimpwidgets/gimpcolorselection.c | 1 + libgimpwidgets/gimpcolorselector.c | 1 + libgimpwidgets/gimpcontroller.c | 1 + libgimpwidgets/gimppickbutton.c | 3 +- libgimpwidgets/gimppropwidgets.c | 1 + libgimpwidgets/gimpscaleentry.c | 1 + libgimpwidgets/gimpwidgets.c | 1 + modules/Makefile.am | 1 + modules/color-selector-cmyk-lcms.c | 1 + modules/color-selector-water.c | 1 + modules/color-selector-wheel.c | 1 + modules/display-filter-color-blind.c | 1 + modules/display-filter-gamma.c | 1 + modules/display-filter-high-contrast.c | 1 + modules/display-filter-lcms.c | 1 + modules/display-filter-proof.c | 1 + plug-ins/pygimp/pygimpcolor.h | 1 + 73 files changed, 197 insertions(+), 8 deletions(-) diff --git a/app/base/Makefile.am b/app/base/Makefile.am index 2ca38a2c78..2268ec6094 100644 --- a/app/base/Makefile.am +++ b/app/base/Makefile.am @@ -8,6 +8,7 @@ INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir)/app \ -I$(top_srcdir)/app \ + $(BABL_CFLAGS) \ $(CAIRO_CFLAGS) \ $(GLIB_CFLAGS) \ -I$(includedir) diff --git a/app/base/temp-buf.c b/app/base/temp-buf.c index 125ab7f957..88375393a5 100644 --- a/app/base/temp-buf.c +++ b/app/base/temp-buf.c @@ -23,6 +23,7 @@ #include #include +#include #include #include #include diff --git a/app/composite/Makefile.am b/app/composite/Makefile.am index f843a19bee..3e2c07609f 100644 --- a/app/composite/Makefile.am +++ b/app/composite/Makefile.am @@ -11,6 +11,7 @@ INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir)/app \ -I$(top_srcdir)/app \ + $(BABL_CFLAGS) \ $(CAIRO_CFLAGS) \ $(GLIB_CFLAGS) \ -I$(includedir) diff --git a/app/composite/gimp-composite-generic.c b/app/composite/gimp-composite-generic.c index 007108429b..590246f7ff 100644 --- a/app/composite/gimp-composite-generic.c +++ b/app/composite/gimp-composite-generic.c @@ -26,6 +26,7 @@ #include #include +#include #include #include diff --git a/app/config/Makefile.am b/app/config/Makefile.am index 8012c01d0a..3b40d07d54 100644 --- a/app/config/Makefile.am +++ b/app/config/Makefile.am @@ -16,6 +16,7 @@ INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir)/app \ -I$(top_srcdir)/app \ + $(BABL_CFLAGS) \ $(CAIRO_CFLAGS) \ $(GDK_PIXBUF_CFLAGS) \ -I$(includedir) diff --git a/app/config/gimpconfig-dump.c b/app/config/gimpconfig-dump.c index 5cf410afbf..9cb75cac41 100644 --- a/app/config/gimpconfig-dump.c +++ b/app/config/gimpconfig-dump.c @@ -27,6 +27,7 @@ #include #endif +#include #include #include diff --git a/app/config/gimpcoreconfig.c b/app/config/gimpcoreconfig.c index d15aa05f54..05a78e2bea 100644 --- a/app/config/gimpcoreconfig.c +++ b/app/config/gimpcoreconfig.c @@ -20,6 +20,7 @@ #include "config.h" +#include #include #include diff --git a/app/config/gimpdisplayconfig.c b/app/config/gimpdisplayconfig.c index 91c8c3dc5b..dfb11d5353 100644 --- a/app/config/gimpdisplayconfig.c +++ b/app/config/gimpdisplayconfig.c @@ -20,6 +20,7 @@ #include "config.h" +#include #include #include diff --git a/app/config/gimpdisplayoptions.c b/app/config/gimpdisplayoptions.c index 2e038dc6d5..baa8617333 100644 --- a/app/config/gimpdisplayoptions.c +++ b/app/config/gimpdisplayoptions.c @@ -20,6 +20,7 @@ #include "config.h" +#include #include #include diff --git a/app/config/gimprc-deserialize.c b/app/config/gimprc-deserialize.c index f8217b515c..bec0b5a72b 100644 --- a/app/config/gimprc-deserialize.c +++ b/app/config/gimprc-deserialize.c @@ -20,6 +20,7 @@ #include "config.h" +#include #include #include diff --git a/app/core/gimpgradient-load.c b/app/core/gimpgradient-load.c index 6f18bad5f5..85ad9b7272 100644 --- a/app/core/gimpgradient-load.c +++ b/app/core/gimpgradient-load.c @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include "libgimpbase/gimpbase.h" diff --git a/app/core/gimpgrid.c b/app/core/gimpgrid.c index 0ae08f1825..674941e58f 100644 --- a/app/core/gimpgrid.c +++ b/app/core/gimpgrid.c @@ -23,7 +23,7 @@ #include #include -#include +#include #include "libgimpbase/gimpbase.h" #include "libgimpconfig/gimpconfig.h" diff --git a/app/core/gimppalette-load.c b/app/core/gimppalette-load.c index 475ce42bd3..453d857806 100644 --- a/app/core/gimppalette-load.c +++ b/app/core/gimppalette-load.c @@ -32,7 +32,7 @@ #endif #include -#include +#include #include #ifdef G_OS_WIN32 diff --git a/app/core/gimppalette-save.c b/app/core/gimppalette-save.c index e0e0d444f9..f54ca27f0d 100644 --- a/app/core/gimppalette-save.c +++ b/app/core/gimppalette-save.c @@ -26,7 +26,7 @@ #endif #include -#include +#include #include #include "libgimpbase/gimpbase.h" diff --git a/app/display/gimpcanvas.c b/app/display/gimpcanvas.c index 0c89bb87f7..44965ecf0f 100644 --- a/app/display/gimpcanvas.c +++ b/app/display/gimpcanvas.c @@ -17,6 +17,7 @@ #include "config.h" +#include #include #include "libgimpcolor/gimpcolor.h" diff --git a/app/gui/color-history.c b/app/gui/color-history.c index 9540ad11ea..90d6a6d5ab 100644 --- a/app/gui/color-history.c +++ b/app/gui/color-history.c @@ -20,6 +20,7 @@ #include "config.h" +#include #include #include "libgimpbase/gimpbase.h" diff --git a/app/gui/splash.c b/app/gui/splash.c index 9e3dd637ed..84ff914c11 100644 --- a/app/gui/splash.c +++ b/app/gui/splash.c @@ -19,6 +19,7 @@ #include +#include #include #include "libgimpbase/gimpbase.h" diff --git a/app/paint-funcs/Makefile.am b/app/paint-funcs/Makefile.am index 1449b68325..08c4f85514 100644 --- a/app/paint-funcs/Makefile.am +++ b/app/paint-funcs/Makefile.am @@ -13,6 +13,7 @@ INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir)/app \ -I$(top_srcdir)/app \ + $(BABL_CFLAGS) \ $(CAIRO_CFLAGS) \ $(GLIB_CFLAGS) \ -I$(includedir) diff --git a/app/paint-funcs/paint-funcs.c b/app/paint-funcs/paint-funcs.c index 74b3f82c26..3887c79f5e 100644 --- a/app/paint-funcs/paint-funcs.c +++ b/app/paint-funcs/paint-funcs.c @@ -19,6 +19,7 @@ #include +#include #include #include diff --git a/app/pdb/gimp-pdb-compat.c b/app/pdb/gimp-pdb-compat.c index 52a1308111..a793c3f2e2 100644 --- a/app/pdb/gimp-pdb-compat.c +++ b/app/pdb/gimp-pdb-compat.c @@ -18,7 +18,7 @@ #include "config.h" #include -#include +#include #include "libgimpbase/gimpbase.h" #include "libgimpcolor/gimpcolor.h" diff --git a/app/plug-in/plug-in-params.c b/app/plug-in/plug-in-params.c index 0b1727678a..c4705d6458 100644 --- a/app/plug-in/plug-in-params.c +++ b/app/plug-in/plug-in-params.c @@ -18,7 +18,7 @@ #include "config.h" #include -#include +#include #include "libgimpbase/gimpbase.h" #include "libgimpbase/gimpprotocol.h" diff --git a/app/text/gimptext-parasite.c b/app/text/gimptext-parasite.c index aa8026ed66..bb3c419b3d 100644 --- a/app/text/gimptext-parasite.c +++ b/app/text/gimptext-parasite.c @@ -24,7 +24,7 @@ #include #include -#include +#include #include "libgimpbase/gimpbase.h" #include "libgimpcolor/gimpcolor.h" diff --git a/app/widgets/gimpcairo.c b/app/widgets/gimpcairo.c index 7e4e67cc72..2ca84be28d 100644 --- a/app/widgets/gimpcairo.c +++ b/app/widgets/gimpcairo.c @@ -23,6 +23,7 @@ #include "config.h" +#include #include #include "libgimpcolor/gimpcolor.h" diff --git a/app/widgets/gimpcolorbar.c b/app/widgets/gimpcolorbar.c index 0e9b2acd73..ccf5697dad 100644 --- a/app/widgets/gimpcolorbar.c +++ b/app/widgets/gimpcolorbar.c @@ -19,6 +19,7 @@ #include +#include #include #include "libgimpwidgets/gimpwidgets.h" diff --git a/app/widgets/gimpcurveview.c b/app/widgets/gimpcurveview.c index 487e1f7416..3daab3d652 100644 --- a/app/widgets/gimpcurveview.c +++ b/app/widgets/gimpcurveview.c @@ -19,6 +19,7 @@ #include +#include #include #include diff --git a/app/widgets/gimpdynamicsoutputeditor.c b/app/widgets/gimpdynamicsoutputeditor.c index 234abc67d1..0d4c743dee 100644 --- a/app/widgets/gimpdynamicsoutputeditor.c +++ b/app/widgets/gimpdynamicsoutputeditor.c @@ -20,6 +20,7 @@ #include "config.h" +#include #include #include "libgimpbase/gimpbase.h" diff --git a/app/widgets/gimppaletteview.c b/app/widgets/gimppaletteview.c index a34dd50a56..4b6128ccd4 100644 --- a/app/widgets/gimppaletteview.c +++ b/app/widgets/gimppaletteview.c @@ -20,6 +20,7 @@ #include "config.h" +#include #include #include diff --git a/app/widgets/gimprender.c b/app/widgets/gimprender.c index 4c76e432cb..587c6a12a5 100644 --- a/app/widgets/gimprender.c +++ b/app/widgets/gimprender.c @@ -19,6 +19,7 @@ #include +#include #include #include "libgimpbase/gimpbase.h" diff --git a/app/widgets/gimptexttag.c b/app/widgets/gimptexttag.c index 5b706af9ff..dee775b6a8 100644 --- a/app/widgets/gimptexttag.c +++ b/app/widgets/gimptexttag.c @@ -20,6 +20,7 @@ #include "config.h" +#include #include #include "libgimpcolor/gimpcolor.h" diff --git a/app/widgets/gimpviewrenderergradient.c b/app/widgets/gimpviewrenderergradient.c index dc7c577dae..1a3adc8132 100644 --- a/app/widgets/gimpviewrenderergradient.c +++ b/app/widgets/gimpviewrenderergradient.c @@ -22,6 +22,7 @@ #include +#include #include #include "libgimpbase/gimpbase.h" diff --git a/app/widgets/gimpviewrendererpalette.c b/app/widgets/gimpviewrendererpalette.c index a9e743b096..bb5f25055e 100644 --- a/app/widgets/gimpviewrendererpalette.c +++ b/app/widgets/gimpviewrendererpalette.c @@ -22,6 +22,7 @@ #include +#include #include #include "libgimpcolor/gimpcolor.h" diff --git a/app/widgets/gimpwidgets-utils.c b/app/widgets/gimpwidgets-utils.c index af3c1f48b0..f24a1c9414 100644 --- a/app/widgets/gimpwidgets-utils.c +++ b/app/widgets/gimpwidgets-utils.c @@ -22,6 +22,7 @@ #include +#include #include #ifdef GDK_WINDOWING_WIN32 diff --git a/libgimpcolor/Makefile.am b/libgimpcolor/Makefile.am index 5f89ab69a5..7afd916edb 100644 --- a/libgimpcolor/Makefile.am +++ b/libgimpcolor/Makefile.am @@ -52,6 +52,7 @@ AM_CPPFLAGS = \ INCLUDES = \ -I$(top_srcdir) \ + $(BABL_CFLAGS) \ $(CAIRO_CFLAGS) \ $(GLIB_CFLAGS) \ -I$(includedir) @@ -107,6 +108,7 @@ libgimpcolor_2_0_la_DEPENDENCIES = \ $(libgimpbase) libgimpcolor_2_0_la_LIBADD = \ + $(BABL_LIBS) \ $(CAIRO_LIBS) \ $(GLIB_LIBS) \ $(libm) diff --git a/libgimpcolor/gimpadaptivesupersample.c b/libgimpcolor/gimpadaptivesupersample.c index 9317b2f756..3ed96e1f1e 100644 --- a/libgimpcolor/gimpadaptivesupersample.c +++ b/libgimpcolor/gimpadaptivesupersample.c @@ -18,6 +18,7 @@ #include "config.h" +#include #include #include "libgimpmath/gimpmath.h" diff --git a/libgimpcolor/gimpcolor.def b/libgimpcolor/gimpcolor.def index 57f0d52493..32eb45db62 100644 --- a/libgimpcolor/gimpcolor.def +++ b/libgimpcolor/gimpcolor.def @@ -42,6 +42,7 @@ EXPORTS gimp_rgb_composite gimp_rgb_distance gimp_rgb_gamma + gimp_rgb_get_pixel gimp_rgb_get_type gimp_rgb_get_uchar gimp_rgb_intensity @@ -57,6 +58,7 @@ EXPORTS gimp_rgb_parse_name gimp_rgb_set gimp_rgb_set_alpha + gimp_rgb_set_pixel gimp_rgb_set_uchar gimp_rgb_subtract gimp_rgb_to_cmyk @@ -70,10 +72,12 @@ EXPORTS gimp_rgb_to_l_int gimp_rgba_add gimp_rgba_distance + gimp_rgba_get_pixel gimp_rgba_get_uchar gimp_rgba_multiply gimp_rgba_parse_css gimp_rgba_set + gimp_rgba_set_pixel gimp_rgba_set_uchar gimp_rgba_subtract gimp_value_get_rgb diff --git a/libgimpcolor/gimpcolorspace.c b/libgimpcolor/gimpcolorspace.c index b3d5ee3f5f..760479c9ff 100644 --- a/libgimpcolor/gimpcolorspace.c +++ b/libgimpcolor/gimpcolorspace.c @@ -18,6 +18,7 @@ #include "config.h" +#include #include #include "libgimpmath/gimpmath.h" diff --git a/libgimpcolor/gimprgb-parse.c b/libgimpcolor/gimprgb-parse.c index 60fb180959..0fb313484f 100644 --- a/libgimpcolor/gimprgb-parse.c +++ b/libgimpcolor/gimprgb-parse.c @@ -28,6 +28,7 @@ #include #include +#include #include #include "gimpcolortypes.h" diff --git a/libgimpcolor/gimprgb.c b/libgimpcolor/gimprgb.c index 329c107fc2..8cb064b34c 100644 --- a/libgimpcolor/gimprgb.c +++ b/libgimpcolor/gimprgb.c @@ -18,6 +18,7 @@ #include "config.h" +#include #include #include "libgimpmath/gimpmath.h" @@ -130,6 +131,58 @@ gimp_rgb_set_alpha (GimpRGB *rgb, rgb->a = a; } +/** + * gimp_rgb_set: + * @rgb: a #GimpRGB struct + * @format: a Babl format + * @pixel: pointer to the source pixel + * + * Sets the red, green and blue components of @rgb from the color + * stored in @pixel. The pixel format of @pixel is determined by + * @format. + * + * Since: GIMP 2.10 + **/ +void +gimp_rgb_set_pixel (GimpRGB *rgb, + const Babl *format, + gconstpointer pixel) +{ + g_return_if_fail (rgb != NULL); + g_return_if_fail (format != NULL); + g_return_if_fail (pixel != NULL); + + babl_process (babl_fish (format, + babl_format ("R'G'B' double")), + pixel, rgb, 1); +} + +/** + * gimp_rgb_get: + * @rgb: a #GimpRGB struct + * @format: a Babl format + * @pixel: pointer to the destination pixel + * + * Writes the red, green, blue and alpha components of @rgb to the + * color stored in @pixel. The pixel format of @pixel is determined by + * @format. + * + * Since: GIMP 2.10 + **/ +void +gimp_rgb_get_pixel (const GimpRGB *rgb, + const Babl *format, + gpointer pixel) +{ + g_return_if_fail (rgb != NULL); + g_return_if_fail (format != NULL); + g_return_if_fail (pixel != NULL); + + babl_process (babl_fish (babl_format ("R'G'B' double"), + format), + rgb, pixel, 1); +} + /** * gimp_rgb_set_uchar: * @rgb: a #GimpRGB struct @@ -383,6 +436,58 @@ gimp_rgb_composite (GimpRGB *color1, /* RGBA functions */ +/** + * gimp_rgba_set: + * @rgba: a #GimpRGB struct + * @format: a Babl format + * @pixel: pointer to the source pixel + * + * Sets the red, green, blue and alpha components of @rgba from the + * color stored in @pixel. The pixel format of @pixel is determined + * by @format. + * + * Since: GIMP 2.10 + **/ +void +gimp_rgba_set_pixel (GimpRGB *rgba, + const Babl *format, + gconstpointer pixel) +{ + g_return_if_fail (rgba != NULL); + g_return_if_fail (format != NULL); + g_return_if_fail (pixel != NULL); + + babl_process (babl_fish (format, + babl_format ("R'G'B'A double")), + pixel, rgba, 1); +} + +/** + * gimp_rgba_get: + * @rgba: a #GimpRGB struct + * @format: a Babl format + * @pixel: pointer to the destination pixel + * + * Writes the red, green, blue and alpha components of @rgba to the + * color stored in @pixel. The pixel format of @pixel is determined by + * @format. + * + * Since: GIMP 2.10 + **/ +void +gimp_rgba_get_pixel (const GimpRGB *rgba, + const Babl *format, + gpointer pixel) +{ + g_return_if_fail (rgba != NULL); + g_return_if_fail (format != NULL); + g_return_if_fail (pixel != NULL); + + babl_process (babl_fish (babl_format ("R'G'B'A double"), + format), + rgba, pixel, 1); +} + /** * gimp_rgba_set: * @rgba: a #GimpRGB struct diff --git a/libgimpcolor/gimprgb.h b/libgimpcolor/gimprgb.h index d618b53b08..8646978866 100644 --- a/libgimpcolor/gimprgb.h +++ b/libgimpcolor/gimprgb.h @@ -80,6 +80,13 @@ void gimp_rgb_set (GimpRGB *rgb, void gimp_rgb_set_alpha (GimpRGB *rgb, gdouble alpha); +void gimp_rgb_set_pixel (GimpRGB *rgb, + const Babl *format, + gconstpointer pixel); +void gimp_rgb_get_pixel (const GimpRGB *rgb, + const Babl *format, + gpointer pixel); + void gimp_rgb_set_uchar (GimpRGB *rgb, guchar red, guchar green, @@ -138,6 +145,13 @@ void gimp_rgba_set (GimpRGB *rgba, gdouble blue, gdouble alpha); +void gimp_rgba_set_pixel (GimpRGB *rgba, + const Babl *format, + gconstpointer pixel); +void gimp_rgba_get_pixel (const GimpRGB *rgba, + const Babl *format, + gpointer pixel); + void gimp_rgba_set_uchar (GimpRGB *rgba, guchar red, guchar green, diff --git a/libgimpconfig/Makefile.am b/libgimpconfig/Makefile.am index 4f4816988f..67a7127d71 100644 --- a/libgimpconfig/Makefile.am +++ b/libgimpconfig/Makefile.am @@ -49,6 +49,7 @@ AM_CPPFLAGS = \ INCLUDES = \ -I$(top_srcdir) \ + $(BABL_CFLAGS) \ $(CAIRO_CFLAGS) \ $(GLIB_CFLAGS) \ -I$(includedir) @@ -116,6 +117,7 @@ libgimpconfig_2_0_la_LIBADD = \ $(libgimpbase) \ $(libgimpcolor) \ $(libgimpmath) \ + $(BABL_LIBS) \ $(CAIRO_LIBS) \ $(GLIB_LIBS) diff --git a/libgimpconfig/gimpcolorconfig.c b/libgimpconfig/gimpcolorconfig.c index 6bfe77a57b..6b73925266 100644 --- a/libgimpconfig/gimpcolorconfig.c +++ b/libgimpconfig/gimpcolorconfig.c @@ -21,6 +21,7 @@ #include "config.h" +#include #include #include diff --git a/libgimpconfig/gimpconfig-deserialize.c b/libgimpconfig/gimpconfig-deserialize.c index 122190fdf6..5bbc49156b 100644 --- a/libgimpconfig/gimpconfig-deserialize.c +++ b/libgimpconfig/gimpconfig-deserialize.c @@ -21,6 +21,7 @@ #include "config.h" +#include #include #include diff --git a/libgimpconfig/gimpconfig-serialize.c b/libgimpconfig/gimpconfig-serialize.c index 2b44c3b82e..3e2b003f95 100644 --- a/libgimpconfig/gimpconfig-serialize.c +++ b/libgimpconfig/gimpconfig-serialize.c @@ -21,6 +21,7 @@ #include "config.h" +#include #include #include diff --git a/libgimpconfig/gimpscanner.c b/libgimpconfig/gimpscanner.c index 228bbd7e2c..31743d114b 100644 --- a/libgimpconfig/gimpscanner.c +++ b/libgimpconfig/gimpscanner.c @@ -25,6 +25,7 @@ #include #include +#include #include #include diff --git a/libgimpwidgets/Makefile.am b/libgimpwidgets/Makefile.am index 91f752e634..b820cac1c3 100644 --- a/libgimpwidgets/Makefile.am +++ b/libgimpwidgets/Makefile.am @@ -54,6 +54,7 @@ AM_CPPFLAGS = \ INCLUDES = \ -I$(top_srcdir) \ + $(BABL_CFLAGS) \ $(GTK_CFLAGS) \ -I$(includedir) @@ -261,6 +262,7 @@ libgimpwidgets_2_0_la_LIBADD = \ $(libgimpcolor) \ $(libgimpconfig) \ $(libgimpbase) \ + $(BABL_LIBS) \ $(GTK_LIBS) \ $(libm) diff --git a/libgimpwidgets/gimpcairo-utils.c b/libgimpwidgets/gimpcairo-utils.c index 3b1dd88f36..7ad9297f10 100644 --- a/libgimpwidgets/gimpcairo-utils.c +++ b/libgimpwidgets/gimpcairo-utils.c @@ -23,6 +23,7 @@ #include +#include #include #include "libgimpbase/gimpbase.h" diff --git a/libgimpwidgets/gimpcellrenderercolor.c b/libgimpwidgets/gimpcellrenderercolor.c index 20c33f603a..7da4b2a781 100644 --- a/libgimpwidgets/gimpcellrenderercolor.c +++ b/libgimpwidgets/gimpcellrenderercolor.c @@ -21,6 +21,7 @@ #include "config.h" +#include #include #include "libgimpbase/gimpbase.h" diff --git a/libgimpwidgets/gimpcolorarea.c b/libgimpwidgets/gimpcolorarea.c index 3f4edecee9..913dcfda1f 100644 --- a/libgimpwidgets/gimpcolorarea.c +++ b/libgimpwidgets/gimpcolorarea.c @@ -21,6 +21,7 @@ #include "config.h" +#include #include #include "libgimpcolor/gimpcolor.h" diff --git a/libgimpwidgets/gimpcolorbutton.c b/libgimpwidgets/gimpcolorbutton.c index a235512179..393e88f605 100644 --- a/libgimpwidgets/gimpcolorbutton.c +++ b/libgimpwidgets/gimpcolorbutton.c @@ -23,6 +23,7 @@ #include +#include #include #include "libgimpcolor/gimpcolor.h" diff --git a/libgimpwidgets/gimpcolordisplay.c b/libgimpwidgets/gimpcolordisplay.c index 5216b4adca..e6eb823c26 100644 --- a/libgimpwidgets/gimpcolordisplay.c +++ b/libgimpwidgets/gimpcolordisplay.c @@ -23,6 +23,7 @@ #include +#include #include #include "libgimpbase/gimpbase.h" diff --git a/libgimpwidgets/gimpcolordisplaystack.c b/libgimpwidgets/gimpcolordisplaystack.c index 76eac5b325..74331a0e5f 100644 --- a/libgimpwidgets/gimpcolordisplaystack.c +++ b/libgimpwidgets/gimpcolordisplaystack.c @@ -21,6 +21,7 @@ #include "config.h" +#include #include #include "libgimpcolor/gimpcolor.h" diff --git a/libgimpwidgets/gimpcolorhexentry.c b/libgimpwidgets/gimpcolorhexentry.c index e5885d7ee5..6c503b4247 100644 --- a/libgimpwidgets/gimpcolorhexentry.c +++ b/libgimpwidgets/gimpcolorhexentry.c @@ -23,6 +23,7 @@ #include +#include #include #include diff --git a/libgimpwidgets/gimpcolornotebook.c b/libgimpwidgets/gimpcolornotebook.c index a265da51ea..5f6cb0a04d 100644 --- a/libgimpwidgets/gimpcolornotebook.c +++ b/libgimpwidgets/gimpcolornotebook.c @@ -24,6 +24,7 @@ #include "config.h" +#include #include #include "libgimpcolor/gimpcolor.h" diff --git a/libgimpwidgets/gimpcolorscale.c b/libgimpwidgets/gimpcolorscale.c index 4bebdbdad4..d9b46edef9 100644 --- a/libgimpwidgets/gimpcolorscale.c +++ b/libgimpwidgets/gimpcolorscale.c @@ -24,6 +24,7 @@ #include +#include #include #include "libgimpcolor/gimpcolor.h" diff --git a/libgimpwidgets/gimpcolorscales.c b/libgimpwidgets/gimpcolorscales.c index 751a5e56b8..0b1f8752cc 100644 --- a/libgimpwidgets/gimpcolorscales.c +++ b/libgimpwidgets/gimpcolorscales.c @@ -26,6 +26,7 @@ #include +#include #include #include "libgimpbase/gimpbase.h" diff --git a/libgimpwidgets/gimpcolorselect.c b/libgimpwidgets/gimpcolorselect.c index 7f28f840e0..7b48c1ba06 100644 --- a/libgimpwidgets/gimpcolorselect.c +++ b/libgimpwidgets/gimpcolorselect.c @@ -24,6 +24,7 @@ #include "config.h" +#include #include #include "libgimpbase/gimpbase.h" diff --git a/libgimpwidgets/gimpcolorselection.c b/libgimpwidgets/gimpcolorselection.c index acea552692..896ec68751 100644 --- a/libgimpwidgets/gimpcolorselection.c +++ b/libgimpwidgets/gimpcolorselection.c @@ -21,6 +21,7 @@ #include "config.h" +#include #include #include "libgimpcolor/gimpcolor.h" diff --git a/libgimpwidgets/gimpcolorselector.c b/libgimpwidgets/gimpcolorselector.c index 27d408ca93..e3ac08f9a3 100644 --- a/libgimpwidgets/gimpcolorselector.c +++ b/libgimpwidgets/gimpcolorselector.c @@ -25,6 +25,7 @@ #include "config.h" +#include #include #include "libgimpcolor/gimpcolor.h" diff --git a/libgimpwidgets/gimpcontroller.c b/libgimpwidgets/gimpcontroller.c index 8ce412d35a..9309bc4d85 100644 --- a/libgimpwidgets/gimpcontroller.c +++ b/libgimpwidgets/gimpcontroller.c @@ -21,6 +21,7 @@ #include "config.h" +#include #include #include "libgimpcolor/gimpcolor.h" diff --git a/libgimpwidgets/gimppickbutton.c b/libgimpwidgets/gimppickbutton.c index 05482a7e45..0738f01bfc 100644 --- a/libgimpwidgets/gimppickbutton.c +++ b/libgimpwidgets/gimppickbutton.c @@ -18,8 +18,9 @@ #include "config.h" -#include +#include #include +#include #include "libgimpcolor/gimpcolor.h" diff --git a/libgimpwidgets/gimppropwidgets.c b/libgimpwidgets/gimppropwidgets.c index a8d2e2310f..1dd879c075 100644 --- a/libgimpwidgets/gimppropwidgets.c +++ b/libgimpwidgets/gimppropwidgets.c @@ -19,6 +19,7 @@ #include +#include /* FIXME: #undef GTK_DISABLE_DEPRECATED */ #undef GTK_DISABLE_DEPRECATED #include diff --git a/libgimpwidgets/gimpscaleentry.c b/libgimpwidgets/gimpscaleentry.c index abff2ba1f7..369a767487 100644 --- a/libgimpwidgets/gimpscaleentry.c +++ b/libgimpwidgets/gimpscaleentry.c @@ -21,6 +21,7 @@ #include "config.h" +#include #include #include "libgimpcolor/gimpcolor.h" diff --git a/libgimpwidgets/gimpwidgets.c b/libgimpwidgets/gimpwidgets.c index b0bbbb7393..6aa409e2f9 100644 --- a/libgimpwidgets/gimpwidgets.c +++ b/libgimpwidgets/gimpwidgets.c @@ -21,6 +21,7 @@ #include "config.h" +#include #include #include "libgimpcolor/gimpcolor.h" diff --git a/modules/Makefile.am b/modules/Makefile.am index 746a618c7e..7b50ac60f7 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -14,6 +14,7 @@ libdir = $(gimpplugindir)/modules INCLUDES = \ -I$(top_srcdir) \ + $(BABL_CFLAGS) \ $(GTK_CFLAGS) \ -I$(includedir) diff --git a/modules/color-selector-cmyk-lcms.c b/modules/color-selector-cmyk-lcms.c index 0d5d20f6d0..d40677c275 100644 --- a/modules/color-selector-cmyk-lcms.c +++ b/modules/color-selector-cmyk-lcms.c @@ -21,6 +21,7 @@ #include +#include #include #include "libgimpcolor/gimpcolor.h" diff --git a/modules/color-selector-water.c b/modules/color-selector-water.c index 1d8f024bba..fc34e0ff6a 100644 --- a/modules/color-selector-water.c +++ b/modules/color-selector-water.c @@ -21,6 +21,7 @@ #include #include +#include #include #include "libgimpcolor/gimpcolor.h" diff --git a/modules/color-selector-wheel.c b/modules/color-selector-wheel.c index 465b0959b4..ed09deada1 100644 --- a/modules/color-selector-wheel.c +++ b/modules/color-selector-wheel.c @@ -20,6 +20,7 @@ #include #include +#include #include #include "libgimpcolor/gimpcolor.h" diff --git a/modules/display-filter-color-blind.c b/modules/display-filter-color-blind.c index 49daefb876..65d7416786 100644 --- a/modules/display-filter-color-blind.c +++ b/modules/display-filter-color-blind.c @@ -29,6 +29,7 @@ #include +#include #include #include "libgimpcolor/gimpcolor.h" diff --git a/modules/display-filter-gamma.c b/modules/display-filter-gamma.c index 2287f59089..7030df9823 100644 --- a/modules/display-filter-gamma.c +++ b/modules/display-filter-gamma.c @@ -17,6 +17,7 @@ #include "config.h" +#include #include #include "libgimpcolor/gimpcolor.h" diff --git a/modules/display-filter-high-contrast.c b/modules/display-filter-high-contrast.c index a779fe0162..80b547d216 100644 --- a/modules/display-filter-high-contrast.c +++ b/modules/display-filter-high-contrast.c @@ -17,6 +17,7 @@ #include "config.h" +#include #include #include "libgimpcolor/gimpcolor.h" diff --git a/modules/display-filter-lcms.c b/modules/display-filter-lcms.c index c99b0f8135..0e270931b6 100644 --- a/modules/display-filter-lcms.c +++ b/modules/display-filter-lcms.c @@ -27,6 +27,7 @@ #include +#include #include #ifdef GDK_WINDOWING_QUARTZ diff --git a/modules/display-filter-proof.c b/modules/display-filter-proof.c index 41967f519a..57a2327896 100644 --- a/modules/display-filter-proof.c +++ b/modules/display-filter-proof.c @@ -21,6 +21,7 @@ #include +#include #include #include "libgimpbase/gimpbase.h" diff --git a/plug-ins/pygimp/pygimpcolor.h b/plug-ins/pygimp/pygimpcolor.h index 53a6bdbd19..fb2f000cdd 100644 --- a/plug-ins/pygimp/pygimpcolor.h +++ b/plug-ins/pygimp/pygimpcolor.h @@ -21,6 +21,7 @@ #include +#include #include #include