Use std::vector as internal storage for CPDF_Array

fpdfsdk/fsdk_baseannot.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 <algorithm>
 
 #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
@@ skipping 721 matching lines @@
 }
 
 void CPDFSDK_BAAnnot::SetBorderDash(const CFX_IntArray& array) {
   CPDF_Dictionary* pBSDict = m_pAnnot->GetAnnotDict()->GetDictBy("BS");
   if (!pBSDict) {
     pBSDict = new CPDF_Dictionary;
     m_pAnnot->GetAnnotDict()->SetAt("BS", pBSDict);
   }
 
   CPDF_Array* pArray = new CPDF_Array;
-  for (int i = 0, sz = array.GetSize(); i < sz; i++) {
+  for (size_t i = 0, sz = array.GetSize(); i < sz; i++)
     pArray->AddInteger(array[i]);
-  }
 
   pBSDict->SetAt("D", pArray);
 }
 
 void CPDFSDK_BAAnnot::GetBorderDash(CFX_IntArray& array) const {
   CPDF_Array* pDash = NULL;
 
   CPDF_Array* pBorder = m_pAnnot->GetAnnotDict()->GetArrayBy("Border");
   if (pBorder) {
     pDash = pBorder->GetArrayAt(3);
   } else {
     CPDF_Dictionary* pBSDict = m_pAnnot->GetAnnotDict()->GetDictBy("BS");
     if (pBSDict) {
       pDash = pBSDict->GetArrayBy("D");
     }
   }
 
   if (pDash) {
-    for (int i = 0, sz = pDash->GetCount(); i < sz; i++) {
+    for (size_t i = 0, sz = pDash->GetCount(); i < sz; i++)
       array.Add(pDash->GetIntegerAt(i));
-    }
   }
 }
 
 void CPDFSDK_BAAnnot::SetColor(FX_COLORREF color) {
   CPDF_Array* pArray = new CPDF_Array;
   pArray->AddNumber((FX_FLOAT)FXSYS_GetRValue(color) / 255.0f);
   pArray->AddNumber((FX_FLOAT)FXSYS_GetGValue(color) / 255.0f);
   pArray->AddNumber((FX_FLOAT)FXSYS_GetBValue(color) / 255.0f);
   m_pAnnot->GetAnnotDict()->SetAt("C", pArray);
 }
 
 void CPDFSDK_BAAnnot::RemoveColor() {
   m_pAnnot->GetAnnotDict()->RemoveAt("C");
 }
 
 FX_BOOL CPDFSDK_BAAnnot::GetColor(FX_COLORREF& color) const {
   if (CPDF_Array* pEntry = m_pAnnot->GetAnnotDict()->GetArrayBy("C")) {
-    int nCount = pEntry->GetCount();
+    size_t nCount = pEntry->GetCount();
     if (nCount == 1) {
       FX_FLOAT g = pEntry->GetNumberAt(0) * 255;
 
       color = FXSYS_RGB((int)g, (int)g, (int)g);
 
       return TRUE;
     } else if (nCount == 3) {
       FX_FLOAT r = pEntry->GetNumberAt(0) * 255;
       FX_FLOAT g = pEntry->GetNumberAt(1) * 255;
       FX_FLOAT b = pEntry->GetNumberAt(2) * 255;
@@ skipping 162 matching lines @@
 
 CPDF_Page* CPDFSDK_Annot::GetPDFPage() {
   return m_pPageView ? m_pPageView->GetPDFPage() : nullptr;
 }
 
 #ifdef PDF_ENABLE_XFA
 CPDFXFA_Page* CPDFSDK_Annot::GetPDFXFAPage() {
   return m_pPageView ? m_pPageView->GetPDFXFAPage() : nullptr;
 }
 #endif  // PDF_ENABLE_XFA