diff options
author | Noel Grandin <noelgrandin@gmail.com> | 2023-11-05 20:23:32 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-11-07 06:10:47 +0100 |
commit | ee38eea6dd2ef487a4a6014ed2a36f46946648c7 (patch) | |
tree | 4b38661a5135cac2efead26af8ad700b51e939db /vcl/qa | |
parent | 7842c935e056c243e87856b93714b0f38eddab2c (diff) |
simplify OutputDevice::ClipAndDrawGradientMetafile
using a poly clip is better than using XOR, so make this the
default.
Change-Id: I48bb6b5d617b8b6dc82760277d72a50a2123ae0f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158957
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/qa')
-rw-r--r-- | vcl/qa/cppunit/outdev.cxx | 38 |
1 files changed, 2 insertions, 36 deletions
diff --git a/vcl/qa/cppunit/outdev.cxx b/vcl/qa/cppunit/outdev.cxx index 379346dd0b76..83325db08b60 100644 --- a/vcl/qa/cppunit/outdev.cxx +++ b/vcl/qa/cppunit/outdev.cxx @@ -1920,47 +1920,13 @@ static size_t ClipGradientTest(GDIMetaFile& rMtf, size_t nIndex) pAction = rMtf.GetAction(nIndex); CPPUNIT_ASSERT_EQUAL_MESSAGE("Not a push action", MetaActionType::PUSH, pAction->GetType()); MetaPushAction* pPushAction = dynamic_cast<MetaPushAction*>(pAction); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Not using XOR push flags", vcl::PushFlags::RASTEROP, + CPPUNIT_ASSERT_EQUAL_MESSAGE("Not using CLIPREGION push flags", vcl::PushFlags::CLIPREGION, pPushAction->GetFlags()); nIndex++; pAction = rMtf.GetAction(nIndex); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Not a rasterop action", MetaActionType::RASTEROP, + CPPUNIT_ASSERT_EQUAL_MESSAGE("Not a CLIPREGION action", MetaActionType::CLIPREGION, pAction->GetType()); - MetaRasterOpAction* pRasterOpAction = dynamic_cast<MetaRasterOpAction*>(pAction); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Not an XOR rasterop", RasterOp::Xor, - pRasterOpAction->GetRasterOp()); - - nIndex++; - pAction = rMtf.GetAction(nIndex); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Not a gradient action", MetaActionType::GRADIENT, - pAction->GetType()); - - nIndex++; - pAction = rMtf.GetAction(nIndex); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Not a fill color action", MetaActionType::FILLCOLOR, - pAction->GetType()); - - nIndex++; - pAction = rMtf.GetAction(nIndex); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Not a rasterop action", MetaActionType::RASTEROP, - pAction->GetType()); - pRasterOpAction = dynamic_cast<MetaRasterOpAction*>(pAction); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Not an N0 rasterop", RasterOp::N0, - pRasterOpAction->GetRasterOp()); - - nIndex++; - pAction = rMtf.GetAction(nIndex); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Not a polypolygon action", MetaActionType::POLYPOLYGON, - pAction->GetType()); - - nIndex++; - pAction = rMtf.GetAction(nIndex); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Not a rasterop action", MetaActionType::RASTEROP, - pAction->GetType()); - pRasterOpAction = dynamic_cast<MetaRasterOpAction*>(pAction); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Not an XOR rasterop", RasterOp::Xor, - pRasterOpAction->GetRasterOp()); nIndex++; pAction = rMtf.GetAction(nIndex); |