summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-11-30 15:29:03 +0000
committerMichael Stahl <mstahl@redhat.com>2015-12-10 15:36:52 +0000
commit986b0862236d16e6aaf5a083947a302729fe54b7 (patch)
tree38bb23c2168750f28b21c003da19970e0cd49879
parentguard against infinite recursion on registering styles (diff)
downloadcore-986b0862236d16e6aaf5a083947a302729fe54b7.tar.gz
core-986b0862236d16e6aaf5a083947a302729fe54b7.zip
gtk3: glitches because yours truly cannot tell x from y
(cherry picked from commit 2ca429e781cba94608e9838e2c1c50f1e8632b90) (cherry picked from commit 9401a065d0d53b31427f85a936ef53244ac8a6b8) Change-Id: I3b8620a4d8bffeb5e0558c35cb3a063238c12ba5 Reviewed-on: https://gerrit.libreoffice.org/20311 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 81aeddfd6ae6f760fd11d73091b5891882dc1d62) Reviewed-on: https://gerrit.libreoffice.org/20551 Reviewed-by: David Tardon <dtardon@redhat.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--vcl/headless/svpgdi.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 06030d99d6f8..cc4baab68fab 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -144,11 +144,11 @@ namespace
double x1, y1, x2, y2;
cairo_clip_extents(cr, &x1, &y1, &x2, &y2);
- extents.x = x1, extents.y = x2, extents.width = x2-x1, extents.height = y2-y1;
+ extents.x = x1, extents.y = y1, extents.width = x2-x1, extents.height = y2-y1;
cairo_region_t *region = cairo_region_create_rectangle(&extents);
cairo_fill_extents(cr, &x1, &y1, &x2, &y2);
- extents.x = x1, extents.y = x2, extents.width = x2-x1, extents.height = y2-y1;
+ extents.x = x1, extents.y = y1, extents.width = x2-x1, extents.height = y2-y1;
cairo_region_intersect_rectangle(region, &extents);
cairo_region_get_extents(region, &extents);