[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-0' - vcl/headless

[Caolán McNamara]

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

New commits:
commit 5871ac6593871427774271ec36433aafae1086b9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jul 16 12:22:24 2015 +0100

    need cairo >= 1.10.0 for these features
    
    Change-Id: I8e1e45caadc6cc537f27a194851dd00b1f1d0e89
    (cherry picked from commit d1419cf8ff4e9f502443012a4e8c31fa25532032)
    (cherry picked from commit 31b9e0386dfc17d659fc19f7b94fd53fcdae1ab5)
    Reviewed-on: https://gerrit.libreoffice.org/17129
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index be86a63..ed2fe18 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -108,7 +108,7 @@ namespace
         if (rBuffer->getScanlineFormat() != basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_BGRX)
             return false;
 
-#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 6, 0)
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0)
         basegfx::B2IVector size = rBuffer->getSize();
         sal_Int32 nStride = rBuffer->getScanlineStride();
         return (cairo_format_stride_for_width(CAIRO_FORMAT_RGB24, size.getX()) == nStride);
@@ -142,7 +142,7 @@ bool SvpSalGraphics::drawAlphaRect(long nX, long nY, long nWidth, long nHeight,
     bool bRet = false;
     (void)nX; (void)nY; (void)nWidth; (void)nHeight; (void)nTransparency;
 #if ENABLE_CAIRO_CANVAS
-#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 6, 0)
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0)
     if (m_bUseLineColor || !m_bUseFillColor)
         return bRet;