diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-06-26 19:48:59 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-06-26 19:48:59 +0000 |
| commit | c4dce690f433a41c4429e872c2306e09b14c5d9f (patch) | |
| tree | 43990b61718628e7731fb8b6bf7c12e4df04b8ff /core/fpdfapi/cmaps/fpdf_cmaps.cpp | |
| parent | ca386ad150be28116997b713056a4a2197c7b7e8 (diff) | |
| download | pdfium-c4dce690f433a41c4429e872c2306e09b14c5d9f.tar.xz | |
Use pdfium::span<> in cpdf_fontglobals.h
Required moving some sizes to .h file for default construction
of spans from c-style arrays.
Change-Id: I45c42103f3575bc83e57a085ad4e8f16698468d3
Reviewed-on: https://pdfium-review.googlesource.com/36190
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fpdfapi/cmaps/fpdf_cmaps.cpp')
| -rw-r--r-- | core/fpdfapi/cmaps/fpdf_cmaps.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/core/fpdfapi/cmaps/fpdf_cmaps.cpp b/core/fpdfapi/cmaps/fpdf_cmaps.cpp index bba8d2173d..bb4a397aa4 100644 --- a/core/fpdfapi/cmaps/fpdf_cmaps.cpp +++ b/core/fpdfapi/cmaps/fpdf_cmaps.cpp @@ -11,6 +11,7 @@ #include "core/fpdfapi/cpdf_modulemgr.h" #include "core/fpdfapi/font/cpdf_fontglobals.h" #include "core/fpdfapi/page/cpdf_pagemodule.h" +#include "third_party/base/span.h" namespace { @@ -26,10 +27,10 @@ const FXCMAP_CMap* FPDFAPI_FindEmbeddedCMap(const ByteString& bsName, CPDF_FontGlobals* pFontGlobals = CPDF_ModuleMgr::Get()->GetPageModule()->GetFontGlobals(); - const FXCMAP_CMap* pCMaps; - uint32_t count; - std::tie(count, pCMaps) = pFontGlobals->GetEmbeddedCharset(charset); - for (uint32_t i = 0; i < count; i++) { + pdfium::span<const FXCMAP_CMap> pCMaps = + pFontGlobals->GetEmbeddedCharset(charset); + + for (size_t i = 0; i < pCMaps.size(); i++) { if (bsName == pCMaps[i].m_Name) return &pCMaps[i]; } |