diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-10-16 16:22:37 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-10-16 16:22:37 -0700 |
| commit | c40ccaff017691b7d31e0597863bfb954aebd739 (patch) | |
| tree | 4f5f09c672393e130037826256ab182e2d2ae7f5 /core/src/fpdfapi/fpdf_cmaps | |
| parent | a725bc9a3525256976c112b2b5a429a119cf9b69 (diff) | |
| download | pdfium-c40ccaff017691b7d31e0597863bfb954aebd739.tar.xz | |
Merge to XFA: Fix a bunch of sign mismatch warnings.
Also remove some gotos and move code into an anonymous namespace.
And then do the partial revert to avoid size_t going negative.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1356373003 .
Review URL: https://codereview.chromium.org/1400723002 .
(cherry picked from commit d03ba8d1a5928e8f3f6bd7da063b53b0bc40abfd)
(cherry picked from commit a398ca611d1925182ff6a4e8b2b43c277c364dc0)
Review URL: https://codereview.chromium.org/1406373002 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_cmaps')
| -rw-r--r-- | core/src/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/src/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp b/core/src/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp index 8b0bff0257..252a4d6e4f 100644 --- a/core/src/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp @@ -8,6 +8,7 @@ #include "../../../include/fpdfapi/fpdf_module.h" #include "../fpdf_font/font_int.h" #include "cmap_int.h" + void FPDFAPI_FindEmbeddedCMap(const char* name, int charset, int coding, @@ -179,7 +180,8 @@ FX_DWORD FPDFAPI_CharCodeFromCID(const FXCMAP_CMap* pMap, FX_WORD cid) { } return 0; } -void FPDFAPI_LoadCID2UnicodeMap(int charset, + +void FPDFAPI_LoadCID2UnicodeMap(CIDSet charset, const FX_WORD*& pMap, FX_DWORD& count) { CPDF_FontGlobals* pFontGlobals = |