diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-04-25 19:57:20 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2022-04-26 09:45:45 +0200 |
| commit | 2739f18fa93733a128321255aa49ddbefde36314 (patch) | |
| tree | 5e68cbf89dd614c412af3ba5447fba58bcbab69a /vcl | |
| parent | fd9d71d7706adcbe1191b09c8ba252d2b4dfb50e (diff) | |
CAIRO_OPERATOR_DIFFERENCE define should have followed its usage
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 <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/headless/CairoCommon.cxx | 4 | ||||
| -rw-r--r-- | vcl/headless/svpgdi.cxx | 7 |
2 files changed, 4 insertions, 7 deletions
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<cairo_operator_t>(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 <headless/svpgdi.hxx> #include <comphelper/lok.hxx> - -#if ENABLE_CAIRO_CANVAS -# if defined CAIRO_VERSION && CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 10, 0) -# define CAIRO_OPERATOR_DIFFERENCE (static_cast<cairo_operator_t>(23)) -# endif -#endif - SvpSalGraphics::SvpSalGraphics() : m_aTextRenderImpl(*this) , m_pBackend(new SvpGraphicsBackend(m_aCairoCommon)) |