strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

raise cairo baseline to 1.12.0

Browse source 
Change-Id: I1816f23fea88e6b840539a88504956b00a546522
Reviewed-on: https://gerrit.libreoffice.org/70243
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara 2019-04-04 10:18:57 +01:00
parent 58a0e60dee
commit 50580f452c
3 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -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}"

8
vcl/headless/svpgdi.cxx
View file

@ -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);

4
vcl/source/bitmap/BitmapTools.cxx
View file

@ -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 )