diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-08-29 18:25:44 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-08-29 18:25:44 +0000 |
| commit | 803cf76a5801536afe3ac2baad0f9a66ec27eeb6 (patch) | |
| tree | 5a37abc17e7e5f8189e5681f500d73320ccbfe9c /core/fpdfapi/cmaps | |
| parent | d2e4698c5daeba74a231574d63a11a858920ea59 (diff) | |
| download | pdfium-803cf76a5801536afe3ac2baad0f9a66ec27eeb6.tar.xz | |
Remove FPDFAPI_ prefix from internal cid/encoder functions
These look too much like public/ FPDF functions otherwise and yet
they are not exposed anywhere beyond core/fpdfapi. Disambiguate
one method vs. top-level function usage as a result.
Bug: pdfium:1141
Change-Id: I9cfdfced90386bb9ef6b2b86f568f2e6f8ee6a5a
Reviewed-on: https://pdfium-review.googlesource.com/41530
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fpdfapi/cmaps')
| -rw-r--r-- | core/fpdfapi/cmaps/cmap_int.h | 10 | ||||
| -rw-r--r-- | core/fpdfapi/cmaps/fpdf_cmaps.cpp | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/core/fpdfapi/cmaps/cmap_int.h b/core/fpdfapi/cmaps/cmap_int.h index 03650383cd..e532c763ff 100644 --- a/core/fpdfapi/cmaps/cmap_int.h +++ b/core/fpdfapi/cmaps/cmap_int.h @@ -29,10 +29,10 @@ struct FXCMAP_CMap { int8_t m_UseOffset; }; -const FXCMAP_CMap* FPDFAPI_FindEmbeddedCMap(const ByteString& name, - int charset, - int coding); -uint16_t FPDFAPI_CIDFromCharCode(const FXCMAP_CMap* pMap, uint32_t charcode); -uint32_t FPDFAPI_CharCodeFromCID(const FXCMAP_CMap* pMap, uint16_t cid); +const FXCMAP_CMap* FindEmbeddedCMap(const ByteString& name, + int charset, + int coding); +uint16_t CIDFromCharCode(const FXCMAP_CMap* pMap, uint32_t charcode); +uint32_t CharCodeFromCID(const FXCMAP_CMap* pMap, uint16_t cid); #endif // CORE_FPDFAPI_CMAPS_CMAP_INT_H_ diff --git a/core/fpdfapi/cmaps/fpdf_cmaps.cpp b/core/fpdfapi/cmaps/fpdf_cmaps.cpp index 630942bde7..5d2143c3c3 100644 --- a/core/fpdfapi/cmaps/fpdf_cmaps.cpp +++ b/core/fpdfapi/cmaps/fpdf_cmaps.cpp @@ -32,9 +32,9 @@ const FXCMAP_CMap* FindNextCMap(const FXCMAP_CMap* pMap) { } // namespace -const FXCMAP_CMap* FPDFAPI_FindEmbeddedCMap(const ByteString& bsName, - int charset, - int coding) { +const FXCMAP_CMap* FindEmbeddedCMap(const ByteString& bsName, + int charset, + int coding) { CPDF_FontGlobals* pFontGlobals = CPDF_ModuleMgr::Get()->GetPageModule()->GetFontGlobals(); @@ -48,7 +48,7 @@ const FXCMAP_CMap* FPDFAPI_FindEmbeddedCMap(const ByteString& bsName, return nullptr; } -uint16_t FPDFAPI_CIDFromCharCode(const FXCMAP_CMap* pMap, uint32_t charcode) { +uint16_t CIDFromCharCode(const FXCMAP_CMap* pMap, uint32_t charcode) { ASSERT(pMap); const uint16_t loword = static_cast<uint16_t>(charcode); if (charcode >> 16) { @@ -111,7 +111,7 @@ uint16_t FPDFAPI_CIDFromCharCode(const FXCMAP_CMap* pMap, uint32_t charcode) { return 0; } -uint32_t FPDFAPI_CharCodeFromCID(const FXCMAP_CMap* pMap, uint16_t cid) { +uint32_t CharCodeFromCID(const FXCMAP_CMap* pMap, uint16_t cid) { // TODO(dsinclair): This should be checking both pMap->m_WordMap and // pMap->m_DWordMap. There was a second while() but it was never reached as // the first always returns. Investigate and determine how this should |