diff options
| author | Lei Zhang <thestig@chromium.org> | 2017-12-11 22:12:08 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-12-11 22:12:08 +0000 |
| commit | 07401bae6d9f95911b144e6fabb42f19e40def49 (patch) | |
| tree | 4c7aa56beadf3bc1540ecad781e62ec8b84be4e0 /core/fpdfapi/font | |
| parent | 4412f3d87441c135ef56420f18d9229fbe247c3e (diff) | |
| download | pdfium-07401bae6d9f95911b144e6fabb42f19e40def49.tar.xz | |
Remove default arguments to CPDF_StreamAcc::LoadAllData().
Add LoadAllDataFiltered() and LoadAllDataRaw() and update callers.
Change-Id: I9b80ee34a358db204968acdc8b1adc9db0b6b83f
Reviewed-on: https://pdfium-review.googlesource.com/20810
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Diffstat (limited to 'core/fpdfapi/font')
| -rw-r--r-- | core/fpdfapi/font/cpdf_cidfont.cpp | 4 | ||||
| -rw-r--r-- | core/fpdfapi/font/cpdf_tounicodemap.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/fpdfapi/font/cpdf_cidfont.cpp b/core/fpdfapi/font/cpdf_cidfont.cpp index 082b5039e3..21f8addf8f 100644 --- a/core/fpdfapi/font/cpdf_cidfont.cpp +++ b/core/fpdfapi/font/cpdf_cidfont.cpp @@ -374,7 +374,7 @@ bool CPDF_CIDFont::Load() { return false; } else if (CPDF_Stream* pStream = pEncoding->AsStream()) { auto pAcc = pdfium::MakeRetain<CPDF_StreamAcc>(pStream); - pAcc->LoadAllData(false); + pAcc->LoadAllDataFiltered(); m_pCMap = pdfium::MakeRetain<CPDF_CMap>(); m_pCMap->LoadEmbedded(pAcc->GetData(), pAcc->GetSize()); } else { @@ -412,7 +412,7 @@ bool CPDF_CIDFont::Load() { if (pmap) { if (CPDF_Stream* pStream = pmap->AsStream()) { m_pStreamAcc = pdfium::MakeRetain<CPDF_StreamAcc>(pStream); - m_pStreamAcc->LoadAllData(false); + m_pStreamAcc->LoadAllDataFiltered(); } else if (pmap->GetString() == "Identity") { #if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_ if (m_pFontFile) diff --git a/core/fpdfapi/font/cpdf_tounicodemap.cpp b/core/fpdfapi/font/cpdf_tounicodemap.cpp index 0ddaa34e13..0b746d7bfc 100644 --- a/core/fpdfapi/font/cpdf_tounicodemap.cpp +++ b/core/fpdfapi/font/cpdf_tounicodemap.cpp @@ -125,7 +125,7 @@ uint32_t CPDF_ToUnicodeMap::GetUnicode() { void CPDF_ToUnicodeMap::Load(CPDF_Stream* pStream) { CIDSet cid_set = CIDSET_UNKNOWN; auto pAcc = pdfium::MakeRetain<CPDF_StreamAcc>(pStream); - pAcc->LoadAllData(false); + pAcc->LoadAllDataFiltered(); CPDF_SimpleParser parser(pAcc->GetData(), pAcc->GetSize()); while (1) { ByteStringView word = parser.GetWord(); |