diff options
| author | Ryan Harrison <rharrison@chromium.org> | 2017-09-27 10:53:11 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-27 16:11:38 +0000 |
| commit | 875e98c581952478f3a3ccef9b2f2e3ed06c5346 (patch) | |
| tree | 8e0d7e032056bf4c73d6da43c0f3ce4eadb74dfd /core/fpdfapi/font/cpdf_cmap.cpp | |
| parent | cc3a3ee3ebcc1baabdfa7ffca5876dbbfa3980c1 (diff) | |
| download | pdfium-875e98c581952478f3a3ccef9b2f2e3ed06c5346.tar.xz | |
Remove FX_STRSIZE and replace with size_t
BUG=pdfium:828
Change-Id: I5c40237433ebabaeabdb43aec9cdf783e41dfe16
Reviewed-on: https://pdfium-review.googlesource.com/13230
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Diffstat (limited to 'core/fpdfapi/font/cpdf_cmap.cpp')
| -rw-r--r-- | core/fpdfapi/font/cpdf_cmap.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/fpdfapi/font/cpdf_cmap.cpp b/core/fpdfapi/font/cpdf_cmap.cpp index 54f7b34ca0..1eabfff866 100644 --- a/core/fpdfapi/font/cpdf_cmap.cpp +++ b/core/fpdfapi/font/cpdf_cmap.cpp @@ -182,13 +182,13 @@ const PredefinedCMap g_PredefinedCMaps[] = { }; int CheckFourByteCodeRange(uint8_t* codes, - FX_STRSIZE size, + size_t size, const std::vector<CPDF_CMap::CodeRange>& ranges) { for (size_t i = ranges.size(); i > 0; i--) { size_t seg = i - 1; if (ranges[seg].m_CharSize < size) continue; - FX_STRSIZE iChar = 0; + size_t iChar = 0; while (iChar < size) { if (codes[iChar] < ranges[seg].m_Lower[iChar] || codes[iChar] > ranges[seg].m_Upper[iChar]) { @@ -214,13 +214,13 @@ size_t GetFourByteCharSizeImpl( codes[0] = codes[1] = 0x00; codes[2] = static_cast<uint8_t>(charcode >> 8 & 0xFF); codes[3] = static_cast<uint8_t>(charcode); - for (FX_STRSIZE offset = 0; offset < 4; offset++) { - FX_STRSIZE size = 4 - offset; + for (size_t offset = 0; offset < 4; offset++) { + size_t size = 4 - offset; for (size_t j = 0; j < ranges.size(); j++) { size_t iSeg = (ranges.size() - 1) - j; if (ranges[iSeg].m_CharSize < size) continue; - FX_STRSIZE iChar = 0; + size_t iChar = 0; while (iChar < size) { if (codes[offset + iChar] < ranges[iSeg].m_Lower[iChar] || codes[offset + iChar] > ranges[iSeg].m_Upper[iChar]) { |