diff options
| author | tsepez <tsepez@chromium.org> | 2016-12-14 19:48:47 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-12-14 19:48:47 -0800 |
| commit | b8642f8a3c3a6d359c4e319b8ba91f8df6448a4f (patch) | |
| tree | bc5443fec6a3bf35dd883a66cdfd056397998013 /core/fxge/win32/fx_win32_device.cpp | |
| parent | c7739322e5cdcc5779bdde2a1560ea3dee891e51 (diff) | |
| download | pdfium-b8642f8a3c3a6d359c4e319b8ba91f8df6448a4f.tar.xz | |
More unique_ptr returns from DIB methods.
Review-Url: https://codereview.chromium.org/2572293002
Diffstat (limited to 'core/fxge/win32/fx_win32_device.cpp')
| -rw-r--r-- | core/fxge/win32/fx_win32_device.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/core/fxge/win32/fx_win32_device.cpp b/core/fxge/win32/fx_win32_device.cpp index 2746587be2..679479160f 100644 --- a/core/fxge/win32/fx_win32_device.cpp +++ b/core/fxge/win32/fx_win32_device.cpp @@ -795,7 +795,7 @@ bool CGdiDeviceDriver::GDI_SetDIBits(CFX_DIBitmap* pBitmap1, int left, int top) { if (m_DeviceClass == FXDC_PRINTER) { - std::unique_ptr<CFX_DIBitmap> pBitmap(pBitmap1->FlipImage(false, true)); + std::unique_ptr<CFX_DIBitmap> pBitmap = pBitmap1->FlipImage(false, true); if (!pBitmap) return false; @@ -814,7 +814,7 @@ bool CGdiDeviceDriver::GDI_SetDIBits(CFX_DIBitmap* pBitmap1, dst_height, pBuffer, (BITMAPINFO*)info.c_str(), DIB_RGB_COLORS, SRCCOPY); } else { - CFX_DIBitmap* pBitmap = pBitmap1; + CFX_MaybeOwned<CFX_DIBitmap> pBitmap(pBitmap1); if (pBitmap->IsCmykImage()) { pBitmap = pBitmap->CloneConvert(FXDIB_Rgb).release(); if (!pBitmap) @@ -822,14 +822,11 @@ bool CGdiDeviceDriver::GDI_SetDIBits(CFX_DIBitmap* pBitmap1, } int width = pSrcRect->Width(), height = pSrcRect->Height(); LPBYTE pBuffer = pBitmap->GetBuffer(); - CFX_ByteString info = CFX_WindowsDIB::GetBitmapInfo(pBitmap); + CFX_ByteString info = CFX_WindowsDIB::GetBitmapInfo(pBitmap.Get()); ::SetDIBitsToDevice(m_hDC, left, top, width, height, pSrcRect->left, pBitmap->GetHeight() - pSrcRect->bottom, 0, pBitmap->GetHeight(), pBuffer, (BITMAPINFO*)info.c_str(), DIB_RGB_COLORS); - if (pBitmap != pBitmap1) { - delete pBitmap; - } } return true; } |