summaryrefslogtreecommitdiff
path: root/core/fpdfapi/font
diff options
context:
space:
mode:
Diffstat (limited to 'core/fpdfapi/font')
-rw-r--r--core/fpdfapi/font/cpdf_cmap.cpp10
-rw-r--r--core/fpdfapi/font/cpdf_cmap.h2
-rw-r--r--core/fpdfapi/font/cpdf_cmapparser.cpp9
3 files changed, 10 insertions, 11 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]) {
diff --git a/core/fpdfapi/font/cpdf_cmap.h b/core/fpdfapi/font/cpdf_cmap.h
index 6e90c3936b..493d30097a 100644
--- a/core/fpdfapi/font/cpdf_cmap.h
+++ b/core/fpdfapi/font/cpdf_cmap.h
@@ -36,7 +36,7 @@ class CPDF_CMap : public Retainable {
};
struct CodeRange {
- FX_STRSIZE m_CharSize;
+ size_t m_CharSize;
uint8_t m_Lower[4];
uint8_t m_Upper[4];
};
diff --git a/core/fpdfapi/font/cpdf_cmapparser.cpp b/core/fpdfapi/font/cpdf_cmapparser.cpp
index f7d4dc1c33..a5d79776ba 100644
--- a/core/fpdfapi/font/cpdf_cmapparser.cpp
+++ b/core/fpdfapi/font/cpdf_cmapparser.cpp
@@ -141,8 +141,7 @@ uint32_t CPDF_CMapParser::CMap_GetCode(const ByteStringView& word) {
return 0;
pdfium::base::CheckedNumeric<uint32_t> num = 0;
if (word[0] == '<') {
- for (FX_STRSIZE i = 1; i < word.GetLength() && std::isxdigit(word[i]);
- ++i) {
+ for (size_t i = 1; i < word.GetLength() && std::isxdigit(word[i]); ++i) {
num = num * 16 + FXSYS_HexCharToInt(word[i]);
if (!num.IsValid())
return 0;
@@ -150,7 +149,7 @@ uint32_t CPDF_CMapParser::CMap_GetCode(const ByteStringView& word) {
return num.ValueOrDie();
}
- for (FX_STRSIZE i = 0; i < word.GetLength() && std::isdigit(word[i]); ++i) {
+ for (size_t i = 0; i < word.GetLength() && std::isdigit(word[i]); ++i) {
num = num * 10 + FXSYS_DecimalCharToInt(static_cast<wchar_t>(word[i]));
if (!num.IsValid())
return 0;
@@ -165,7 +164,7 @@ bool CPDF_CMapParser::CMap_GetCodeRange(CPDF_CMap::CodeRange& range,
if (first.GetLength() == 0 || first[0] != '<')
return false;
- FX_STRSIZE i;
+ size_t i;
for (i = 1; i < first.GetLength(); ++i) {
if (first[i] == '>') {
break;
@@ -182,7 +181,7 @@ bool CPDF_CMapParser::CMap_GetCodeRange(CPDF_CMap::CodeRange& range,
FXSYS_HexCharToInt(digit1) * 16 + FXSYS_HexCharToInt(digit2);
}
- FX_STRSIZE size = second.GetLength();
+ size_t size = second.GetLength();
for (i = 0; i < range.m_CharSize; ++i) {
uint8_t digit1 = (i * 2 + 1 < size) ? second[i * 2 + 1] : '0';
uint8_t digit2 = (i * 2 + 2 < size) ? second[i * 2 + 2] : '0';