mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SystemDependentData_CairoPath needs to check stroke values

Browse Source 
so we don't accidentally re-use invalid data

Change-Id: Ia971dde953044c68f17caab2000ae8089a267096
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181181
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins
This commit is contained in:
Noel Grandin
2025-02-05 15:15:08 +02:00
parent 2373a13d4c
commit 14303b9c1f
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
vcl/headless/CairoCommon.cxx
View File

@@ -1155,10 +1155,17 @@ bool CairoCommon::drawPolyLine(const basegfx::B2DHomMatrix& rObjectToDevice,
if (pSystemDependentData_CairoPath) if (pSystemDependentData_CairoPath)
{ {
auto strokeEquals
= [](const std::vector<double>& rStroke1, const std::vector<double>* pStroke2) -> bool {
if (!pStroke2)
return rStroke1.empty();
return rStroke1 == *pStroke2;
};
// check data validity // check data validity
if (nullptr == pSystemDependentData_CairoPath->getCairoPath() if (nullptr == pSystemDependentData_CairoPath->getCairoPath()
|| pSystemDependentData_CairoPath->getNoJoin() != bNoJoin || pSystemDependentData_CairoPath->getNoJoin() != bNoJoin
|| pSystemDependentData_CairoPath->getAntiAlias() != bAntiAlias || pSystemDependentData_CairoPath->getAntiAlias() != bAntiAlias
|| !strokeEquals(pSystemDependentData_CairoPath->getStroke(), pStroke)
|| bPixelSnapHairline /*tdf#124700*/) || bPixelSnapHairline /*tdf#124700*/)
{ {
// data invalid, forget // data invalid, forget