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

core/src/fxcodec/codec/fx_codec_jpeg.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 <setjmp.h>
 
 #include "codec_int.h"
 #include "core/include/fxcodec/fx_codec.h"
@@ skipping 279 matching lines @@
   if (ret != JPEG_HEADER_OK) {
     jpeg_destroy_decompress(&cinfo);
     return FALSE;
   }
   width = cinfo.image_width;
   height = cinfo.image_height;
   num_components = cinfo.num_components;
   color_transform =
       cinfo.jpeg_color_space == JCS_YCbCr || cinfo.jpeg_color_space == JCS_YCCK;
   bits_per_components = cinfo.data_precision;
-  if (icc_buf_ptr != NULL) {
+  if (icc_buf_ptr) {
     *icc_buf_ptr = NULL;
   }
-  if (icc_length != NULL) {
+  if (icc_length) {
     *icc_length = 0;
   }
   jpeg_destroy_decompress(&cinfo);
   return TRUE;
 }
 
 class CCodec_JpegDecoder : public CCodec_ScanlineDecoder {
  public:
   CCodec_JpegDecoder();
   ~CCodec_JpegDecoder() override;
@@ skipping 225 matching lines @@
   return _JpegLoadInfo(src_buf, src_size, width, height, num_components,
                        bits_per_components, color_transform, icc_buf_ptr,
                        icc_length);
 }
 FX_BOOL CCodec_JpegModule::Encode(const CFX_DIBSource* pSource,
                                   uint8_t*& dest_buf,
                                   FX_STRSIZE& dest_size,
                                   int quality,
                                   const uint8_t* icc_buf,
                                   FX_DWORD icc_length) {
-  if (pSource->GetBPP() < 8 || pSource->GetPalette() != NULL) {
+  if (pSource->GetBPP() < 8 || pSource->GetPalette()) {
     ASSERT(pSource->GetBPP() >= 8 && pSource->GetPalette() == NULL);
     return FALSE;
   }
   _JpegEncode(pSource, dest_buf, dest_size, quality, icc_buf, icc_length);
   return TRUE;
 }
 struct FXJPEG_Context {
   jmp_buf m_JumpMark;
   jpeg_decompress_struct m_Info;
   jpeg_error_mgr m_ErrMgr;
@@ skipping 115 matching lines @@
                                         unsigned char* dest_buf) {
   FXJPEG_Context* p = (FXJPEG_Context*)pContext;
   if (setjmp(p->m_JumpMark) == -1) {
     return FALSE;
   }
   int nlines = jpeg_read_scanlines(&p->m_Info, &dest_buf, 1);
   return nlines == 1;
 }
 FX_DWORD CCodec_JpegModule::GetAvailInput(void* pContext,
                                           uint8_t** avail_buf_ptr) {
-  if (avail_buf_ptr != NULL) {
+  if (avail_buf_ptr) {
     *avail_buf_ptr = NULL;
     if (((FXJPEG_Context*)pContext)->m_SrcMgr.bytes_in_buffer > 0) {
       *avail_buf_ptr =
           (uint8_t*)((FXJPEG_Context*)pContext)->m_SrcMgr.next_input_byte;
     }
   }
   return (FX_DWORD)((FXJPEG_Context*)pContext)->m_SrcMgr.bytes_in_buffer;
 }