diff options
| author | Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr> | 2011-11-03 08:13:08 +0100 |
|---|---|---|
| committer | Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr> | 2011-11-03 08:53:40 +0100 |
| commit | 7ffe517dea4190334c1ddf376af17ddfc1d3f128 (patch) | |
| tree | d6fd117a30e1d3b704ea81bcbc2dc24d57e5eb2a /canvas | |
| parent | 1e297aef53ec79e2905cb9ca57d649b82bc3938d (diff) | |
RangeExpander functor removed, but needed in one place.
Added a local class for it: there may be a better fix, but it avoids the
build to break.
Removed a few remaining includes
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/tools/spriteredrawmanager.cxx | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/canvas/source/tools/spriteredrawmanager.cxx b/canvas/source/tools/spriteredrawmanager.cxx index 32faba6eaec4..730361c78e62 100644 --- a/canvas/source/tools/spriteredrawmanager.cxx +++ b/canvas/source/tools/spriteredrawmanager.cxx @@ -36,7 +36,6 @@ #include <basegfx/range/b2drectangle.hxx> #include <basegfx/tools/canvastools.hxx> #include <basegfx/vector/b2dsize.hxx> -#include <basegfx/range/rangeexpander.hxx> #include <algorithm> #include <o3tl/compat_functional.hxx> @@ -223,6 +222,24 @@ namespace canvas SpriteRedrawManager::SpriteConnectedRanges& mrUpdater; const SpriteRedrawManager::VectorOfChangeRecords& mrChangeContainer; }; + + class RangeExpander + { + private: + basegfx::B2DRange& mrBounds; + + public: + typedef void result_type; + + RangeExpander( basegfx::B2DRange& rBounds ) : mrBounds( rBounds ) + { + } + + void operator()( const basegfx::B2DRange& rBounds ) + { + mrBounds.expand( rBounds ); + } + }; } void SpriteRedrawManager::setupUpdateAreas( SpriteConnectedRanges& rUpdateAreas ) const @@ -424,7 +441,7 @@ namespace canvas ::basegfx::B2DRange aTrueArea( aBegin->second.getUpdateArea() ); ::std::for_each( aBegin, aEnd, - ::boost::bind( ::basegfx::B2DRangeExpander(aTrueArea), + ::boost::bind( RangeExpander(aTrueArea), ::boost::bind( &SpriteInfo::getUpdateArea, ::boost::bind( ::o3tl::select2nd<AreaComponent>(), _1 ) ) ) ); |