Remove some objnum locals with AddIndirectObject

core/fpdfapi/fpdf_page/cpdf_image.cpp

 // Copyright 2016 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/fpdfapi/fpdf_page/include/cpdf_image.h"
 
 #include <algorithm>
 #include <memory>
@@ skipping 183 matching lines @@
     dest_pitch = (BitmapWidth + 7) / 8;
     if ((iCompress & 0x03) == PDF_IMAGE_NO_COMPRESS) {
       opType = 1;
     } else {
       opType = 0;
     }
   } else if (bpp == 8) {
     int32_t iPalette = pBitmap->GetPaletteSize();
     if (iPalette > 0) {
       CPDF_Array* pCS = new CPDF_Array;
-      m_pDocument->AddIndirectObject(pCS);
       pCS->AddName("Indexed");
       pCS->AddName("DeviceRGB");
       pCS->AddInteger(iPalette - 1);
       uint8_t* pColorTable = FX_Alloc2D(uint8_t, iPalette, 3);
       uint8_t* ptr = pColorTable;
       for (int32_t i = 0; i < iPalette; i++) {
         uint32_t argb = pBitmap->GetPaletteArgb(i);
         ptr[0] = (uint8_t)(argb >> 16);
         ptr[1] = (uint8_t)(argb >> 8);
         ptr[2] = (uint8_t)argb;
         ptr += 3;
       }
       CPDF_Stream* pCTS =
           new CPDF_Stream(pColorTable, iPalette * 3, new CPDF_Dictionary);
-      m_pDocument->AddIndirectObject(pCTS);
-      pCS->AddReference(m_pDocument, pCTS);
-      pDict->SetReferenceFor("ColorSpace", m_pDocument, pCS);
+      pCS->AddReference(m_pDocument, m_pDocument->AddIndirectObject(pCTS));
+      pDict->SetReferenceFor("ColorSpace", m_pDocument,
+                             m_pDocument->AddIndirectObject(pCS));
     } else {
       pDict->SetNameFor("ColorSpace", "DeviceGray");
     }
     pDict->SetIntegerFor("BitsPerComponent", 8);
     if ((iCompress & 0x03) == PDF_IMAGE_NO_COMPRESS) {
       dest_pitch = BitmapWidth;
       opType = 1;
     } else {
       opType = 0;
     }
@@ skipping 30 matching lines @@
     } else if (pMaskBitmap->GetFormat() == FXDIB_1bppMask) {
     } else {
       mask_buf = FX_Alloc2D(uint8_t, maskHeight, maskWidth);
       mask_size = maskHeight * maskWidth;  // Safe since checked alloc returned.
       for (int32_t a = 0; a < maskHeight; a++) {
         FXSYS_memcpy(mask_buf + a * maskWidth, pMaskBitmap->GetScanline(a),
                      maskWidth);
       }
     }
     pMaskDict->SetIntegerFor("Length", mask_size);
-
-    CPDF_Stream* pMaskStream = new CPDF_Stream(mask_buf, mask_size, pMaskDict);
-    m_pDocument->AddIndirectObject(pMaskStream);
-    pDict->SetReferenceFor("SMask", m_pDocument, pMaskStream);
-    if (bDeleteMask) {
+    pDict->SetReferenceFor("SMask", m_pDocument,
+                           m_pDocument->AddIndirectObject(new CPDF_Stream(
+                               mask_buf, mask_size, pMaskDict)));
+    if (bDeleteMask)
       delete pMaskBitmap;
-    }
   }
   if (opType == 0) {
     if (iCompress & PDF_IMAGE_LOSSLESS_COMPRESS) {
     } else {
       if (pBitmap->GetBPP() == 1) {
       } else if (pBitmap->GetBPP() >= 8 && pBitmap->GetPalette()) {
         CFX_DIBitmap* pNewBitmap = new CFX_DIBitmap();
         pNewBitmap->Copy(pBitmap);
         pNewBitmap->ConvertFormat(FXDIB_Rgb);
         SetImage(pNewBitmap, iCompress);
@@ skipping 111 matching lines @@
   }
   if (!ret) {
     delete m_pDIBSource;
     m_pDIBSource = nullptr;
     return FALSE;
   }
   m_pMask = pSource->DetachMask();
   m_MatteColor = pSource->GetMatteColor();
   return FALSE;
 }