Resolves: #i125000# check last status of newly created...

<Gdiplus::Bitmap> instance before using it. (cherry picked from commit b1272359) Change-Id: I97364cf963424b0e8d0b52b3c995bd4defdca067

Resolves: #i125000# check last status of newly created...
<Gdiplus::Bitmap> instance before using it. (cherry picked from commit b1272359) Change-Id: I97364cf963424b0e8d0b52b3c995bd4defdca067
adb1bb21 · Oliver-Rainer Wittmann · Caolán McNamara · a10a621b · adb1bb21
Kaydet (Commit) adb1bb21 authored Haz 06, 2014 tarafından Oliver-Rainer Wittmann Kaydeden (comit) Caolán McNamara Haz 06, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 23 additions and 15 deletions

salbmp.cxx vcl/win/source/gdi/salbmp.cxx +23 -15

No files found.
--- a/vcl/win/source/gdi/salbmp.cxx
+++ b/vcl/win/source/gdi/salbmp.cxx
@@ -317,24 +317,32 @@ Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap()
        if(pRetval)
        {
-            sal_uInt8* pSrcRGB(pRGB->mpBits);
+            if ( pRetval->GetLastStatus() == Gdiplus::Ok )
-            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* pSrcRGB(pRGB->mpBits);
-                sal_uInt8* targetPixels = (sal_uInt8*)aGdiPlusBitmapData.Scan0 + (nYInsert * aGdiPlusBitmapData.Stride);
+                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);
+                    memcpy(targetPixels, pSrcRGB, nW * 3);
-                pSrcRGB += nW * 3 + nExtraRGB;
+                    pSrcRGB += nW * 3 + nExtraRGB;
-            }
+                }
-            pRetval->UnlockBits(&aGdiPlusBitmapData);
+                pRetval->UnlockBits(&aGdiPlusBitmapData);
+            }
+            else
+            {
+                delete pRetval;
+                pRetval = NULL;
+            }
        }
    }