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

core/src/fpdfapi/fpdf_render/fpdf_render.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 "render_int.h"
 
 #include "core/include/fpdfapi/fpdf_module.h"
 #include "core/include/fpdfapi/fpdf_render.h"
@@ skipping 416 matching lines @@
   FX_RECT rect;
   if (GetObjectClippedRect(pObj, pObj2Device, FALSE, rect)) {
     return;
   }
   int res = 300;
   if (pObj->m_Type == PDFPAGE_IMAGE &&
       m_pDevice->GetDeviceCaps(FXDC_DEVICE_CLASS) == FXDC_PRINTER) {
     res = 0;
   }
   CPDF_ScaledRenderBuffer buffer;
-  if (!buffer.Initialize(m_pContext, m_pDevice, &rect, pObj, &m_Options, res)) {
+  if (!buffer.Initialize(m_pContext, m_pDevice, rect, pObj, &m_Options, res)) {
     return;
   }
   CFX_Matrix matrix = *pObj2Device;
   matrix.Concat(*buffer.GetMatrix());
   GetScaledMatrix(matrix);
   CPDF_Dictionary* pFormResource = NULL;
   if (pObj->m_Type == PDFPAGE_FORM) {
     CPDF_FormObject* pFormObj = (CPDF_FormObject*)pObj;
     if (pFormObj->m_pForm && pFormObj->m_pForm->m_pFormDict) {
       pFormResource = pFormObj->m_pForm->m_pFormDict->GetDict("Resources");
@@ skipping 82 matching lines @@
   }
   CFX_GraphStateData graphState(*pPathObj->m_GraphState);
   if (m_Options.m_Flags & RENDER_THINLINE) {
     graphState.m_LineWidth = 0;
   }
   return m_pDevice->DrawPath(pPathObj->m_Path, &path_matrix, &graphState,
                              fill_argb, stroke_argb, FillType, 0, NULL,
                              m_curBlend);
 }
 CPDF_TransferFunc* CPDF_RenderStatus::GetTransferFunc(CPDF_Object* pObj) const {
-  ASSERT(pObj != NULL);
+  ASSERT(pObj);
   CPDF_DocRenderData* pDocCache = m_pContext->m_pDocument->GetRenderData();
-  if (!pDocCache) {
-    return NULL;
-  }
-  return pDocCache->GetTransferFunc(pObj);
+  return pDocCache ? pDocCache->GetTransferFunc(pObj) : nullptr;
 }
 FX_ARGB CPDF_RenderStatus::GetFillArgb(const CPDF_PageObject* pObj,
                                        FX_BOOL bType3) const {
   CPDF_ColorStateData* pColorData =
       (CPDF_ColorStateData*)(const CPDF_ColorStateData*)pObj->m_ColorState;
   if (m_pType3Char && !bType3 &&
       (!m_pType3Char->m_bColored ||
        (m_pType3Char->m_bColored &&
         (!pColorData || pColorData->m_FillColor.IsNull())))) {
     return m_T3FillColor;
@@ skipping 780 matching lines @@
   }
 }
 
 CPDF_ScaledRenderBuffer::CPDF_ScaledRenderBuffer() {}
 
 CPDF_ScaledRenderBuffer::~CPDF_ScaledRenderBuffer() {}
 
 #define _FPDFAPI_IMAGESIZE_LIMIT_ (30 * 1024 * 1024)
 FX_BOOL CPDF_ScaledRenderBuffer::Initialize(CPDF_RenderContext* pContext,
                                             CFX_RenderDevice* pDevice,
-                                            FX_RECT* pRect,
+                                            const FX_RECT& pRect,
                                             const CPDF_PageObject* pObj,
                                             const CPDF_RenderOptions* pOptions,
                                             int max_dpi) {
-  FXSYS_assert(pRect != NULL);
   m_pDevice = pDevice;
   if (m_pDevice->GetDeviceCaps(FXDC_RENDER_CAPS) & FXRC_GET_BITS) {
     return TRUE;
   }
   m_pContext = pContext;
-  m_Rect = *pRect;
+  m_Rect = pRect;
   m_pObject = pObj;
-  m_Matrix.TranslateI(-pRect->left, -pRect->top);
+  m_Matrix.TranslateI(-pRect.left, -pRect.top);
   int horz_size = pDevice->GetDeviceCaps(FXDC_HORZ_SIZE);
   int vert_size = pDevice->GetDeviceCaps(FXDC_VERT_SIZE);
   if (horz_size && vert_size && max_dpi) {
     int dpih =
         pDevice->GetDeviceCaps(FXDC_PIXEL_WIDTH) * 254 / (horz_size * 10);
     int dpiv =
         pDevice->GetDeviceCaps(FXDC_PIXEL_HEIGHT) * 254 / (vert_size * 10);
     if (dpih > max_dpi) {
       m_Matrix.Scale((FX_FLOAT)(max_dpi) / dpih, 1.0f);
     }
     if (dpiv > max_dpi) {
       m_Matrix.Scale(1.0f, (FX_FLOAT)(max_dpi) / (FX_FLOAT)dpiv);
     }
   }
   m_pBitmapDevice.reset(new CFX_FxgeDevice);
   FXDIB_Format dibFormat = FXDIB_Rgb;
   int32_t bpp = 24;
   if (m_pDevice->GetDeviceCaps(FXDC_RENDER_CAPS) & FXRC_ALPHA_OUTPUT) {
     dibFormat = FXDIB_Argb;
     bpp = 32;
   }
   CFX_FloatRect rect;
   int32_t iWidth, iHeight, iPitch;
   while (1) {
-    rect = *pRect;
+    rect = pRect;
     m_Matrix.TransformRect(rect);
     FX_RECT bitmap_rect = rect.GetOutterRect();
     iWidth = bitmap_rect.Width();
     iHeight = bitmap_rect.Height();
     iPitch = (iWidth * bpp + 31) / 32 * 4;
     if (iWidth * iHeight < 1) {
       return FALSE;
     }
     if (iPitch * iHeight <= _FPDFAPI_IMAGESIZE_LIMIT_ &&
         m_pBitmapDevice->Create(iWidth, iHeight, dibFormat)) {
@@ skipping 20 matching lines @@
         item.GetParamType() == CPDF_ContentMarkItem::PropertiesDict) {
       CPDF_Dictionary* pOCG =
           ToDictionary(static_cast<CPDF_Object*>(item.GetParam()));
       if (!CheckOCGVisible(pOCG)) {
         return FALSE;
       }
     }
   }
   return TRUE;
 }