diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2010-08-14 17:02:47 +0000 |
|---|---|---|
| committer | Krzysztof Kosiński <tweenk.pl@gmail.com> | 2010-08-14 17:02:47 +0000 |
| commit | 01fd769e29aa1738b1326d4a50a8f09a6665f242 (patch) | |
| tree | af1754712f0c8c39c9f245f13a41d50674acd406 /src/display | |
| parent | Fix background tracing in clone tiler dialog (diff) | |
| download | inkscape-01fd769e29aa1738b1326d4a50a8f09a6665f242.tar.gz inkscape-01fd769e29aa1738b1326d4a50a8f09a6665f242.zip | |
Fix paint bucket tool
(bzr r9508.1.66)
Diffstat (limited to 'src/display')
| -rw-r--r-- | src/display/cairo-templates.h | 10 | ||||
| -rw-r--r-- | src/display/cairo-utils.h | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/display/cairo-templates.h b/src/display/cairo-templates.h index 2b97dd6d6..a79f58548 100644 --- a/src/display/cairo-templates.h +++ b/src/display/cairo-templates.h @@ -676,16 +676,6 @@ pxclamp(gint32 v, gint32 low, gint32 high) { return v; } -#define EXTRACT_ARGB32(px,a,r,g,b) \ - guint32 a, r, g, b; \ - a = (px & 0xff000000) >> 24; \ - r = (px & 0x00ff0000) >> 16; \ - g = (px & 0x0000ff00) >> 8; \ - b = (px & 0x000000ff); - -#define ASSEMBLE_ARGB32(px,a,r,g,b) \ - guint32 px = (a << 24) | (r << 16) | (g << 8) | b; - #endif /* Local Variables: diff --git a/src/display/cairo-utils.h b/src/display/cairo-utils.h index 0acdcb46a..aa441f0c5 100644 --- a/src/display/cairo-utils.h +++ b/src/display/cairo-utils.h @@ -121,6 +121,16 @@ unpremul_alpha(guint32 color, guint32 alpha) void feed_pathvector_to_cairo (cairo_t *ct, Geom::PathVector const &pathv, Geom::Matrix trans, Geom::OptRect area, bool optimize_stroke, double stroke_width); void feed_pathvector_to_cairo (cairo_t *ct, Geom::PathVector const &pathv); +#define EXTRACT_ARGB32(px,a,r,g,b) \ + guint32 a, r, g, b; \ + a = (px & 0xff000000) >> 24; \ + r = (px & 0x00ff0000) >> 16; \ + g = (px & 0x0000ff00) >> 8; \ + b = (px & 0x000000ff); + +#define ASSEMBLE_ARGB32(px,a,r,g,b) \ + guint32 px = (a << 24) | (r << 16) | (g << 8) | b; + #endif /* Local Variables: |