vcl/source/outdev/transparent.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 23d4d2f6ac5aa2ca94109e07421a1ed8330b85bd
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Sep 18 13:05:31 2015 +0100
valgrind: memory leak in scoped_ptr/unique_ptr -> VclPtr convert
regression from
commit 820576af4fd6441a752742b43d804e9837839925
Author: Noel Grandin <n...@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)
Change-Id: I356f39c339fd28a9e19a00d61b6f1bee492f2638
diff --git a/vcl/source/outdev/transparent.cxx
b/vcl/source/outdev/transparent.cxx
index 910b7c5..4070216 100644
--- a/vcl/source/outdev/transparent.cxx
+++ b/vcl/source/outdev/transparent.cxx
@@ -741,7 +741,7 @@ void OutputDevice::DrawTransparent( const GDIMetaFile&
rMtf, const Point& rPos,
const AlphaMask aAlpha(xVDev->GetBitmap(aPoint,
xVDev->GetOutputSizePixel()));
- xVDev.reset();
+ xVDev.disposeAndClear();
// draw masked content to target and restore MapMode
DrawBitmapEx(aDstRect.TopLeft(), BitmapEx(aPaint, aAlpha));
@@ -789,7 +789,7 @@ void OutputDevice::DrawTransparent( const GDIMetaFile&
rMtf, const Point& rPos,
aAlpha = xVDev->GetBitmap( Point(),
xVDev->GetOutputSizePixel() );
- xVDev.reset();
+ xVDev.disposeAndClear();
EnableMapMode( false );
DrawBitmapEx( aDstRect.TopLeft(), BitmapEx( aPaint, aAlpha
) );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
