summaryrefslogtreecommitdiff
path: root/drawinglayer
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2023-04-21 20:22:12 +0100
committerCaolán McNamara <caolanm@redhat.com>2023-04-22 22:34:17 +0200
commit0ad8d644722228759abce42b0c11024e7460f6eb (patch)
tree06a65da19b0bd0502b7b07e2df6c94c4027d87b7 /drawinglayer
parenta17ec91d4278afcc1e54ecd85652949c2ff79634 (diff)
tdf#154957 Revert "use OutputDevice clipping if its just a set of rectangles"
it was an attempt at an optimization, but if it doesn't work just revert it. The non-antialias case also doesn't work so the reverted commit wasn't itself the problem but the existing path has some flaw I'm not going to invest in figuring out. This reverts commit ee0d5e7bb8614c50e71dd074b8440f412eb62ff3. Change-Id: I8d4f126e3bfe135d39a085f28cea6708ae8f833f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150773 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'drawinglayer')
-rw-r--r--drawinglayer/source/processor2d/vclprocessor2d.cxx13
1 files changed, 1 insertions, 12 deletions
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index ecfbf31f7ec4..ad680803438d 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -845,17 +845,6 @@ void VclProcessor2D::RenderPolyPolygonGraphicPrimitive2D(
}
}
-namespace
-{
-bool isRectangles(const basegfx::B2DPolyPolygon& rPolyPoly)
-{
- for (sal_uInt32 i = 0, nCount = rPolyPoly.count(); i < nCount; ++i)
- if (!basegfx::utils::isRectangle(rPolyPoly.getB2DPolygon(i)))
- return false;
- return true;
-}
-}
-
// mask group
void VclProcessor2D::RenderMaskPrimitive2DPixel(const primitive2d::MaskPrimitive2D& rMaskCandidate)
{
@@ -870,7 +859,7 @@ void VclProcessor2D::RenderMaskPrimitive2DPixel(const primitive2d::MaskPrimitive
aMask.transform(maCurrentTransformation);
// Unless smooth edges are needed, simply use clipping.
- if (isRectangles(aMask) || !getViewInformation2D().getUseAntiAliasing())
+ if (basegfx::utils::isRectangle(aMask) || !getViewInformation2D().getUseAntiAliasing())
{
mpOutputDevice->Push(vcl::PushFlags::CLIPREGION);
mpOutputDevice->IntersectClipRegion(vcl::Region(aMask));