Remove CFX_ArrayTemplate from fpdfapi

core/fpdfapi/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 "core/fpdfapi/edit/editint.h"
 
 #include <memory>
 #include <vector>
@@ skipping 1295 matching lines @@
     if (!iRet)
       continue;
 
     if (pPause && pPause->NeedToPauseNow()) {
       m_Pos = (void*)(uintptr_t)(objnum + 1);
       return 1;
     }
   }
   return 0;
 }
+
 int32_t CPDF_Creator::WriteNewObjs(bool bIncremental, IFX_Pause* pPause) {
-  int32_t iCount = m_NewObjNumArray.GetSize();
-  int32_t index = (int32_t)(uintptr_t)m_Pos;
+  size_t iCount = m_NewObjNumArray.size();
+  size_t index = (size_t)(uintptr_t)m_Pos;
   while (index < iCount) {
-    uint32_t objnum = m_NewObjNumArray.ElementAt(index);
+    uint32_t objnum = m_NewObjNumArray[index];
     CPDF_Object* pObj = m_pDocument->GetIndirectObject(objnum);
     if (!pObj) {
       ++index;
       continue;
     }
     m_ObjectOffset[objnum] = m_Offset;
     if (WriteIndirectObj(pObj))
       return -1;
 
     index++;
     if (pPause && pPause->NeedToPauseNow()) {
       m_Pos = (FX_POSITION)(uintptr_t)index;
       return 1;
     }
   }
   return 0;
 }
+
 void CPDF_Creator::InitOldObjNumOffsets() {
   if (!m_pParser) {
     return;
   }
   uint32_t j = 0;
   uint32_t dwStart = 0;
   uint32_t dwEnd = m_pParser->GetLastObjNum();
   while (dwStart <= dwEnd) {
     while (dwStart <= dwEnd && m_pParser->IsObjectFreeOrNull(dwStart))
       dwStart++;
@@ skipping 18 matching lines @@
     const CPDF_Object* pObj = pair.second.get();
     if (bIncremental || pObj->GetObjNum() == CPDF_Object::kInvalidObjNum)
       continue;
     if (m_pParser && m_pParser->IsValidObjectNumber(objnum) &&
         m_pParser->GetObjectType(objnum)) {
       continue;
     }
     AppendNewObjNum(objnum);
   }
 
-  int32_t iCount = m_NewObjNumArray.GetSize();
+  size_t iCount = m_NewObjNumArray.size();
   if (iCount == 0)
     return;
 
-  int32_t i = 0;
+  size_t i = 0;
   uint32_t dwStartObjNum = 0;
   bool bCrossRefValid = m_pParser && m_pParser->GetLastXRefOffset() > 0;
   while (i < iCount) {
-    dwStartObjNum = m_NewObjNumArray.ElementAt(i);
+    dwStartObjNum = m_NewObjNumArray[i];
     if ((bIncremental && (bNoOriginal || bCrossRefValid)) ||
         !m_ObjectOffset.GetPtrAt(dwStartObjNum)) {
       break;
     }
     i++;
   }
   if (i >= iCount)
     return;
 
   uint32_t dwLastObjNum = dwStartObjNum;
   i++;
   bool bNewStart = false;
   for (; i < iCount; i++) {
-    uint32_t dwCurObjNum = m_NewObjNumArray.ElementAt(i);
+    uint32_t dwCurObjNum = m_NewObjNumArray[i];
     bool bExist = m_pParser && m_pParser->IsValidObjectNumber(dwCurObjNum) &&
                   m_ObjectOffset.GetPtrAt(dwCurObjNum);
     if (bExist || dwCurObjNum - dwLastObjNum > 1) {
       if (!bNewStart)
         m_ObjectOffset.Add(dwStartObjNum, dwLastObjNum - dwStartObjNum + 1);
       dwStartObjNum = dwCurObjNum;
     }
     if (bNewStart)
       dwStartObjNum = dwCurObjNum;
 
     bNewStart = bExist;
     dwLastObjNum = dwCurObjNum;
   }
   m_ObjectOffset.Add(dwStartObjNum, dwLastObjNum - dwStartObjNum + 1);
 }
 
