configure.ac | 6 ++++++ vcl/headless/svpgdi.cxx | 16 ++++++++++------ vcl/win/gdi/gdiimpl.cxx | 14 +++++++++----- 3 files changed, 25 insertions(+), 11 deletions(-)
New commits: commit 792922693c8674fde74f747f495f8aaa477f2b75 Author: Caolán McNamara <[email protected]> AuthorDate: Wed Aug 14 13:09:36 2019 +0100 Commit: Andras Timar <[email protected]> CommitDate: Thu Aug 29 09:20:03 2019 +0200 tdf#124700 don't pull from or insert into cache for PixelSnapHairline Change-Id: I7ca0f556164b6bc462cee3c5532733dbd6b68a2b Reviewed-on: https://gerrit.libreoffice.org/77457 Reviewed-by: Michael Stahl <[email protected]> Tested-by: Jenkins Reviewed-on: https://gerrit.libreoffice.org/77916 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Andras Timar <[email protected]> diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index c8f179bd0066..e77e12635853 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -1277,7 +1277,8 @@ bool SvpSalGraphics::drawPolyLine( // check data validity if(nullptr == pSystemDependentData_CairoPath->getCairoPath() || pSystemDependentData_CairoPath->getNoJoin() != bNoJoin - || pSystemDependentData_CairoPath->getAntiAliasB2DDraw() != bAntiAliasB2DDraw) + || pSystemDependentData_CairoPath->getAntiAliasB2DDraw() != bAntiAliasB2DDraw + || bPixelSnapHairline /*tdf#124700*/ ) { // data invalid, forget pSystemDependentData_CairoPath.reset(); @@ -1332,11 +1333,14 @@ bool SvpSalGraphics::drawPolyLine( } // copy and add to buffering mechanism - pSystemDependentData_CairoPath = rPolyLine.addOrReplaceSystemDependentData<SystemDependentData_CairoPath>( - ImplGetSystemDependentDataManager(), - cairo_copy_path(cr), - bNoJoin, - bAntiAliasB2DDraw); + if (!bPixelSnapHairline /*tdf#124700*/) + { + pSystemDependentData_CairoPath = rPolyLine.addOrReplaceSystemDependentData<SystemDependentData_CairoPath>( + ImplGetSystemDependentDataManager(), + cairo_copy_path(cr), + bNoJoin, + bAntiAliasB2DDraw); + } } // extract extents diff --git a/vcl/win/gdi/gdiimpl.cxx b/vcl/win/gdi/gdiimpl.cxx index 10aad77ed229..434cdcbac8e4 100644 --- a/vcl/win/gdi/gdiimpl.cxx +++ b/vcl/win/gdi/gdiimpl.cxx @@ -2264,7 +2264,8 @@ bool WinSalGraphicsImpl::drawPolyLine( if(pSystemDependentData_GraphicsPath) { // check data validity - if(pSystemDependentData_GraphicsPath->getNoLineJoin() != bNoLineJoin) + if (pSystemDependentData_GraphicsPath->getNoLineJoin() != bNoLineJoin + || bPixelSnapHairline /*tdf#124700*/) { // data invalid, forget pSystemDependentData_GraphicsPath.reset(); @@ -2295,10 +2296,13 @@ bool WinSalGraphicsImpl::drawPolyLine( } // add to buffering mechanism - rPolygon.addOrReplaceSystemDependentData<SystemDependentData_GraphicsPath>( - ImplGetSystemDependentDataManager(), - pGraphicsPath, - bNoLineJoin); + if (!bPixelSnapHairline /*tdf#124700*/) + { + rPolygon.addOrReplaceSystemDependentData<SystemDependentData_GraphicsPath>( + ImplGetSystemDependentDataManager(), + pGraphicsPath, + bNoLineJoin); + } } if(mrParent.getAntiAliasB2DDraw()) commit 85f7dca685c8a3e591acaac11b806e4fae92f82f Author: Michael Stahl <[email protected]> AuthorDate: Tue Aug 13 10:39:00 2019 +0200 Commit: Andras Timar <[email protected]> CommitDate: Thu Aug 29 09:19:50 2019 +0200 configure: don't enable export validation if there are no schemas Schemas are excluded from tarballs since commit 34dced99c33a97dab86c4538fa267ad4ad4fb41f because of the license. Change-Id: I6540926d9ebb390d7956bbd1df3bb915adebb64b Reviewed-on: https://gerrit.libreoffice.org/77383 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit c78dd0a726b32d922a0d75a26a51d4c30612368c) Reviewed-on: https://gerrit.libreoffice.org/77393 Reviewed-by: Thorsten Behrens <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/77914 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Andras Timar <[email protected]> diff --git a/configure.ac b/configure.ac index 9e86121fdfd5..8025a650167e 100644 --- a/configure.ac +++ b/configure.ac @@ -7415,6 +7415,12 @@ if test "$with_export_validation" != "no"; then else AC_MSG_RESULT([no, as Java is too old, need Java 8]) fi + elif ! test -d "${SRC_ROOT}/schema"; then + if test "$with_export_validation" = "yes"; then + AC_MSG_ERROR([requested, but schema directory is missing (it is excluded from tarballs)]) + else + AC_MSG_RESULT([no, schema directory is missing (it is excluded from tarballs)]) + fi else AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_EXPORT_VALIDATION) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
