configure.ac | 2 +-
vcl/headless/svpgdi.cxx | 8 --------
vcl/source/bitmap/BitmapTools.cxx | 4 ----
3 files changed, 1 insertion(+), 13 deletions(-)
New commits:
commit 50580f452cc7c88a231831619a3f05958ce56460
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Apr 4 10:18:57 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Apr 4 13:51:36 2019 +0200
raise cairo baseline to 1.12.0
Change-Id: I1816f23fea88e6b840539a88504956b00a546522
Reviewed-on: https://gerrit.libreoffice.org/70243
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/configure.ac b/configure.ac
index c2fbe8c6e0da..02ea8809de4b 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.10.0 )
+ PKG_CHECK_MODULES( CAIRO, cairo >= 1.12.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 6ea82e67ee55..b072bf946cdc 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -1739,11 +1739,7 @@ std::shared_ptr<SalBitmap> SvpSalGraphics::getBitmap(
long nX, long nY, long nWi
Color SvpSalGraphics::getPixel( long nX, long nY )
{
-#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 12, 0)
cairo_surface_t *target = cairo_surface_create_similar_image(m_pSurface,
CAIRO_FORMAT_ARGB32, 1, 1);
-#else
- cairo_surface_t *target = cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
1, 1);
-#endif
cairo_t* cr = cairo_create(target);
@@ -1977,11 +1973,7 @@ cairo_surface_t*
SvpSalGraphics::createCairoSurface(const BitmapBuffer *pBuffer)
cairo_t* SvpSalGraphics::createTmpCompatibleCairoContext() const
{
-#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 12, 0)
cairo_surface_t *target = cairo_surface_create_similar_image(m_pSurface,
-#else
- cairo_surface_t *target = cairo_image_surface_create(
-#endif
CAIRO_FORMAT_ARGB32,
m_aFrameSize.getX() * m_fScale,
m_aFrameSize.getY() * m_fScale);
diff --git a/vcl/source/bitmap/BitmapTools.cxx
b/vcl/source/bitmap/BitmapTools.cxx
index 6f14c3526d42..212557d3c28a 100644
--- a/vcl/source/bitmap/BitmapTools.cxx
+++ b/vcl/source/bitmap/BitmapTools.cxx
@@ -236,11 +236,7 @@ BitmapEx* CreateFromCairoSurface(Size aSize,
cairo_surface_t * pSurface)
// FIXME: if we could teach VCL/ about cairo handles, life could
// be significantly better here perhaps.
-#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 12, 0)
cairo_surface_t *pPixels = cairo_surface_create_similar_image(pSurface,
-#else
- cairo_surface_t *pPixels = cairo_image_surface_create(
-#endif
CAIRO_FORMAT_ARGB32, aSize.Width(), aSize.Height());
cairo_t *pCairo = cairo_create( pPixels );
if( !pPixels || !pCairo || cairo_status(pCairo) != CAIRO_STATUS_SUCCESS )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
