| OLD | NEW |
| 1 // Copyright 2016 PDFium Authors. All rights reserved. | 1 // Copyright 2016 PDFium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "core/fpdfapi/parser/cpdf_array.h" | 5 #include "core/fpdfapi/parser/cpdf_array.h" |
| 6 #include "core/fpdfapi/parser/cpdf_number.h" | 6 #include "core/fpdfapi/parser/cpdf_number.h" |
| 7 #include "core/fpdfapi/parser/cpdf_reference.h" | 7 #include "core/fpdfapi/parser/cpdf_reference.h" |
| 8 | 8 |
| 9 #include <memory> | 9 #include <memory> |
| 10 | 10 |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 static const size_t kNumOfRowElems = 5; | 106 static const size_t kNumOfRowElems = 5; |
| 107 int elems[kNumOfRows][kNumOfRowElems] = { | 107 int elems[kNumOfRows][kNumOfRowElems] = { |
| 108 {1, 2, 3, 4, 5}, {10, 9, 8, 7, 6}, {11, 12, 13, 14, 15}}; | 108 {1, 2, 3, 4, 5}, {10, 9, 8, 7, 6}, {11, 12, 13, 14, 15}}; |
| 109 ScopedArray arr(new CPDF_Array); | 109 ScopedArray arr(new CPDF_Array); |
| 110 // Indirect references to indirect objects. | 110 // Indirect references to indirect objects. |
| 111 std::unique_ptr<CPDF_IndirectObjectHolder> obj_holder( | 111 std::unique_ptr<CPDF_IndirectObjectHolder> obj_holder( |
| 112 new CPDF_IndirectObjectHolder()); | 112 new CPDF_IndirectObjectHolder()); |
| 113 for (size_t i = 0; i < kNumOfRows; ++i) { | 113 for (size_t i = 0; i < kNumOfRows; ++i) { |
| 114 CPDF_Array* arr_elem = new CPDF_Array; | 114 CPDF_Array* arr_elem = new CPDF_Array; |
| 115 for (size_t j = 0; j < kNumOfRowElems; ++j) { | 115 for (size_t j = 0; j < kNumOfRowElems; ++j) { |
| 116 UniqueObject obj(new CPDF_Number(elems[i][j])); | 116 CPDF_Number* obj = new CPDF_Number(elems[i][j]); |
| 117 // Object number starts from 1. | 117 // Starts object number from 1. |
| 118 int obj_num = i * kNumOfRowElems + j + 1; | 118 int obj_num = i * kNumOfRowElems + j + 1; |
| 119 obj_holder->ReplaceIndirectObjectIfHigherGeneration(obj_num, | 119 obj_holder->ReplaceIndirectObjectIfHigherGeneration(obj_num, obj); |
| 120 std::move(obj)); | |
| 121 arr_elem->InsertAt(j, new CPDF_Reference(obj_holder.get(), obj_num)); | 120 arr_elem->InsertAt(j, new CPDF_Reference(obj_holder.get(), obj_num)); |
| 122 } | 121 } |
| 123 arr->InsertAt(i, arr_elem); | 122 arr->InsertAt(i, arr_elem); |
| 124 } | 123 } |
| 125 ASSERT_EQ(kNumOfRows, arr->GetCount()); | 124 ASSERT_EQ(kNumOfRows, arr->GetCount()); |
| 126 // Not dereferencing reference objects means just creating new references | 125 // Not dereferencing reference objects means just creating new references |
| 127 // instead of new copies of direct objects. | 126 // instead of new copies of direct objects. |
| 128 ScopedArray arr1(arr->Clone()->AsArray()); | 127 ScopedArray arr1(arr->Clone()->AsArray()); |
| 129 EXPECT_EQ(arr->GetCount(), arr1->GetCount()); | 128 EXPECT_EQ(arr->GetCount(), arr1->GetCount()); |
| 130 // Dereferencing reference objects creates new copies of direct objects. | 129 // Dereferencing reference objects creates new copies of direct objects. |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 172 TEST(cpdf_array, Iterator) { | 171 TEST(cpdf_array, Iterator) { |
| 173 int elems[] = {-23, -11, 3, 455, 2345877, | 172 int elems[] = {-23, -11, 3, 455, 2345877, |
| 174 0, 7895330, -12564334, 10000, -100000}; | 173 0, 7895330, -12564334, 10000, -100000}; |
| 175 ScopedArray arr(new CPDF_Array); | 174 ScopedArray arr(new CPDF_Array); |
| 176 for (size_t i = 0; i < FX_ArraySize(elems); ++i) | 175 for (size_t i = 0; i < FX_ArraySize(elems); ++i) |
| 177 arr->InsertAt(i, new CPDF_Number(elems[i])); | 176 arr->InsertAt(i, new CPDF_Number(elems[i])); |
| 178 size_t index = 0; | 177 size_t index = 0; |
| 179 for (const auto& it : *arr) | 178 for (const auto& it : *arr) |
| 180 EXPECT_EQ(elems[index++], it->AsNumber()->GetInteger()); | 179 EXPECT_EQ(elems[index++], it->AsNumber()->GetInteger()); |
| 181 } | 180 } |
| OLD | NEW |