Convert CPDF_Parser::m_CrossRef to a std::map.

core/src/fpdfapi/fpdf_edit/fpdf_edit_create.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 "editint.h"
 
 #include "core/include/fxcrt/fx_ext.h"
 #include "core/include/fpdfapi/fpdf_serial.h"
@@ skipping 1301 matching lines @@
       m_Offset += size;
       if (AppendObjectNumberToXRef(objnum) < 0) {
         return -1;
       }
     }
     FX_Free(pBuffer);
   }
   return 1;
 }
 int32_t CPDF_Creator::WriteOldObjs(IFX_Pause* pPause) {
-  FX_DWORD nOldSize = m_pParser->m_CrossRef.GetSize();
+  FX_DWORD nOldSize = m_pParser->GetSize();
   FX_DWORD objnum = (FX_DWORD)(uintptr_t)m_Pos;
   for (; objnum < nOldSize; objnum++) {

[Wei Li, 2015/12/18 19:20:34]

Not matter much. This sequential search could also be replaced by map iteration.

[Lei Zhang, 2015/12/19 02:09:52]

Previously, if we only had 1 element in |m_CrossRef| with objnum = 5, we would
iterate through this loop for objnums [objnum ... 5].

If we change this code to only iterate through the map, then we'd only iterate
through this loop for [5], which is a behavior change I'd like to avoid.

     int32_t iRet = WriteOldIndirectObject(objnum);
     if (!iRet) {
       continue;
     }
     if (iRet < 0) {
       return iRet;
     }
     m_ObjectSize[objnum] = (FX_DWORD)(m_Offset - m_ObjectOffset[objnum]);
     if (pPause && pPause->NeedToPauseNow()) {
       m_Pos = (void*)(uintptr_t)(objnum + 1);
@@ skipping 47 matching lines @@
       j++;
     }
     m_ObjectOffset.Add(dwStart, j - dwStart);
     m_ObjectSize.Add(dwStart, j - dwStart);
     dwStart = j;
   }
 }
 void CPDF_Creator::InitNewObjNumOffsets() {
   FX_BOOL bIncremental = (m_dwFlags & FPDFCREATE_INCREMENTAL) != 0;
   FX_BOOL bNoOriginal = (m_dwFlags & FPDFCREATE_NO_ORIGINAL) != 0;
-  FX_DWORD nOldSize = m_pParser ? m_pParser->m_CrossRef.GetSize() : 0;
+  FX_DWORD nOldSize = m_pParser ? m_pParser->GetSize() : 0;
   FX_POSITION pos = m_pDocument->m_IndirectObjs.GetStartPosition();
   while (pos) {
     size_t key = 0;
     CPDF_Object* pObj;
     m_pDocument->m_IndirectObjs.GetNextAssoc(pos, (void*&)key, (void*&)pObj);
     FX_DWORD objnum = (FX_DWORD)key;
     if (pObj->GetObjNum() == -1) {
       continue;
     }
     if (bIncremental) {
@@ skipping 145 matching lines @@
     if ((m_dwFlags & FPDFCREATE_NO_ORIGINAL) == 0 &&
         m_pParser->GetLastXRefOffset() == 0) {
       InitOldObjNumOffsets();
       FX_DWORD dwEnd = m_pParser->GetLastObjNum();
       FX_BOOL bObjStm = (m_dwFlags & FPDFCREATE_OBJECTSTREAM) != 0;
       for (FX_DWORD objnum = 0; objnum <= dwEnd; objnum++) {
         if (m_pParser->m_V5Type[objnum] == 0 ||
             m_pParser->m_V5Type[objnum] == 255) {
           continue;
         }
-        m_ObjectOffset[objnum] = m_pParser->m_CrossRef[objnum];
+        m_ObjectOffset[objnum] = m_pParser->m_ObjectInfo[objnum].pos;
         if (bObjStm) {
           m_pXRefStream->AddObjectNumberToIndexArray(objnum);
         }
       }
       if (bObjStm) {
         m_pXRefStream->EndXRefStream(this);
         m_pXRefStream->Start();
       }
     }
     m_iStage = 20;
@@ skipping 534 matching lines @@
   m_bNewCrypto = FALSE;
   if (!m_bStandardSecurity) {
     return;
   }
   if (m_pEncryptDict) {
     m_pEncryptDict->Release();
     m_pEncryptDict = NULL;
   }
   m_bStandardSecurity = FALSE;
 }