diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-12-14 18:27:25 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-12-14 18:27:25 -0800 |
| commit | 96660d6f382204339d6b1aadc3913303d436e252 (patch) | |
| tree | b5f84756e1a89251831cebc05b9d4e1f6cb2027b /core/src/fxge/dib | |
| parent | d983b09c3ae29a97cba8e9ec9c6351545f6087ee (diff) | |
| download | pdfium-96660d6f382204339d6b1aadc3913303d436e252.tar.xz | |
Merge to XFA: Get rid of most instance of 'foo != NULL'
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1512763013 .
(cherry picked from commit e3c7c2b54348da4a6939f6672f6c6bff126815a7)
Review URL: https://codereview.chromium.org/1529553003 .
Diffstat (limited to 'core/src/fxge/dib')
| -rw-r--r-- | core/src/fxge/dib/fx_dib_main.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/src/fxge/dib/fx_dib_main.cpp b/core/src/fxge/dib/fx_dib_main.cpp index 6d37db9680..44d6c5022c 100644 --- a/core/src/fxge/dib/fx_dib_main.cpp +++ b/core/src/fxge/dib/fx_dib_main.cpp @@ -844,7 +844,6 @@ FX_BOOL CFX_DIBitmap::MultiplyAlpha(const CFX_DIBSource* pSrcBitmap) { if (pSrcBitmap->GetWidth() != m_Width || pSrcBitmap->GetHeight() != m_Height) { pSrcClone = pSrcBitmap->StretchTo(m_Width, m_Height); - ASSERT(pSrcClone != NULL); if (pSrcClone == NULL) { return FALSE; } @@ -1340,7 +1339,7 @@ FX_BOOL CFX_DIBitmap::DitherFS(const FX_DWORD* pPalette, if (m_pBuffer == NULL) { return FALSE; } - if (m_bpp != 8 && m_pPalette != NULL && m_AlphaFlag != 0) { + if (m_bpp != 8 && m_pPalette && m_AlphaFlag != 0) { return FALSE; } if (m_Width < 4 && m_Height < 4) { |