diff options
| author | Wei Li <weili@chromium.org> | 2016-04-11 10:02:09 -0700 |
|---|---|---|
| committer | Wei Li <weili@chromium.org> | 2016-04-11 10:02:09 -0700 |
| commit | e1aebd43b0c75133f94f8b141b33d12e2e715524 (patch) | |
| tree | 863aded8c706db162eb3f69d6482100f9d61b842 /core/fpdfapi/fpdf_parser/cpdf_parser.cpp | |
| parent | 2d4a4fc372159ac7562abea48498b6ab72c2f321 (diff) | |
| download | pdfium-e1aebd43b0c75133f94f8b141b33d12e2e715524.tar.xz | |
Use std::vector as internal storage for CPDF_Array
Replace the usage of CFX_ArrayTemplate inside CPDF_Array, which
has non-standard APIs such as GetSize() returns int.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1867183002 .
Diffstat (limited to 'core/fpdfapi/fpdf_parser/cpdf_parser.cpp')
| -rw-r--r-- | core/fpdfapi/fpdf_parser/cpdf_parser.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/fpdfapi/fpdf_parser/cpdf_parser.cpp b/core/fpdfapi/fpdf_parser/cpdf_parser.cpp index 4ba43678b8..97b03f046c 100644 --- a/core/fpdfapi/fpdf_parser/cpdf_parser.cpp +++ b/core/fpdfapi/fpdf_parser/cpdf_parser.cpp @@ -988,8 +988,7 @@ FX_BOOL CPDF_Parser::LoadCrossRefV5(FX_FILESIZE* pos, FX_BOOL bMainXRef) { std::vector<std::pair<int32_t, int32_t>> arrIndex; CPDF_Array* pArray = pStream->GetDict()->GetArrayBy("Index"); if (pArray) { - uint32_t nPairSize = pArray->GetCount() / 2; - for (uint32_t i = 0; i < nPairSize; i++) { + for (size_t i = 0; i < pArray->GetCount() / 2; i++) { CPDF_Object* pStartNumObj = pArray->GetObjectAt(i * 2); CPDF_Object* pCountObj = pArray->GetObjectAt(i * 2 + 1); @@ -1013,7 +1012,7 @@ FX_BOOL CPDF_Parser::LoadCrossRefV5(FX_FILESIZE* pos, FX_BOOL bMainXRef) { CFX_ArrayTemplate<uint32_t> WidthArray; FX_SAFE_UINT32 dwAccWidth = 0; - for (uint32_t i = 0; i < pArray->GetCount(); i++) { + for (size_t i = 0; i < pArray->GetCount(); i++) { WidthArray.Add(pArray->GetIntegerAt(i)); dwAccWidth += WidthArray[i]; } |