summaryrefslogtreecommitdiff
path: root/vcl/headless
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-04-04 10:18:57 +0100
committerCaolán McNamara <caolanm@redhat.com>2019-04-04 13:51:36 +0200
commit50580f452cc7c88a231831619a3f05958ce56460 (patch)
treea488706078563cba612821658172a49f15efc9cb /vcl/headless
parent58a0e60dee0d27a699f856827c20b792417d3478 (diff)
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 <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/headless')
-rw-r--r--vcl/headless/svpgdi.cxx8
1 files changed, 0 insertions, 8 deletions
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);