[Libreoffice-commits] core.git: configure.ac vcl/headless

[Caolán McNamara (via logerrit)]

 configure.ac            |    2 +-
 vcl/headless/svpgdi.cxx |   15 +--------------
 2 files changed, 2 insertions(+), 15 deletions(-)

New commits:
commit 58a0e60dee0d27a699f856827c20b792417d3478
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Apr 4 10:02:11 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Apr 4 13:50:54 2019 +0200

    raise cairo baseline to 1.10.0
    
    Change-Id: I721b80d7ce28d36babbd2bd1957fcbd6a2d27a27
    Reviewed-on: https://gerrit.libreoffice.org/70242
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/configure.ac b/configure.ac
index f35fe56c02f6..c2fbe8c6e0da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11600,7 +11600,7 @@ if test "$test_cairo" = "yes"; then
         SYSTEM_CAIRO=TRUE
         AC_MSG_RESULT([yes])
 
-        PKG_CHECK_MODULES( CAIRO, cairo >= 1.2.0 )
+        PKG_CHECK_MODULES( CAIRO, cairo >= 1.10.0 )
         CAIRO_CFLAGS=$(printf '%s' "$CAIRO_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
         FilterLibs "${CAIRO_LIBS}"
         CAIRO_LIBS="${filteredlibs}"
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 2cf49ca17696..6ea82e67ee55 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -47,12 +47,6 @@
 #include <unx/gendata.hxx>
 #include <dlfcn.h>
 
-#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
-
 namespace
 {
     basegfx::B2DRange getClipBox(cairo_t* cr)
@@ -1805,14 +1799,7 @@ void SvpSalGraphics::invert(const basegfx::B2DPolygon &rPoly, SalInvert nFlags)
 
     cairo_set_source_rgb(cr, 1.0, 1.0, 1.0);
 
-    if (cairo_version() >= CAIRO_VERSION_ENCODE(1, 10, 0))
-    {
-        cairo_set_operator(cr, CAIRO_OPERATOR_DIFFERENCE);
-    }
-    else
-    {
-        SAL_WARN("vcl.gdi", "SvpSalGraphics::invert, archaic cairo");
-    }
+    cairo_set_operator(cr, CAIRO_OPERATOR_DIFFERENCE);
 
     if (nFlags & SalInvert::TrackFrame)
     {