-void CPDF_Creator::AppendNewObjNum(uint32_t objbum) {
-  int32_t iStart = 0, iFind = 0;
-  int32_t iEnd = m_NewObjNumArray.GetUpperBound();
-  while (iStart <= iEnd) {
-    int32_t iMid = (iStart + iEnd) / 2;
-    uint32_t dwMid = m_NewObjNumArray.ElementAt(iMid);
-    if (objbum < dwMid) {
-      iEnd = iMid - 1;
-    } else {
-      if (iMid == iEnd) {
-        iFind = iMid + 1;
-        break;
-      }
-      uint32_t dwNext = m_NewObjNumArray.ElementAt(iMid + 1);
-      if (objbum < dwNext) {
-        iFind = iMid + 1;
-        break;
-      }
-      iStart = iMid + 1;
-    }
-  }
-  m_NewObjNumArray.InsertAt(iFind, objbum);
+void CPDF_Creator::AppendNewObjNum(uint32_t objnum) {
+  m_NewObjNumArray.insert(std::lower_bound(m_NewObjNumArray.begin(),
+                                           m_NewObjNumArray.end(), objnum),
+                          objnum);
 }
+
 int32_t CPDF_Creator::WriteDoc_Stage1(IFX_Pause* pPause) {
   ASSERT(m_iStage > -1 || m_iStage < 20);
   if (m_iStage == 0) {
     if (!m_pParser) {
       m_dwFlags &= ~FPDFCREATE_INCREMENTAL;
     }
     if (m_bSecurityChanged && (m_dwFlags & FPDFCREATE_NO_ORIGINAL) == 0) {
       m_dwFlags &= ~FPDFCREATE_INCREMENTAL;
     }
     CPDF_Dictionary* pDict = m_pDocument->GetRoot();
@@ skipping 110 matching lines @@
         WriteNewObjs((m_dwFlags & FPDFCREATE_INCREMENTAL) != 0, pPause);
     if (iRet) {
       return iRet;
     }
     m_iStage = 27;
   }
   if (m_iStage == 27) {
     if (m_pEncryptDict && m_pEncryptDict->IsInline()) {
       m_dwLastObjNum += 1;
       FX_FILESIZE saveOffset = m_Offset;
-      if (WriteIndirectObj(m_dwLastObjNum, m_pEncryptDict) < 0) {
+      if (WriteIndirectObj(m_dwLastObjNum, m_pEncryptDict) < 0)
         return -1;
-      }
+
       m_ObjectOffset.Add(m_dwLastObjNum, 1);
       m_ObjectOffset[m_dwLastObjNum] = saveOffset;
       m_dwEncryptObjNum = m_dwLastObjNum;
-      if (m_dwFlags & FPDFCREATE_INCREMENTAL) {
-        m_NewObjNumArray.Add(m_dwLastObjNum);
-      }
+      if (m_dwFlags & FPDFCREATE_INCREMENTAL)
+        m_NewObjNumArray.push_back(m_dwLastObjNum);
     }
     m_iStage = 80;
   }
   return m_iStage;
 }
 int32_t CPDF_Creator::WriteDoc_Stage3(IFX_Pause* pPause) {
   ASSERT(m_iStage >= 80 || m_iStage < 90);
   uint32_t dwLastObjNum = m_dwLastObjNum;
   if (m_iStage == 80) {
     m_XrefStart = m_Offset;
@@ skipping 58 matching lines @@
       }
       if (pPause && pPause->NeedToPauseNow()) {
         m_Pos = (void*)(uintptr_t)i;
         return 1;
       }
     }
     m_iStage = 90;
   }
   if (m_iStage == 82) {
     CFX_ByteString str;
-    int32_t iCount = m_NewObjNumArray.GetSize();
-    int32_t i = (int32_t)(uintptr_t)m_Pos;
+    size_t iCount = m_NewObjNumArray.size();
+    size_t i = (size_t)(uintptr_t)m_Pos;
     while (i < iCount) {
-      int32_t j = i;
-      uint32_t objnum = m_NewObjNumArray.ElementAt(i);
+      size_t j = i;
+      uint32_t objnum = m_NewObjNumArray[i];
       while (j < iCount) {
-        if (++j == iCount) {
+        if (++j == iCount)
           break;
-        }
-        uint32_t dwCurrent = m_NewObjNumArray.ElementAt(j);
-        if (dwCurrent - objnum > 1) {
+        uint32_t dwCurrent = m_NewObjNumArray[j];
+        if (dwCurrent - objnum > 1)
           break;
-        }
         objnum = dwCurrent;
       }
-      objnum = m_NewObjNumArray.ElementAt(i);
+      objnum = m_NewObjNumArray[i];
       if (objnum == 1) {
         str.Format("0 %d\r\n0000000000 65535 f\r\n", j - i + 1);
       } else {
         str.Format("%d %d\r\n", objnum, j - i);
       }
       if (m_File.AppendBlock(str.c_str(), str.GetLength()) < 0) {
         return -1;
       }
       while (i < j) {
-        objnum = m_NewObjNumArray.ElementAt(i++);
+        objnum = m_NewObjNumArray[i++];
         str.Format("%010d 00000 n\r\n", m_ObjectOffset[objnum]);
-        if (m_File.AppendBlock(str.c_str(), str.GetLength()) < 0) {
+        if (m_File.AppendBlock(str.c_str(), str.GetLength()) < 0)
           return -1;
-        }
       }
       if (pPause && (i % 100) == 0 && pPause->NeedToPauseNow()) {
         m_Pos = (void*)(uintptr_t)i;
         return 1;
       }
     }
     m_iStage = 90;
   }
   return m_iStage;
 }
