diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-06-19 17:26:17 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-06-19 17:26:17 -0700 |
| commit | 6d8b1c2c7b1cbada20109f70ae971a4192330bb5 (patch) | |
| tree | e755b7cb2624622cba606134493d25fb7f1ce6c8 /core/src/fxge/win32 | |
| parent | 9883a7da2d4f31910073c03e703d5b97a45d9254 (diff) | |
| download | pdfium-6d8b1c2c7b1cbada20109f70ae971a4192330bb5.tar.xz | |
Merge to XFA: Cleanup: Do not check pointers before deleting them.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1192743004.
(cherry picked from commit cfac954abcab7caf47d3fa3d641c553cba998271)
Review URL: https://codereview.chromium.org/1196783003.
Diffstat (limited to 'core/src/fxge/win32')
| -rw-r--r-- | core/src/fxge/win32/fx_win32_dib.cpp | 12 | ||||
| -rw-r--r-- | core/src/fxge/win32/fx_win32_print.cpp | 4 |
2 files changed, 4 insertions, 12 deletions
diff --git a/core/src/fxge/win32/fx_win32_dib.cpp b/core/src/fxge/win32/fx_win32_dib.cpp index a57b04688a..b6455c3570 100644 --- a/core/src/fxge/win32/fx_win32_dib.cpp +++ b/core/src/fxge/win32/fx_win32_dib.cpp @@ -142,9 +142,7 @@ CFX_DIBitmap* CFX_WindowsDIB::LoadFromFile(const FX_WCHAR* filename) CFX_ByteString info = GetBitmapInfo(pDIBitmap); int ret = GetDIBits(hDC, hBitmap, 0, height, pDIBitmap->GetBuffer(), (BITMAPINFO*)info.c_str(), DIB_RGB_COLORS); if (!ret) { - if (pDIBitmap) { - delete pDIBitmap; - } + delete pDIBitmap; pDIBitmap = NULL; } DeleteDC(hDC); @@ -178,9 +176,7 @@ CFX_DIBitmap* CFX_WindowsDIB::LoadDIBitmap(WINDIB_Open_Args_ args) CFX_ByteString info = GetBitmapInfo(pDIBitmap); int ret = GetDIBits(hDC, hBitmap, 0, height, pDIBitmap->GetBuffer(), (BITMAPINFO*)info.c_str(), DIB_RGB_COLORS); if (!ret) { - if (pDIBitmap) { - delete pDIBitmap; - } + delete pDIBitmap; pDIBitmap = NULL; } DeleteDC(hDC); @@ -255,9 +251,7 @@ CFX_DIBitmap* CFX_WindowsDIB::LoadFromDDB(HDC hDC, HBITMAP hBitmap, FX_DWORD* pP } } if (ret == 0) { - if (pDIBitmap) { - delete pDIBitmap; - } + delete pDIBitmap; pDIBitmap = NULL; } if (bCreatedDC) { diff --git a/core/src/fxge/win32/fx_win32_print.cpp b/core/src/fxge/win32/fx_win32_print.cpp index 74d0a3cabf..163ee84a0a 100644 --- a/core/src/fxge/win32/fx_win32_print.cpp +++ b/core/src/fxge/win32/fx_win32_print.cpp @@ -279,9 +279,7 @@ CPSPrinterDriver::CPSPrinterDriver() CPSPrinterDriver::~CPSPrinterDriver() { EndRendering(); - if (m_pPSOutput) { - delete m_pPSOutput; - } + delete m_pPSOutput; } FX_BOOL CPSPrinterDriver::Init(HDC hDC, int pslevel, FX_BOOL bCmykOutput) { |