[ooo-build-commit] .: Branch 'ooo-build-3-2-1' - patches/dev300

[Petr Mladek]

 patches/dev300/canvas-cairopattern.diff |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit c8c8277227563d4f126f24e317ce8db829d3469d
Author: Petr Mladek <pmladek at walk.suse.cz>
Date:   Fri Aug 20 11:36:08 2010 +0200

    Fix build with cairo-1.0.2 on SLED10
    
    * patches/dev300/canvas-cairopattern.diff: CAIRO_EXTEND_PAD defined since
      cairo-1.2; the function need not be called with older cairo versions
      => used #ifdef CAIRO_EXTEND_PAD

diff --git a/patches/dev300/canvas-cairopattern.diff b/patches/dev300/canvas-cairopattern.diff
index 4a9a23b..5473ab9 100644
--- a/patches/dev300/canvas-cairopattern.diff
+++ b/patches/dev300/canvas-cairopattern.diff
@@ -1,12 +1,12 @@
-diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx
-index 22280fe..e4e504b 100644
---- canvas/source/cairo/cairo_canvashelper.cxx
-+++ canvas/source/cairo/cairo_canvashelper.cxx
-@@ -1268,6 +1268,7 @@ namespace cairocanvas
+--- canvas/source/cairo/cairo_canvashelper.cxx.old	2010-08-19 18:28:30.000000000 +0200
++++ canvas/source/cairo/cairo_canvashelper.cxx	2010-08-19 18:17:36.000000000 +0200
+@@ -1265,6 +1265,9 @@ namespace cairocanvas
                  ::rtl::math::approxEqual( aMatrix.x0, 0 ) &&
                  ::rtl::math::approxEqual( aMatrix.y0, 0 ) )
                   cairo_set_operator( mpCairo.get(), CAIRO_OPERATOR_SOURCE );
++#ifdef 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_clip( mpCairo.get() );
              cairo_paint( mpCairo.get() );