@@ skipping 145 matching lines @@
           return -1;
         }
         if (m_File.AppendDWord(m_dwLastObjNum * 5) < 0) {
           return -1;
         }
         if (m_File.AppendString(">>stream\r\n") < 0) {
           return -1;
         }
         for (i = 0; i < m_dwLastObjNum; i++) {
           FX_FILESIZE* offset = m_ObjectOffset.GetPtrAt(i);
-          if (!offset) {
+          if (!offset)
             continue;
-          }
           OutputIndex(&m_File, *offset);
         }
       } else {
-        int count = m_NewObjNumArray.GetSize();
-        int32_t i = 0;
+        size_t count = m_NewObjNumArray.size();
+        size_t i = 0;
         for (i = 0; i < count; i++) {
-          uint32_t objnum = m_NewObjNumArray.ElementAt(i);
-          if (m_File.AppendDWord(objnum) < 0) {
+          if (m_File.AppendDWord(m_NewObjNumArray[i]) < 0)
             return -1;
-          }
-          if (m_File.AppendString(" 1 ") < 0) {
+          if (m_File.AppendString(" 1 ") < 0)
             return -1;
-          }
         }
-        if (m_File.AppendString("]/Length ") < 0) {
+        if (m_File.AppendString("]/Length ") < 0)
           return -1;
-        }
-        if (m_File.AppendDWord(count * 5) < 0) {
+        if (m_File.AppendDWord(count * 5) < 0)
           return -1;
-        }
-        if (m_File.AppendString(">>stream\r\n") < 0) {
+        if (m_File.AppendString(">>stream\r\n") < 0)
           return -1;
-        }
         for (i = 0; i < count; i++) {
-          uint32_t objnum = m_NewObjNumArray.ElementAt(i);
+          uint32_t objnum = m_NewObjNumArray[i];
           FX_FILESIZE offset = m_ObjectOffset[objnum];
           OutputIndex(&m_File, offset);
         }
       }
-      if (m_File.AppendString("\r\nendstream") < 0) {
+      if (m_File.AppendString("\r\nendstream") < 0)
         return -1;
-      }
     }
   }
   if (m_File.AppendString("\r\nstartxref\r\n") < 0) {
     return -1;
   }
   FX_CHAR offset_buf[20];
   FXSYS_memset(offset_buf, 0, sizeof(offset_buf));
   FXSYS_i64toa(m_XrefStart, offset_buf, 10);
   if (m_File.AppendBlock(offset_buf, FXSYS_strlen(offset_buf)) < 0) {
     return -1;
   }
   if (m_File.AppendString("\r\n%%EOF\r\n") < 0) {
     return -1;
   }
   m_File.Flush();
   return m_iStage = 100;
 }
 
 void CPDF_Creator::Clear() {
   m_pXRefStream.reset();
   m_File.Clear();
-  m_NewObjNumArray.RemoveAll();
+  m_NewObjNumArray.clear();
   m_pIDArray.reset();
 }
 
 bool CPDF_Creator::Create(const CFX_RetainPtr<IFX_WriteStream>& pFile,
                           uint32_t flags) {
   m_File.AttachFile(pFile);
   return Create(flags);
 }
 
 bool CPDF_Creator::Create(uint32_t flags) {
   m_dwFlags = flags;
   m_iStage = 0;
   m_Offset = 0;
   m_dwLastObjNum = m_pDocument->GetLastObjNum();
   m_ObjectOffset.Clear();
-  m_NewObjNumArray.RemoveAll();
+  m_NewObjNumArray.clear();
   InitID();
   if (flags & FPDFCREATE_PROGRESSIVE)
     return true;
   return Continue(nullptr) > -1;
 }
 
 void CPDF_Creator::InitID(bool bDefault) {
   CPDF_Array* pOldIDArray = m_pParser ? m_pParser->GetIDArray() : nullptr;
   bool bNewId = !m_pIDArray;
   if (bNewId) {
@@ skipping 80 matching lines @@
   m_pCryptoHandler = nullptr;
 }
 void CPDF_Creator::ResetStandardSecurity() {
   if (!m_bLocalCryptoHandler)
     return;
 
   delete m_pCryptoHandler;
   m_pCryptoHandler = nullptr;
   m_bLocalCryptoHandler = false;
 }