Kaydet (Commit) 58a0e60d authored tarafından Caolán McNamara's avatar Caolán McNamara

raise cairo baseline to 1.10.0

Change-Id: I721b80d7ce28d36babbd2bd1957fcbd6a2d27a27
Reviewed-on: https://gerrit.libreoffice.org/70242
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 244e60ec
......@@ -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}"
......
......@@ -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)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment