diff options
| author | Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com> | 2014-11-04 12:11:12 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-11-12 20:42:48 +0000 |
| commit | c245858dc42a890ab6fbfc7e2c33c60af99e61b3 (patch) | |
| tree | 68dbd05489f8d7e2d8949374129f5e147a6cf18c | |
| parent | 79728bdfbfe6f59c899fa7cb2a7fc654eb5c428a (diff) | |
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@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | canvas/source/cairo/cairo_canvashelper.cxx | 7 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx index 07e38f60cc7d..c501d5746448 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 f090939b1d1f..e4015693ef94 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 |