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

core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp

Index: core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp
diff --git a/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp b/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp
index b200b8d37da4e184424d4e927a8485738342e95a..c0260b6f27a95964ef08b8caabcb8949a2736037 100644
--- a/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp
+++ b/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp
@@ -1319,7 +1319,7 @@ int32_t CPDF_Creator::WriteOldIndirectObject(FX_DWORD objnum) {
   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);
@@ -1389,7 +1389,7 @@ void CPDF_Creator::InitOldObjNumOffsets() {
 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;
@@ -1555,7 +1555,7 @@ int32_t CPDF_Creator::WriteDoc_Stage1(IFX_Pause* pPause) {
             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);
         }