diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2014-10-14 18:38:41 +0000 |
|---|---|---|
| committer | tavmjong-free <tavmjong@free.fr> | 2014-10-14 18:38:41 +0000 |
| commit | e056d0fa49ed5b9369c0c16c1c4df0c671b88b68 (patch) | |
| tree | 1788e981f21d9b8ae27a3fb23cd7ee68c98e27f9 /src/display/drawing-shape.cpp | |
| parent | Implement marker 'orient' attribute value 'auto-start-reverse'. (diff) | |
| parent | Merged hatch pdf and png export code (diff) | |
| download | inkscape-e056d0fa49ed5b9369c0c16c1c4df0c671b88b68.tar.gz inkscape-e056d0fa49ed5b9369c0c16c1c4df0c671b88b68.zip | |
Merge hatch rendering code from Tomasz Boczkowski.
(bzr r13614)
Diffstat (limited to 'src/display/drawing-shape.cpp')
| -rw-r--r-- | src/display/drawing-shape.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/display/drawing-shape.cpp b/src/display/drawing-shape.cpp index 1a41bdb3a..fe525b1a5 100644 --- a/src/display/drawing-shape.cpp +++ b/src/display/drawing-shape.cpp @@ -155,7 +155,7 @@ DrawingShape::_renderFill(DrawingContext &dc) Inkscape::DrawingContext::Save save(dc); dc.transform(_ctm); - bool has_fill = _nrstyle.prepareFill(dc, _item_bbox); + bool has_fill = _nrstyle.prepareFill(dc, _item_bbox, _fill_pattern); if( has_fill ) { dc.path(_curve->get_pathvector()); @@ -171,7 +171,7 @@ DrawingShape::_renderStroke(DrawingContext &dc) Inkscape::DrawingContext::Save save(dc); dc.transform(_ctm); - bool has_stroke = _nrstyle.prepareStroke(dc, _item_bbox); + bool has_stroke = _nrstyle.prepareStroke(dc, _item_bbox, _stroke_pattern); has_stroke &= (_nrstyle.stroke_width != 0); if( has_stroke ) { @@ -231,8 +231,8 @@ DrawingShape::_renderItem(DrawingContext &dc, Geom::IntRect const &area, unsigne // update fill and stroke paints. // this cannot be done during nr_arena_shape_update, because we need a Cairo context // to render svg:pattern - bool has_fill = _nrstyle.prepareFill(dc, _item_bbox); - bool has_stroke = _nrstyle.prepareStroke(dc, _item_bbox); + bool has_fill = _nrstyle.prepareFill(dc, _item_bbox, _fill_pattern); + bool has_stroke = _nrstyle.prepareStroke(dc, _item_bbox, _stroke_pattern); has_stroke &= (_nrstyle.stroke_width != 0); if (has_fill || has_stroke) { |