diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-04-04 15:56:29 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-04-04 18:07:53 +0200 |
| commit | 3c6c56b107d71d5f4790be0b76299e8f215f88cc (patch) | |
| tree | a76b6a5f7b1dc075bc8a5e9ffeb4a6e1d912a1c3 /vcl/source/bitmap | |
| parent | b8c49b1d4d4debd86c4b944b0bb2ba020ef1b030 (diff) | |
Revert "raise cairo baseline to 1.12.0"
This reverts commit 50580f452cc7c88a231831619a3f05958ce56460.
Revert "raise cairo baseline to 1.10.0"
This reverts commit 58a0e60dee0d27a699f856827c20b792417d3478.
32bit baseline is currently at cairo 1.8.8
Change-Id: I5156df6aee03dbbb2e209dbd5717a98580256170
Reviewed-on: https://gerrit.libreoffice.org/70260
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/source/bitmap')
| -rw-r--r-- | vcl/source/bitmap/BitmapTools.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/vcl/source/bitmap/BitmapTools.cxx b/vcl/source/bitmap/BitmapTools.cxx index 212557d3c28a..6f14c3526d42 100644 --- a/vcl/source/bitmap/BitmapTools.cxx +++ b/vcl/source/bitmap/BitmapTools.cxx @@ -236,7 +236,11 @@ 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 ) |