summaryrefslogtreecommitdiff
path: root/core/fpdfapi/parser/cpdf_cross_ref_table.cpp
diff options
context:
space:
mode:
authorArtem Strygin <art-snake@yandex-team.ru>2018-07-18 04:32:08 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-07-18 04:32:08 +0000
commit084c31d93439d5166c60dbfb0ccee6db1406d09c (patch)
treeb5a420219ca6fbd14b05395df8d9f2eac53b2202 /core/fpdfapi/parser/cpdf_cross_ref_table.cpp
parenta18536af5b32b63f795d8b5812a4303c7ee6ea97 (diff)
downloadpdfium-084c31d93439d5166c60dbfb0ccee6db1406d09c.tar.xz
Use CPDF_CrossRefTable within CPDF_Parser
Change-Id: I354e8bed12606abdc67427bbc7928e3b1f11e243 Reviewed-on: https://pdfium-review.googlesource.com/35433 Commit-Queue: Art Snake <art-snake@yandex-team.ru> Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fpdfapi/parser/cpdf_cross_ref_table.cpp')
-rw-r--r--core/fpdfapi/parser/cpdf_cross_ref_table.cpp14
1 files changed, 14 insertions, 0 deletions
diff --git a/core/fpdfapi/parser/cpdf_cross_ref_table.cpp b/core/fpdfapi/parser/cpdf_cross_ref_table.cpp
index 770c483dca..4be91745d8 100644
--- a/core/fpdfapi/parser/cpdf_cross_ref_table.cpp
+++ b/core/fpdfapi/parser/cpdf_cross_ref_table.cpp
@@ -8,6 +8,20 @@
#include "core/fpdfapi/parser/cpdf_dictionary.h"
+// static
+std::unique_ptr<CPDF_CrossRefTable> CPDF_CrossRefTable::MergeUp(
+ std::unique_ptr<CPDF_CrossRefTable> current,
+ std::unique_ptr<CPDF_CrossRefTable> top) {
+ if (!current)
+ return top;
+
+ if (!top)
+ return current;
+
+ current->Update(std::move(top));
+ return current;
+}
+
CPDF_CrossRefTable::CPDF_CrossRefTable() = default;
CPDF_CrossRefTable::CPDF_CrossRefTable(std::unique_ptr<CPDF_Dictionary> trailer)