svtools/source/graphic/grfmgr2.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
New commits: commit 9cef97adadc04361640c0dafc9363e5aed5a0ddd Author: Pierre-Eric Pelloux-Prayer <[email protected]> Date: Sun Feb 8 18:31:28 2015 +0100 svtool/GraphicManager: properly decrease mnUsedSize on unregister ops mnUsedSize was never decreased causing the cache to pretending to be full, which caused lots of needless work (image loading, id creation (which are basically a crc of all bytes of an image, ...)) Change-Id: I1e0a6a07631435346c3509822fae43a067d33303 Reviewed-on: https://gerrit.libreoffice.org/14389 Reviewed-by: Michael Stahl <[email protected]> Reviewed-by: Zolnai Tamás <[email protected]> Tested-by: Zolnai Tamás <[email protected]> (cherry picked from commit c7e907f58f8d0791ee304b42de769f43102522e9) (cherry picked from commit f262e1b1356488515972916c3e11ec210d22cdd9) Signed-off-by: Michael Stahl <[email protected]> diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx index f469623..3aabb52 100644 --- a/svtools/source/graphic/grfmgr2.cxx +++ b/svtools/source/graphic/grfmgr2.cxx @@ -167,12 +167,13 @@ void GraphicManager::ImplUnregisterObj( const GraphicObject& rObj ) { if ( *it == &rObj ) { maObjList.erase( it ); + + if( !rObj.IsSwappedOut() ) + mnUsedSize -= rObj.GetSizeBytes(); return; } } assert(false); // surely it should have been registered? - if( !rObj.IsSwappedOut() ) - mnUsedSize -= rObj.GetSizeBytes(); } void GraphicManager::ImplGraphicObjectWasSwappedOut( const GraphicObject& rObj )
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
