diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-03-22 10:01:20 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-03-22 10:01:20 +0000 |
| commit | 59dfecfa2d2ca33bd159b0d953132a0f73847d32 (patch) | |
| tree | 1de720d7122d9bc4ca1b1ae504c904c54bbbaddc /canvas | |
| parent | a7a09d627f34cfdd52bbd901662a07b4600d331b (diff) | |
INTEGRATION: CWS cairofixes01 (1.2.30); FILE MERGED
2006/03/02 17:50:01 radekdoulik 1.2.30.1: Issue number: 62722
Submitted by: radekdoulik
Reviewed by: radekdoulik
2006-02-08 Radek Doulik <rodo@novell.com>
* patches/cairo/cairo-canvas-redrawmanager-copy-updatearea.diff:
avoid invalid reads when merging update areas. select2nd was
making temporary copy, from which we took a reference and used it
after the copy was destroyed
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/inc/canvas/spriteredrawmanager.hxx | 8 | ||||
| -rw-r--r-- | canvas/source/tools/spriteredrawmanager.cxx | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/canvas/inc/canvas/spriteredrawmanager.hxx b/canvas/inc/canvas/spriteredrawmanager.hxx index fd781e4552df..7c81611b4494 100644 --- a/canvas/inc/canvas/spriteredrawmanager.hxx +++ b/canvas/inc/canvas/spriteredrawmanager.hxx @@ -4,9 +4,9 @@ * * $RCSfile: spriteredrawmanager.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: kz $ $Date: 2005-11-02 12:41:12 $ + * last change: $Author: obo $ $Date: 2006-03-22 10:58:22 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -97,6 +97,8 @@ namespace canvas class SpriteInfo { public: + ~SpriteInfo() {} + /** Create sprite info @param rRef @@ -153,7 +155,7 @@ namespace canvas } const Sprite::Reference& getSprite() const { return mpSprite; } - const ::basegfx::B2DRange& getUpdateArea() const { return maTrueUpdateArea; } + ::basegfx::B2DRange getUpdateArea() const { return maTrueUpdateArea; } bool needsUpdate() const { return mbNeedsUpdate; } bool isPureMove() const { return mbIsPureMove; } diff --git a/canvas/source/tools/spriteredrawmanager.cxx b/canvas/source/tools/spriteredrawmanager.cxx index eb09ad654216..f78c1507ce92 100644 --- a/canvas/source/tools/spriteredrawmanager.cxx +++ b/canvas/source/tools/spriteredrawmanager.cxx @@ -4,9 +4,9 @@ * * $RCSfile: spriteredrawmanager.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: kz $ $Date: 2005-11-02 12:55:15 $ + * last change: $Author: obo $ $Date: 2006-03-22 11:01:20 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -399,7 +399,7 @@ namespace canvas // now, calc the _true_ update area, by merging all sprite's // true update areas into one rectangle ::basegfx::B2DRange aTrueArea( aBegin->second.getUpdateArea() ); - ::std::for_each( ++rUpdateArea.maComponentList.begin(), + ::std::for_each( aBegin, aEnd, ::boost::bind( ::basegfx::B2DRangeExpander(aTrueArea), ::boost::bind( &SpriteInfo::getUpdateArea, |