summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Weintraub <asweintraub@google.com>2017-12-08 21:49:58 +0000
committerChromium commit bot <commit-bot@chromium.org>2017-12-08 21:49:58 +0000
commitf8f22c7ac7f3d4b922f40f67e910114e55b187b0 (patch)
treec02a0f39ae3cf2fe98d2b63af723487e88d6381e
parent93bb725b62f9779534c9444c1e1319fe8c28912e (diff)
downloadpdfium-chromium/3289.tar.xz
Fix build when using different sysroots.chromium/3289
Bug: Change-Id: I86b4c72343288d83d51f493d3d888aad45baed5a Reviewed-on: https://pdfium-review.googlesource.com/20610 Reviewed-by: Lei Zhang <thestig@chromium.org> Commit-Queue: Lei Zhang <thestig@chromium.org>
-rw-r--r--core/fpdfapi/font/cfx_cttgsubtable.cpp4
-rw-r--r--core/fpdfdoc/cpdf_action.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/core/fpdfapi/font/cfx_cttgsubtable.cpp b/core/fpdfapi/font/cfx_cttgsubtable.cpp
index 4870756ca0..ae868ca5ab 100644
--- a/core/fpdfapi/font/cfx_cttgsubtable.cpp
+++ b/core/fpdfapi/font/cfx_cttgsubtable.cpp
@@ -243,12 +243,12 @@ CFX_CTTGSUBTable::ParseCoverage(FT_Bytes raw) {
if (format == 1) {
auto rec = pdfium::MakeUnique<TCoverageFormat1>();
ParseCoverageFormat1(raw, rec.get());
- return rec;
+ return std::move(rec);
}
if (format == 2) {
auto rec = pdfium::MakeUnique<TCoverageFormat2>();
ParseCoverageFormat2(raw, rec.get());
- return rec;
+ return std::move(rec);
}
return nullptr;
}
diff --git a/core/fpdfdoc/cpdf_action.cpp b/core/fpdfdoc/cpdf_action.cpp
index 9d28bc1f82..a3e2e23baf 100644
--- a/core/fpdfdoc/cpdf_action.cpp
+++ b/core/fpdfdoc/cpdf_action.cpp
@@ -21,7 +21,7 @@ const char* const g_sATypes[] = {
} // namespace
-CPDF_Action::CPDF_Action() {}
+CPDF_Action::CPDF_Action() : CPDF_Action(nullptr) {}
CPDF_Action::CPDF_Action(CPDF_Dictionary* pDict) : m_pDict(pDict) {}