vcl/win/gdi/salgdi2.cxx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 8227e8bef1c8c6c95627daf5023fe927605d50d2
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.com>
Date: Sat Dec 12 15:00:35 2015 +0100
tdf#94851 quick fix for drawBitmap
Change-Id: Iffc0c9b2215c85760856ab876fa6e04613cb4200
Reviewed-on: https://gerrit.libreoffice.org/20662
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/vcl/win/gdi/salgdi2.cxx b/vcl/win/gdi/salgdi2.cxx
index 91b97db..6f0e5d4 100644
--- a/vcl/win/gdi/salgdi2.cxx
+++ b/vcl/win/gdi/salgdi2.cxx
@@ -104,7 +104,7 @@ void WinSalGraphics::drawBitmap(const SalTwoRect& rPosAry,
const SalBitmap& rSal
{
std::unique_ptr<WinSalBitmap> pWinSalBitmap(new WinSalBitmap());
SalBitmap& rConstBitmap = const_cast<SalBitmap&>(rSalBitmap);
- convertToWinSalBitmap(rConstBitmap, *pWinSalBitmap);
+ convertToWinSalBitmap(rConstBitmap, *pWinSalBitmap.get());
mpImpl->drawBitmap(rPosAry, *pWinSalBitmap.get());
}
else
@@ -122,14 +122,14 @@ void WinSalGraphics::drawBitmap( const SalTwoRect&
rPosAry,
{
std::unique_ptr<WinSalBitmap> pWinSalBitmap(new WinSalBitmap());
SalBitmap& rConstBitmap = const_cast<SalBitmap&>(rSSalBitmap);
- convertToWinSalBitmap(rConstBitmap, *pWinSalBitmap);
+ convertToWinSalBitmap(rConstBitmap, *pWinSalBitmap.get());
std::unique_ptr<WinSalBitmap> pWinTransparentSalBitmap(new
WinSalBitmap());
SalBitmap& rConstTransparentBitmap =
const_cast<SalBitmap&>(rSTransparentBitmap);
- convertToWinSalBitmap(rConstTransparentBitmap,
*pWinTransparentSalBitmap);
+ convertToWinSalBitmap(rConstTransparentBitmap,
*pWinTransparentSalBitmap.get());
- mpImpl->drawBitmap(rPosAry, *pWinSalBitmap, *pWinTransparentSalBitmap);
+ mpImpl->drawBitmap(rPosAry, *pWinSalBitmap.get(),
*pWinTransparentSalBitmap.get());
}
else
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
