Use std::vector as internal storage for CPDF_Array

core/fpdfdoc/doc_ocg.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/fpdf_parser/include/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
 #include "core/fpdfdoc/include/fpdf_doc.h"
 
 static int32_t FPDFDOC_OCG_FindGroup(const CPDF_Object* pObject,
                                      const CPDF_Dictionary* pGroupDict) {
   if (!pObject || !pGroupDict)
     return -1;
 
   if (const CPDF_Array* pArray = pObject->AsArray()) {
-    uint32_t dwCount = pArray->GetCount();
-    for (uint32_t i = 0; i < dwCount; i++) {
+    for (size_t i = 0; i < pArray->GetCount(); i++) {
       if (pArray->GetDictAt(i) == pGroupDict)
         return i;
     }
     return -1;
   }
   return pObject->GetDict() == pGroupDict ? 0 : -1;
 }
 static FX_BOOL FPDFDOC_OCG_HasIntent(const CPDF_Dictionary* pDict,
                                      const CFX_ByteStringC& csElement,
                                      const CFX_ByteStringC& csDef = "") {
   CPDF_Object* pIntent = pDict->GetDirectObjectBy("Intent");
   if (!pIntent) {
     return csElement == csDef;
   }
   CFX_ByteString bsIntent;
   if (CPDF_Array* pArray = pIntent->AsArray()) {
-    uint32_t dwCount = pArray->GetCount();
-    for (uint32_t i = 0; i < dwCount; i++) {
+    for (size_t i = 0; i < pArray->GetCount(); i++) {
       bsIntent = pArray->GetStringAt(i);
       if (bsIntent == "All" || bsIntent == csElement)
         return TRUE;
     }
     return FALSE;
   }
   bsIntent = pIntent->GetString();
   return bsIntent == "All" || bsIntent == csElement;
 }
 static CPDF_Dictionary* FPDFDOC_OCG_GetConfig(CPDF_Document* pDoc,
                                               const CPDF_Dictionary* pOCGDict,
                                               const CFX_ByteStringC& bsState) {
   FXSYS_assert(pDoc && pOCGDict);
   CPDF_Dictionary* pOCProperties = pDoc->GetRoot()->GetDictBy("OCProperties");
   if (!pOCProperties) {
     return NULL;
   }
   CPDF_Array* pOCGs = pOCProperties->GetArrayBy("OCGs");
   if (!pOCGs) {
     return NULL;
   }
   if (FPDFDOC_OCG_FindGroup(pOCGs, pOCGDict) < 0) {
     return NULL;
   }
   CPDF_Dictionary* pConfig = pOCProperties->GetDictBy("D");
   CPDF_Array* pConfigs = pOCProperties->GetArrayBy("Configs");
   if (pConfigs) {
     CPDF_Dictionary* pFind;
-    int32_t iCount = pConfigs->GetCount();
-    for (int32_t i = 0; i < iCount; i++) {
+    for (size_t i = 0; i < pConfigs->GetCount(); i++) {
       pFind = pConfigs->GetDictAt(i);
       if (!pFind) {
         continue;
       }
       if (!FPDFDOC_OCG_HasIntent(pFind, "View", "View")) {
         continue;
       }
       pConfig = pFind;
       break;
     }
@@ skipping 38 matching lines @@
   }
   pArray = pConfig->GetArrayBy("OFF");
   if (pArray) {
     if (FPDFDOC_OCG_FindGroup(pArray, pOCGDict) >= 0) {
       bState = FALSE;
     }
   }
   pArray = pConfig->GetArrayBy("AS");
   if (pArray) {
     CFX_ByteString csFind = csConfig + "State";
-    int32_t iCount = pArray->GetCount();
-    for (int32_t i = 0; i < iCount; i++) {
+    for (size_t i = 0; i < pArray->GetCount(); i++) {
       CPDF_Dictionary* pUsage = pArray->GetDictAt(i);
       if (!pUsage) {
         continue;
       }
       if (pUsage->GetStringBy("Event", "View") != csConfig) {
         continue;
       }
       CPDF_Array* pOCGs = pUsage->GetArrayBy("OCGs");
       if (!pOCGs) {
         continue;
@@ skipping 50 matching lines @@
 
 FX_BOOL CPDF_OCContext::GetOCGVE(CPDF_Array* pExpression,
                                  FX_BOOL bFromConfig,
                                  int nLevel) {
   if (nLevel > 32) {
     return FALSE;
   }
   if (!pExpression) {
     return FALSE;
   }
-  int32_t iCount = pExpression->GetCount();
   CPDF_Object* pOCGObj;
   CFX_ByteString csOperator = pExpression->GetStringAt(0);
   if (csOperator == "Not") {
     pOCGObj = pExpression->GetDirectObjectAt(1);
     if (!pOCGObj)
       return FALSE;
     if (CPDF_Dictionary* pDict = pOCGObj->AsDictionary())
       return !(bFromConfig ? LoadOCGState(pDict) : GetOCGVisible(pDict));
     if (CPDF_Array* pArray = pOCGObj->AsArray())
       return !GetOCGVE(pArray, bFromConfig, nLevel + 1);
     return FALSE;
   }
   if (csOperator == "Or" || csOperator == "And") {
     FX_BOOL bValue = FALSE;
-    for (int32_t i = 1; i < iCount; i++) {
+    for (size_t i = 1; i < pExpression->GetCount(); i++) {
       pOCGObj = pExpression->GetDirectObjectAt(1);
       if (!pOCGObj) {
         continue;
       }
       FX_BOOL bItem = FALSE;
       if (CPDF_Dictionary* pDict = pOCGObj->AsDictionary())
         bItem = bFromConfig ? LoadOCGState(pDict) : GetOCGVisible(pDict);
       else if (CPDF_Array* pArray = pOCGObj->AsArray())
         bItem = GetOCGVE(pArray, bFromConfig, nLevel + 1);
 
@@ skipping 25 matching lines @@
     return bFromConfig ? LoadOCGState(pDict) : GetOCGVisible(pDict);
 
   CPDF_Array* pArray = pOCGObj->AsArray();
   if (!pArray)
     return TRUE;
 
   FX_BOOL bState = FALSE;
   if (csP == "AllOn" || csP == "AllOff") {
     bState = TRUE;
   }
-  int32_t iCount = pArray->GetCount();
-  for (int32_t i = 0; i < iCount; i++) {
+  for (size_t i = 0; i < pArray->GetCount(); i++) {
     FX_BOOL bItem = TRUE;
     CPDF_Dictionary* pItemDict = pArray->GetDictAt(i);
     if (pItemDict)
       bItem = bFromConfig ? LoadOCGState(pItemDict) : GetOCGVisible(pItemDict);
 
     if ((csP == "AnyOn" && bItem) || (csP == "AnyOff" && !bItem))
       return TRUE;
     if ((csP == "AllOn" && !bItem) || (csP == "AllOff" && bItem))
       return FALSE;
   }
   return bState;
 }
 FX_BOOL CPDF_OCContext::CheckOCGVisible(const CPDF_Dictionary* pOCGDict) {
   if (!pOCGDict) {
     return TRUE;
   }
   CFX_ByteString csType = pOCGDict->GetStringBy("Type", "OCG");
   if (csType == "OCG") {
     return GetOCGVisible(pOCGDict);
   }
   return LoadOCMDState(pOCGDict, FALSE);
 }
 void CPDF_OCContext::ResetOCContext() {
   m_OCGStates.clear();
 }