Merge to XFA: Get rid of most instance of 'foo != NULL'

core/src/fxge/dib/fx_dib_main.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/include/fxge/fx_dib.h"
 
 #include <limits.h>
 
@@ skipping 826 matching lines @@
   if (!pSrcBitmap->IsAlphaMask()) {
     return FALSE;
   }
   if (!IsAlphaMask() && !HasAlpha()) {
     return LoadChannel(FXDIB_Alpha, pSrcBitmap, FXDIB_Alpha);
   }
   CFX_DIBitmap* pSrcClone = (CFX_DIBitmap*)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;
     }
   }
   if (IsAlphaMask()) {
     if (!ConvertFormat(FXDIB_8bppMask)) {
       if (pSrcClone != pSrcBitmap) {
         delete pSrcClone;
       }
       return FALSE;
@@ skipping 475 matching lines @@
     }
   }
   return TRUE;
 }
 FX_BOOL CFX_DIBitmap::DitherFS(const FX_DWORD* pPalette,
                                int pal_size,
                                const FX_RECT* pRect) {
   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) {
     return FALSE;
   }
   FX_RECT rect(0, 0, m_Width, m_Height);
   if (pRect) {
     rect.Intersect(*pRect);
   }
   uint8_t translate[256];
@@ skipping 362 matching lines @@
   if (!m_pBitmap->Create(width, height, src_format)) {
     delete m_pBitmap;
     m_pBitmap = NULL;
     return FALSE;
   }
   if (pSrcPalette) {
     m_pBitmap->CopyPalette(pSrcPalette);
   }
   return TRUE;
 }