summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKrzysztof Kosi??ski <tweenk.pl@gmail.com>2010-07-17 15:12:34 +0000
committerKrzysztof KosiƄski <tweenk.pl@gmail.com>2010-07-17 15:12:34 +0000
commit3f3908d396d95fe8f6271a57250275e1cf7264d1 (patch)
treed04b755202eddd385c2707dea9985cb15d29d9b2 /src
parentMinor cleanup of composite filter (diff)
downloadinkscape-3f3908d396d95fe8f6271a57250275e1cf7264d1.tar.gz
inkscape-3f3908d396d95fe8f6271a57250275e1cf7264d1.zip
Fix flood filter to really paint the specified color
(bzr r9508.1.22)
Diffstat (limited to 'src')
-rw-r--r--src/display/nr-filter-flood.cpp21
1 files changed, 11 insertions, 10 deletions
diff --git a/src/display/nr-filter-flood.cpp b/src/display/nr-filter-flood.cpp
index 7afd25e2d..f09738202 100644
--- a/src/display/nr-filter-flood.cpp
+++ b/src/display/nr-filter-flood.cpp
@@ -37,18 +37,19 @@ void FilterFlood::render_cairo(FilterSlot &slot)
{
cairo_surface_t *input = slot.getcairo(_input);
- double r, g, b, a;
- r = SP_RGBA32_R_F(color);
- g = SP_RGBA32_G_F(color);
- b = SP_RGBA32_B_F(color);
- a = opacity;
+ double r = SP_RGBA32_R_F(color);
+ double g = SP_RGBA32_G_F(color);
+ double b = SP_RGBA32_B_F(color);
+ double a = opacity;
#if ENABLE_LCMS
- guchar ru, gu, bu;
- icc_color_to_sRGB(icc, &ru, &gu, &bu);
- r = SP_COLOR_U_TO_F(ru);
- g = SP_COLOR_U_TO_F(gu);
- b = SP_COLOR_U_TO_F(bu);
+ if (icc) {
+ guchar ru, gu, bu;
+ icc_color_to_sRGB(icc, &ru, &gu, &bu);
+ r = SP_COLOR_U_TO_F(ru);
+ g = SP_COLOR_U_TO_F(gu);
+ b = SP_COLOR_U_TO_F(bu);
+ }
#endif
cairo_surface_t *out = ink_cairo_surface_create_same_size(input, CAIRO_CONTENT_COLOR_ALPHA);