[Libreoffice-commits] core.git: vcl/headless

[Caolán McNamara]

 vcl/headless/svpgdi.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 5ce9954c5ec244b9a858ab7e996d5201a21dc3fe
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jun 25 09:14:22 2015 +0100

    cairo_format_stride_for_width is 1.6 onwards
    
    Change-Id: Ic233b4b6c7067f2473eb76b0c7e520cfe1dfcd14

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 3b8413c..bdc20bb 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -744,6 +744,7 @@ bool SvpSalGraphics::supportsOperation( OutDevSupportType ) const
 
 cairo_t* SvpSalGraphics::createCairoContext(const basebmp::BitmapDeviceSharedPtr &rBuffer)
 {
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 6, 0)
     if (rBuffer->getScanlineFormat() != basebmp::Format::ThirtyTwoBitTcMaskBGRX)
         return NULL;
 
@@ -761,6 +762,9 @@ cairo_t* SvpSalGraphics::createCairoContext(const basebmp::BitmapDeviceSharedPtr
     cairo_t* cr = cairo_create(target);
     cairo_surface_destroy(target);
     return cr;
+#else
+    return NULL;
+#endif
 }
 
 bool SvpSalGraphics::SupportsCairo() const