diff options
| author | Jörg Sonnenberger <joerg@NetBSD.org> | 2014-08-28 12:18:43 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-08-29 10:10:15 +0100 |
| commit | 45dfbdca6a9afba1a6aef21623ec025ded635a4d (patch) | |
| tree | 95295133c3d2872825081cb0b6e3984c4f437454 /canvas | |
| parent | c6270de939d5ee51b61dc4ac02c52f1d9b5b1e47 (diff) | |
Fix build with boost-1.56.0.
Change-Id: I61686bf61ff1e0561c385492c563e4495456ca47
Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/cairo/cairo_spritecanvashelper.cxx | 3 | ||||
| -rw-r--r-- | canvas/source/vcl/spritecanvashelper.cxx | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/canvas/source/cairo/cairo_spritecanvashelper.cxx b/canvas/source/cairo/cairo_spritecanvashelper.cxx index eb33f8f3d406..741dbb3f12b6 100644 --- a/canvas/source/cairo/cairo_spritecanvashelper.cxx +++ b/canvas/source/cairo/cairo_spritecanvashelper.cxx @@ -402,11 +402,12 @@ namespace cairocanvas ::basegfx::computeSetDifference( aUncoveredAreas, rUpdateArea.maTotalBounds, ::basegfx::B2DRange( rDestRect ) ); + SurfaceSharedPtr surface(mpOwningSpriteCanvas->getBufferSurface()); ::std::for_each( aUncoveredAreas.begin(), aUncoveredAreas.end(), ::boost::bind( &repaintBackground, boost::cref(pCompositingCairo), - boost::cref(mpOwningSpriteCanvas->getBufferSurface()), + boost::cref(surface), _1 ) ); cairo_rectangle( pWindowCairo.get(), 0, 0, rSize.getX(), rSize.getY() ); diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx index 13ae62900f2b..e2ded77f3f76 100644 --- a/canvas/source/vcl/spritecanvashelper.cxx +++ b/canvas/source/vcl/spritecanvashelper.cxx @@ -573,12 +573,12 @@ namespace vclcanvas // repaint all affected sprites on top of background into // VDev. + ::basegfx::B2DPoint outPos( ::vcl::unotools::b2DPointFromPoint(aOutputPosition) ); ::std::for_each( rSortedUpdateSprites.begin(), rSortedUpdateSprites.end(), ::boost::bind( &spriteRedrawStub2, ::boost::ref( maVDev.get() ), - ::boost::cref( - ::vcl::unotools::b2DPointFromPoint(aOutputPosition)), + ::boost::cref( outPos ), _1 ) ); // flush to screen |