summaryrefslogtreecommitdiff
path: root/vcl/headless
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-07-23 17:35:41 +0100
committerCaolán McNamara <caolanm@redhat.com>2019-07-24 09:17:50 +0200
commite18dbb2b7f48a1380e9d1cb6443705d1ce2b2ad5 (patch)
tree841b47efecc7ea89544fcd482a4ba5af9d704cf9 /vcl/headless
parentd33a73a2f8a17d7e399ddab0da96e83aab009e55 (diff)
Resolves: tdf#126227 calc red change tracking rectangles missing their top
cairo_set_matrix doesn't appear to have any effect on an existing path, so set a new path on both fill and stroke so the matrix set for line will have an effect, so drop cairo_fill_preserve to cairo_fill and rely on the path cache. Change-Id: I31f16b094c920b107467a9492c7194bb578c1924 Reviewed-on: https://gerrit.libreoffice.org/76198 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/headless')
-rw-r--r--vcl/headless/svpgdi.cxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 18b9c88cc905..3b59fac40169 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -1448,18 +1448,18 @@ bool SvpSalGraphics::drawPolyPolygon(
cairo_set_matrix(cr, &aMatrix);
}
- add_polygon_path(cr, rPolyPolygon, rObjectToDevice, !getAntiAliasB2DDraw());
-
// To make releaseCairoContext work, use empty extents
basegfx::B2DRange extents;
if (bHasFill)
{
+ add_polygon_path(cr, rPolyPolygon, rObjectToDevice, !getAntiAliasB2DDraw());
+
applyColor(cr, m_aFillColor, fTransparency);
// Get FillDamage (will be extended for LineDamage below)
extents = getClippedFillDamage(cr);
- cairo_fill_preserve(cr);
+ cairo_fill(cr);
}
if (bHasLine)
@@ -1469,6 +1469,8 @@ bool SvpSalGraphics::drawPolyPolygon(
cairo_matrix_init_translate(&aMatrix, 0.5, 0.5);
cairo_set_matrix(cr, &aMatrix);
+ add_polygon_path(cr, rPolyPolygon, rObjectToDevice, !getAntiAliasB2DDraw());
+
applyColor(cr, m_aLineColor, fTransparency);
// expand with possible StrokeDamage