diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-03-19 19:07:14 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 12:26:25 +0100 |
| commit | 12f6e237b8b7b8ff9508edc9e348a387290c240c (patch) | |
| tree | 1db57e584ff7613edfac522f9b1b88a4c4ad0060 /vcl | |
| parent | e218bbcbf60345115772ccb2fa63418c13895bd0 (diff) | |
vclptr: misc. bug fixing.
Change-Id: Id56188c0f72b74bc9ce6eed558a8339d4175d628
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/workben/vcldemo.cxx | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index 508d38fe7647..4c4358ae4cbe 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -947,18 +947,18 @@ public: // Compositing onto 2x colors beyond our control ScopedVclPtr< VirtualDevice > aWhite(new VirtualDevice()); ScopedVclPtr< VirtualDevice > aBlack(new VirtualDevice()); - aWhite.SetOutputSizePixel(aSrc.GetSizePixel()); - aWhite.SetBackground(Wallpaper(COL_WHITE)); - aWhite.Erase(); - aBlack.SetOutputSizePixel(aSrc.GetSizePixel()); - aBlack.SetBackground(Wallpaper(COL_BLACK)); - aBlack.Erase(); - aWhite.DrawBitmapEx(Point(), aSrc); - aBlack.DrawBitmapEx(Point(), aSrc); + aWhite->SetOutputSizePixel(aSrc.GetSizePixel()); + aWhite->SetBackground(Wallpaper(COL_WHITE)); + aWhite->Erase(); + aBlack->SetOutputSizePixel(aSrc.GetSizePixel()); + aBlack->SetBackground(Wallpaper(COL_BLACK)); + aBlack->Erase(); + aWhite->DrawBitmapEx(Point(), aSrc); + aBlack->DrawBitmapEx(Point(), aSrc); // Now recover that alpha... - Bitmap aWhiteBmp = aWhite.GetBitmap(Point(),aSrc.GetSizePixel()); - Bitmap aBlackBmp = aBlack.GetBitmap(Point(),aSrc.GetSizePixel()); + Bitmap aWhiteBmp = aWhite->GetBitmap(Point(),aSrc.GetSizePixel()); + Bitmap aBlackBmp = aBlack->GetBitmap(Point(),aSrc.GetSizePixel()); AlphaMask aMask(aSrc.GetSizePixel()); Bitmap aRecovered(aSrc.GetSizePixel(), 24); { @@ -1504,16 +1504,16 @@ public: DrawWallpaper(aWholeSize, aWallpaper); Pop(); - ScopedVclPtr< VirtualDevice > aDev(new VirtualDevice(*this)); - aDev.EnableRTL(IsRTLEnabled()); - aDev.SetOutputSizePixel(aExclude.GetSize()); + ScopedVclPtr< VirtualDevice > pDev(new VirtualDevice(*this)); + pDev->EnableRTL(IsRTLEnabled()); + pDev->SetOutputSizePixel(aExclude.GetSize()); Rectangle aSubRect(aWholeSize); aSubRect.Move(-aExclude.Left(), -aExclude.Top()); - aDev.DrawWallpaper(aSubRect, aWallpaper ); + pDev->DrawWallpaper(aSubRect, aWallpaper ); DrawOutDev(aExclude.TopLeft(), aExclude.GetSize(), - Point( 0, 0 ), aExclude.GetSize(), aDev ); + Point( 0, 0 ), aExclude.GetSize(), *pDev.get() ); } }; |