diff options
| author | Oliver-Rainer Wittmann <orw@apache.org> | 2014-06-06 12:07:49 +0000 |
|---|---|---|
| committer | Oliver-Rainer Wittmann <orw@apache.org> | 2014-06-06 12:07:49 +0000 |
| commit | b127235917610b9c68e19df29bb39af496906569 (patch) | |
| tree | 9af92fb55292d0473bd72d006b2a533e3cc8e248 | |
| parent | 35f3ceaf60f109f45aa7fef7077aead398bed53f (diff) | |
125000: <WinSalBitmap::ImplCreateGdiPlusBitmap()> - check last status of newly created <Gdiplus::Bitmap> instance before using it.
Notes
merged as: adb1bb21f804c62004f31ad5473d4cf447436b9b
| -rw-r--r-- | vcl/win/source/gdi/salbmp.cxx | 38 |
1 files changed, 23 insertions, 15 deletions
diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx index 005f822e4599..0173b8e0232c 100644 --- a/vcl/win/source/gdi/salbmp.cxx +++ b/vcl/win/source/gdi/salbmp.cxx @@ -310,24 +310,32 @@ Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap() if(pRetval) { - sal_uInt8* pSrcRGB(pRGB->mpBits); - const sal_uInt32 nExtraRGB(pRGB->mnScanlineSize - (nW * 3)); - const bool bTopDown(pRGB->mnFormat & BMP_FORMAT_TOP_DOWN); - const Gdiplus::Rect aAllRect(0, 0, nW, nH); - Gdiplus::BitmapData aGdiPlusBitmapData; - pRetval->LockBits(&aAllRect, Gdiplus::ImageLockModeWrite, PixelFormat24bppRGB, &aGdiPlusBitmapData); - - // copy data to Gdiplus::Bitmap; format is BGR here in both cases, so memcpy is possible - for(sal_uInt32 y(0); y < nH; y++) + if ( pRetval->GetLastStatus() == Gdiplus::Ok ) { - const sal_uInt32 nYInsert(bTopDown ? y : nH - y - 1); - sal_uInt8* targetPixels = (sal_uInt8*)aGdiPlusBitmapData.Scan0 + (nYInsert * aGdiPlusBitmapData.Stride); + sal_uInt8* pSrcRGB(pRGB->mpBits); + const sal_uInt32 nExtraRGB(pRGB->mnScanlineSize - (nW * 3)); + const bool bTopDown(pRGB->mnFormat & BMP_FORMAT_TOP_DOWN); + const Gdiplus::Rect aAllRect(0, 0, nW, nH); + Gdiplus::BitmapData aGdiPlusBitmapData; + pRetval->LockBits(&aAllRect, Gdiplus::ImageLockModeWrite, PixelFormat24bppRGB, &aGdiPlusBitmapData); + + // copy data to Gdiplus::Bitmap; format is BGR here in both cases, so memcpy is possible + for(sal_uInt32 y(0); y < nH; y++) + { + const sal_uInt32 nYInsert(bTopDown ? y : nH - y - 1); + sal_uInt8* targetPixels = (sal_uInt8*)aGdiPlusBitmapData.Scan0 + (nYInsert * aGdiPlusBitmapData.Stride); - memcpy(targetPixels, pSrcRGB, nW * 3); - pSrcRGB += nW * 3 + nExtraRGB; - } + memcpy(targetPixels, pSrcRGB, nW * 3); + pSrcRGB += nW * 3 + nExtraRGB; + } - pRetval->UnlockBits(&aGdiPlusBitmapData); + pRetval->UnlockBits(&aGdiPlusBitmapData); + } + else + { + delete pRetval; + pRetval = NULL; + } } } |