Remove some objnum locals with AddIndirectObject

fpdfsdk/fpdf_flatten.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 "public/fpdf_flatten.h"
 
 #include <algorithm>
 
@@ skipping 177 matching lines @@
   CPDF_Object* pContentsObj = pPage->GetStreamFor("Contents");
   if (!pContentsObj) {
     pContentsObj = pPage->GetArrayFor("Contents");
   }
 
   if (!pContentsObj) {
     // Create a new contents dictionary
     if (!key.IsEmpty()) {
       CPDF_Stream* pNewContents =
           new CPDF_Stream(nullptr, 0, new CPDF_Dictionary);
-      pPage->SetReferenceFor("Contents", pDocument,
-                             pDocument->AddIndirectObject(pNewContents));
-
       CFX_ByteString sStream;
       sStream.Format("q 1 0 0 1 0 0 cm /%s Do Q", key.c_str());
       pNewContents->SetData(sStream.raw_str(), sStream.GetLength());
+      pPage->SetReferenceFor("Contents", pDocument,
+                             pDocument->AddIndirectObject(pNewContents));
     }
     return;
   }
 
   CPDF_Array* pContentsArray = nullptr;
 
   switch (pContentsObj->GetType()) {
     case CPDF_Object::STREAM: {
       pContentsArray = new CPDF_Array;
       CPDF_Stream* pContents = pContentsObj->AsStream();
@@ skipping 13 matching lines @@
       pContentsArray = pContentsObj->AsArray();
       break;
     }
     default:
       break;
   }
 
   if (!pContentsArray)
     return;
 
-  uint32_t dwObjNum = pDocument->AddIndirectObject(pContentsArray);
-  pPage->SetReferenceFor("Contents", pDocument, dwObjNum);
+  pPage->SetReferenceFor("Contents", pDocument,
+                         pDocument->AddIndirectObject(pContentsArray));
 
   if (!key.IsEmpty()) {
     CPDF_Stream* pNewContents =
         new CPDF_Stream(nullptr, 0, new CPDF_Dictionary);
-    dwObjNum = pDocument->AddIndirectObject(pNewContents);
-    pContentsArray->AddReference(pDocument, dwObjNum);
-
     CFX_ByteString sStream;
     sStream.Format("q 1 0 0 1 0 0 cm /%s Do Q", key.c_str());
     pNewContents->SetData(sStream.raw_str(), sStream.GetLength());
+    pContentsArray->AddReference(pDocument,
+                                 pDocument->AddIndirectObject(pNewContents));
   }
 }
 
 CFX_Matrix GetMatrix(CFX_FloatRect rcAnnot,
                      CFX_FloatRect rcStream,
                      const CFX_Matrix& matrix) {
   if (rcStream.IsEmpty())
     return CFX_Matrix();
 
   matrix.TransformRect(rcStream);
@@ skipping 216 matching lines @@
     }
 
     CPDF_Dictionary* pXObject = pNewXORes->GetDictFor("XObject");
     if (!pXObject) {
       pXObject = new CPDF_Dictionary;
       pNewXORes->SetFor("XObject", pXObject);
     }
 
     CFX_ByteString sFormName;
     sFormName.Format("F%d", i);
-    uint32_t dwStreamObjNum = pDocument->AddIndirectObject(pObj);
-    pXObject->SetReferenceFor(sFormName, pDocument, dwStreamObjNum);
+    pXObject->SetReferenceFor(sFormName, pDocument,
+                              pDocument->AddIndirectObject(pObj));
 
     CPDF_StreamAcc acc;
     acc.LoadAllData(pNewXObject);
 
     const uint8_t* pData = acc.GetData();
     CFX_ByteString sStream(pData, acc.GetSize());
-    CFX_ByteString sTemp;
 
     if (matrix.IsIdentity()) {
       matrix.a = 1.0f;
       matrix.b = 0.0f;
       matrix.c = 0.0f;
       matrix.d = 1.0f;
       matrix.e = 0.0f;
       matrix.f = 0.0f;
     }
 
+    CFX_ByteString sTemp;
     CFX_Matrix m = GetMatrix(rcAnnot, rcStream, matrix);
     sTemp.Format("q %f 0 0 %f %f %f cm /%s Do Q\n", m.a, m.d, m.e, m.f,
                  sFormName.c_str());
     sStream += sTemp;
     pNewXObject->SetData(sStream.raw_str(), sStream.GetLength());
   }
   pPageDict->RemoveFor("Annots");
 
   ObjectArray.RemoveAll();
   RectArray.RemoveAll();
 
   return FLATTEN_SUCCESS;
 }