[Libreoffice-commits] core.git: canvas/source

Thorsten Behrens Thorsten.Behrens at CIB.de
Mon Nov 2 04:46:30 PST 2015


 canvas/source/tools/spriteredrawmanager.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 368b657f4ba4200e3f38fec58450c396ca73b729
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Mon Nov 2 13:42:50 2015 +0100

    Partial revert 'for_each -> range-based'
    
    There was a subtle change in semantics, the earlier loop was only
    iterating until aEnd, covering only unique elements of the vector.
    
    This partially reverts commit c04fd82433e9155ad61ebd92ca7b43a729a87890
    
    Change-Id: I75c5f1b343c3fa8855f6d7f8f706b9259bc9f6df

diff --git a/canvas/source/tools/spriteredrawmanager.cxx b/canvas/source/tools/spriteredrawmanager.cxx
index fa06ace..345c3cd 100644
--- a/canvas/source/tools/spriteredrawmanager.cxx
+++ b/canvas/source/tools/spriteredrawmanager.cxx
@@ -265,9 +265,10 @@ namespace canvas
         // for each unique sprite, check the change event vector,
         // calculate the update operation from that, and add the
         // result to the aUpdateArea.
-        SpriteUpdater aSpriteUpdater( rUpdateAreas, maChangeRecords);
-        for (auto const& aUpdatableSprite : aUpdatableSprites)
-            aSpriteUpdater( aUpdatableSprite);
+        ::std::for_each( aUpdatableSprites.begin(),
+                         aEnd,
+                         SpriteUpdater( rUpdateAreas,
+                                        maChangeRecords) );
 
         // TODO(P2): Implement your own output iterator adapter, to
         // avoid that totally superfluous temp aUnchangedSprites


More information about the Libreoffice-commits mailing list