Kaydet (Commit) 79a3a1ee authored tarafından Caolán McNamara's avatar Caolán McNamara Kaydeden (comit) Miklos Vajna

valgrind: memory leak in scoped_ptr/unique_ptr -> VclPtr convert

regression from

commit 820576af
Author: Noel Grandin <noel@peralex.com>
Date:   Thu Mar 19 13:54:12 2015 +0200

    start wrapping OutputDevice in VclPtr

 9,800 (568 direct, 9,232 indirect) bytes in 1 blocks are definitely lost in loss record 12,696 of 12,898
    by 0xC602E72: ScopedVclPtrInstance<VirtualDevice>::ScopedVclPtrInstance<>() (vclptr.hxx:375)

(cherry picked from commit 23d4d2f6)

Change-Id: I356f39c339fd28a9e19a00d61b6f1bee492f2638
Reviewed-on: https://gerrit.libreoffice.org/18689Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
üst cc7edea1
...@@ -751,7 +751,7 @@ void OutputDevice::DrawTransparent( const GDIMetaFile& rMtf, const Point& rPos, ...@@ -751,7 +751,7 @@ void OutputDevice::DrawTransparent( const GDIMetaFile& rMtf, const Point& rPos,
const AlphaMask aAlpha(xVDev->GetBitmap(aPoint, xVDev->GetOutputSizePixel())); const AlphaMask aAlpha(xVDev->GetBitmap(aPoint, xVDev->GetOutputSizePixel()));
xVDev.reset(); xVDev.disposeAndClear();
// draw masked content to target and restore MapMode // draw masked content to target and restore MapMode
DrawBitmapEx(aDstRect.TopLeft(), BitmapEx(aPaint, aAlpha)); DrawBitmapEx(aDstRect.TopLeft(), BitmapEx(aPaint, aAlpha));
...@@ -799,7 +799,7 @@ void OutputDevice::DrawTransparent( const GDIMetaFile& rMtf, const Point& rPos, ...@@ -799,7 +799,7 @@ void OutputDevice::DrawTransparent( const GDIMetaFile& rMtf, const Point& rPos,
aAlpha = xVDev->GetBitmap( Point(), xVDev->GetOutputSizePixel() ); aAlpha = xVDev->GetBitmap( Point(), xVDev->GetOutputSizePixel() );
xVDev.reset(); xVDev.disposeAndClear();
EnableMapMode( false ); EnableMapMode( false );
DrawBitmapEx( aDstRect.TopLeft(), BitmapEx( aPaint, aAlpha ) ); DrawBitmapEx( aDstRect.TopLeft(), BitmapEx( aPaint, aAlpha ) );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment