summaryrefslogtreecommitdiff
path: root/core/fpdfapi
diff options
context:
space:
mode:
Diffstat (limited to 'core/fpdfapi')
-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
-rw-r--r--core/fpdfapi/page/cpdf_image.cpp4
-rw-r--r--core/fpdfapi/page/cpdf_streamparser.cpp12
-rw-r--r--core/fpdfapi/parser/cpdf_simple_parser.cpp4
-rw-r--r--core/fpdfapi/parser/fpdf_parser_decode_unittest.cpp4
-rw-r--r--core/fpdfapi/parser/fpdf_parser_utility.cpp2
8 files changed, 23 insertions, 24 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';
diff --git a/core/fpdfapi/page/cpdf_image.cpp b/core/fpdfapi/page/cpdf_image.cpp
index 4c08336e3a..d722c22fb5 100644
--- a/core/fpdfapi/page/cpdf_image.cpp
+++ b/core/fpdfapi/page/cpdf_image.cpp
@@ -171,7 +171,7 @@ void CPDF_Image::SetImage(const RetainPtr<CFX_DIBitmap>& pBitmap) {
pDict->SetNewFor<CPDF_Number>("Height", BitmapHeight);
const int32_t bpp = pBitmap->GetBPP();
- FX_STRSIZE dest_pitch = 0;
+ size_t dest_pitch = 0;
bool bCopyWithoutAlpha = true;
if (bpp == 1) {
int32_t reset_a = 0;
@@ -285,7 +285,7 @@ void CPDF_Image::SetImage(const RetainPtr<CFX_DIBitmap>& pBitmap) {
int32_t src_pitch = pBitmap->GetPitch();
uint8_t* dest_buf = FX_Alloc2D(uint8_t, dest_pitch, BitmapHeight);
// Safe as checked alloc returned.
- FX_STRSIZE dest_size = dest_pitch * BitmapHeight;
+ size_t dest_size = dest_pitch * BitmapHeight;
uint8_t* pDest = dest_buf;
if (bCopyWithoutAlpha) {
for (int32_t i = 0; i < BitmapHeight; i++) {
diff --git a/core/fpdfapi/page/cpdf_streamparser.cpp b/core/fpdfapi/page/cpdf_streamparser.cpp
index e9320cbc6f..aa1d227de0 100644
--- a/core/fpdfapi/page/cpdf_streamparser.cpp
+++ b/core/fpdfapi/page/cpdf_streamparser.cpp
@@ -34,7 +34,7 @@ namespace {
const uint32_t kMaxNestedParsingLevel = 512;
const uint32_t kMaxWordBuffer = 256;
-const FX_STRSIZE kMaxStringLength = 32767;
+const size_t kMaxStringLength = 32767;
uint32_t DecodeAllScanlines(std::unique_ptr<CCodec_ScanlineDecoder> pDecoder,
uint8_t** dest_buf,
@@ -478,9 +478,9 @@ ByteString CPDF_StreamParser::ReadString() {
case 0:
if (ch == ')') {
if (parlevel == 0) {
- return ByteString(buf.str().c_str(),
- std::min(static_cast<FX_STRSIZE>(buf.tellp()),
- kMaxStringLength));
+ return ByteString(
+ buf.str().c_str(),
+ std::min(static_cast<size_t>(buf.tellp()), kMaxStringLength));
}
parlevel--;
buf << ')';
@@ -557,7 +557,7 @@ ByteString CPDF_StreamParser::ReadString() {
return ByteString(
buf.str().c_str(),
- std::min(static_cast<FX_STRSIZE>(buf.tellp()), kMaxStringLength));
+ std::min(static_cast<size_t>(buf.tellp()), kMaxStringLength));
}
ByteString CPDF_StreamParser::ReadHexString() {
@@ -590,7 +590,7 @@ ByteString CPDF_StreamParser::ReadHexString() {
return ByteString(
buf.str().c_str(),
- std::min(static_cast<FX_STRSIZE>(buf.tellp()), kMaxStringLength));
+ std::min(static_cast<size_t>(buf.tellp()), kMaxStringLength));
}
bool CPDF_StreamParser::PositionIsInBounds() const {
diff --git a/core/fpdfapi/parser/cpdf_simple_parser.cpp b/core/fpdfapi/parser/cpdf_simple_parser.cpp
index d800796d58..5358b183d8 100644
--- a/core/fpdfapi/parser/cpdf_simple_parser.cpp
+++ b/core/fpdfapi/parser/cpdf_simple_parser.cpp
@@ -103,7 +103,7 @@ ByteStringView CPDF_SimpleParser::GetWord() {
m_dwCurPos++;
}
return ByteStringView(pStart,
- (FX_STRSIZE)(m_dwCurPos - (pStart - m_pData)));
+ static_cast<size_t>(m_dwCurPos - (pStart - m_pData)));
}
if (dwSize == 1 && pStart[0] == '(') {
int level = 1;
@@ -131,7 +131,7 @@ ByteStringView CPDF_SimpleParser::GetWord() {
m_dwCurPos++;
}
return ByteStringView(pStart,
- (FX_STRSIZE)(m_dwCurPos - (pStart - m_pData)));
+ static_cast<size_t>(m_dwCurPos - (pStart - m_pData)));
}
return ByteStringView(pStart, dwSize);
}
diff --git a/core/fpdfapi/parser/fpdf_parser_decode_unittest.cpp b/core/fpdfapi/parser/fpdf_parser_decode_unittest.cpp
index ae30959013..9ab4958825 100644
--- a/core/fpdfapi/parser/fpdf_parser_decode_unittest.cpp
+++ b/core/fpdfapi/parser/fpdf_parser_decode_unittest.cpp
@@ -81,7 +81,7 @@ TEST(fpdf_parser_decode, EncodeText) {
struct EncodeTestData {
const wchar_t* input;
const char* expected_output;
- FX_STRSIZE expected_length;
+ size_t expected_length;
} test_data[] = {
// Empty src string.
{L"", "", 0},
@@ -103,7 +103,7 @@ TEST(fpdf_parser_decode, EncodeText) {
ASSERT_EQ(test_case.expected_length, output.GetLength()) << "for case "
<< i;
const char* str_ptr = output.c_str();
- for (FX_STRSIZE j = 0; j < test_case.expected_length; ++j) {
+ for (size_t j = 0; j < test_case.expected_length; ++j) {
EXPECT_EQ(test_case.expected_output[j], str_ptr[j]) << "for case " << i
<< " char " << j;
}
diff --git a/core/fpdfapi/parser/fpdf_parser_utility.cpp b/core/fpdfapi/parser/fpdf_parser_utility.cpp
index e57f834cee..2185e88ff6 100644
--- a/core/fpdfapi/parser/fpdf_parser_utility.cpp
+++ b/core/fpdfapi/parser/fpdf_parser_utility.cpp
@@ -106,7 +106,7 @@ ByteString PDF_NameDecode(const ByteStringView& bstr) {
*pDest++ = bstr[i];
}
}
- result.ReleaseBuffer((FX_STRSIZE)(pDest - pDestStart));
+ result.ReleaseBuffer(static_cast<size_t>(pDest - pDestStart));
return result;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 01:14:24 +0000