mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump cairo version to 1.2.0

Browse Source 
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>
This commit is contained in:
Riccardo Magliocchetti 2014-11-04 12:11:12 +01:00 committed by Caolán McNamara
parent 79728bdfbf
commit c245858dc4
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
canvas/source/cairo/cairo_canvashelper.cxx
View File

@ -800,12 +800,7 @@ namespace cairocanvas
else if ( aTexture.RepeatModeX == rendering::TexturingMode::CLAMP && else if ( aTexture.RepeatModeX == rendering::TexturingMode::CLAMP &&
aTexture.RepeatModeY == rendering::TexturingMode::CLAMP ) aTexture.RepeatModeY == rendering::TexturingMode::CLAMP )
{ {
#if CAIRO_VERSION >= 10200
cairo_pattern_set_extend( pPattern, CAIRO_EXTEND_PAD ); 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 ); aScaledTextureMatrix.x0 = basegfx::fround( aScaledTextureMatrix.x0 );
@ -1443,9 +1438,7 @@ namespace cairocanvas
::rtl::math::approxEqual( aMatrix.x0, 0 ) && ::rtl::math::approxEqual( aMatrix.x0, 0 ) &&
::rtl::math::approxEqual( aMatrix.y0, 0 ) ) ::rtl::math::approxEqual( aMatrix.y0, 0 ) )
cairo_set_operator( mpCairo.get(), CAIRO_OPERATOR_SOURCE ); cairo_set_operator( mpCairo.get(), CAIRO_OPERATOR_SOURCE );
#if CAIRO_VERSION >= 10200
cairo_pattern_set_extend( cairo_get_source(mpCairo.get()), CAIRO_EXTEND_PAD ); cairo_pattern_set_extend( cairo_get_source(mpCairo.get()), CAIRO_EXTEND_PAD );
#endif
cairo_rectangle( mpCairo.get(), 0, 0, aBitmapSize.Width, aBitmapSize.Height ); cairo_rectangle( mpCairo.get(), 0, 0, aBitmapSize.Width, aBitmapSize.Height );
cairo_clip( mpCairo.get() ); cairo_clip( mpCairo.get() );

2
configure.ac
View File

@ -11739,7 +11739,7 @@ if test "$test_cairo" = "yes"; then
SYSTEM_CAIRO=TRUE SYSTEM_CAIRO=TRUE
AC_MSG_RESULT([yes]) 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") CAIRO_CFLAGS=$(printf '%s' "$CAIRO_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
if test "$test_xrender" = "yes"; then if test "$test_xrender" = "yes"; then