From 2739f18fa93733a128321255aa49ddbefde36314 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 25 Apr 2022 19:57:20 +0100 Subject: CAIRO_OPERATOR_DIFFERENCE define should have followed its usage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit when that was moved to here Change-Id: I34565d3568c7e75a9f0abac94360e3ff769afbd0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133418 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- vcl/headless/CairoCommon.cxx | 4 ++++ vcl/headless/svpgdi.cxx | 7 ------- 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'vcl') diff --git a/vcl/headless/CairoCommon.cxx b/vcl/headless/CairoCommon.cxx index ab8cdb0b30bc..cc5d9df10243 100644 --- a/vcl/headless/CairoCommon.cxx +++ b/vcl/headless/CairoCommon.cxx @@ -957,6 +957,10 @@ cairo_pattern_t* create_stipple() } } // end anonymous ns +#if defined CAIRO_VERSION && CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 10, 0) +#define CAIRO_OPERATOR_DIFFERENCE (static_cast(23)) +#endif + void CairoCommon::invert(const basegfx::B2DPolygon& rPoly, SalInvert nFlags, bool bAntiAlias) { cairo_t* cr = getCairoContext(false, bAntiAlias); diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index 881d42be256c..c97048dada12 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -25,13 +25,6 @@ #include #include - -#if ENABLE_CAIRO_CANVAS -# if defined CAIRO_VERSION && CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 10, 0) -# define CAIRO_OPERATOR_DIFFERENCE (static_cast(23)) -# endif -#endif - SvpSalGraphics::SvpSalGraphics() : m_aTextRenderImpl(*this) , m_pBackend(new SvpGraphicsBackend(m_aCairoCommon)) -- cgit