[Libreoffice-commits] core.git: canvas/source configure.ac

[Riccardo Magliocchetti]

 canvas/source/cairo/cairo_canvashelper.cxx |    7 -------
 configure.ac                               |    2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

New commits:
commit c245858dc42a890ab6fbfc7e2c33c60af99e61b3
Author: Riccardo Magliocchetti <riccardo.magliocchetti at gmail.com>
Date:   Tue Nov 4 12:11:12 2014 +0100

    Bump cairo version to 1.2.0
    
    Requirement already fullfilled by RHEL 5
    
    Change-Id: I2304ecac744d1b46b4329ab6d1a0b75739d5c4ea
    Reviewed-on: https://gerrit.libreoffice.org/12250
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx
index 07e38f6..c501d57 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -800,12 +800,7 @@ namespace cairocanvas
                             else if ( aTexture.RepeatModeX == rendering::TexturingMode::CLAMP &&
                                       aTexture.RepeatModeY == rendering::TexturingMode::CLAMP )
                             {
-#if CAIRO_VERSION >= 10200
                                 cairo_pattern_set_extend( pPattern, CAIRO_EXTEND_PAD );
-#else
-#warning "fallback for cairo before version 1.2"
-                                cairo_pattern_set_extend( pPattern, CAIRO_EXTEND_NONE );
-#endif
                             }
 
                             aScaledTextureMatrix.x0 = basegfx::fround( aScaledTextureMatrix.x0 );
@@ -1443,9 +1438,7 @@ namespace cairocanvas
                 ::rtl::math::approxEqual( aMatrix.x0, 0 ) &&
                 ::rtl::math::approxEqual( aMatrix.y0, 0 ) )
                 cairo_set_operator( mpCairo.get(), CAIRO_OPERATOR_SOURCE );
-#if CAIRO_VERSION >= 10200
             cairo_pattern_set_extend( cairo_get_source(mpCairo.get()), CAIRO_EXTEND_PAD );
-#endif
             cairo_rectangle( mpCairo.get(), 0, 0, aBitmapSize.Width, aBitmapSize.Height );
             cairo_clip( mpCairo.get() );
 
diff --git a/configure.ac b/configure.ac
index f090939..e401569 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11739,7 +11739,7 @@ if test "$test_cairo" = "yes"; then
         SYSTEM_CAIRO=TRUE
         AC_MSG_RESULT([yes])
 
-        PKG_CHECK_MODULES( CAIRO, cairo >= 1.0.2 )
+        PKG_CHECK_MODULES( CAIRO, cairo >= 1.2.0 )
         CAIRO_CFLAGS=$(printf '%s' "$CAIRO_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
 
         if test "$test_xrender" = "yes"; then