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

[Caolán McNamara]

 vcl/source/gdi/bmpacc.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 68aac9b1764338df0b6e7dc927955fecaa015d29
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Mar 9 11:33:14 2017 +0000

    bmp is never 'unique' so always copied
    
    cause we have a shared_ptr to it at this point, so its never unique,
    so a new copy is always generated.
    
    this really peaks memory with large images.
    
    Change-Id: I53dab2a1f6e5102b9af08dd6365187a383f7c247
    Reviewed-on: https://gerrit.libreoffice.org/35003
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx
index 5bf02c5..2e987fa 100644
--- a/vcl/source/gdi/bmpacc.cxx
+++ b/vcl/source/gdi/bmpacc.cxx
@@ -56,6 +56,7 @@ void BitmapInfoAccess::ImplCreate( Bitmap& rBitmap )
     {
         if( mnAccessMode == BitmapAccessMode::Write && !maBitmap.ImplGetImpBitmap() )
         {
+            xImpBmp.reset();
             rBitmap.ImplMakeUnique();
             xImpBmp = rBitmap.ImplGetImpBitmap();
         }