diff options
author | Julien Nabet <serval2412@yahoo.fr> | 2016-01-07 23:33:24 +0100 |
---|---|---|
committer | Julien Nabet <serval2412@yahoo.fr> | 2016-01-08 06:06:28 +0000 |
commit | 4af3fd71eb0b698089acaac064cec4b318362cfd (patch) | |
tree | adceaf6f7da79a4348181157a95b50c85c322a77 | |
parent | 3f787ee4ad062fc5c14d783140a1d9d67e79af41 (diff) |
Remove useless extra var for loop
Take benefit of returned iterator from erase method
Change-Id: I77eaa5b4500cfc66ae66e5f388915e0ade79b23c
Reviewed-on: https://gerrit.libreoffice.org/21239
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
-rw-r--r-- | canvas/source/opengl/ogl_texturecache.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/canvas/source/opengl/ogl_texturecache.cxx b/canvas/source/opengl/ogl_texturecache.cxx index 9335ff965808..08cdd2f3b0a2 100644 --- a/canvas/source/opengl/ogl_texturecache.cxx +++ b/canvas/source/opengl/ogl_texturecache.cxx @@ -54,20 +54,18 @@ namespace oglcanvas // delete already "old" textures, mark "new" entries "old" const TextureCacheMapT::const_iterator aEnd = maCache.end(); - TextureCacheMapT::iterator aNext = maCache.begin(); - ++aNext; - for( auto aCurr = maCache.begin(); aCurr != aEnd; ++aNext ) + for( auto aCurr = maCache.begin(); aCurr != aEnd; /* increment managed in loop */) { if( aCurr->second.bOld ) { glDeleteTextures( 1, &aCurr->second.nTexture ); - maCache.erase( aCurr ); + aCurr = maCache.erase( aCurr ); } else { aCurr->second.bOld = true; + ++aCurr; } - aCurr = aNext; } mnMissCount = 0; |