summaryrefslogtreecommitdiff
path: root/core/fpdfapi
diff options
context:
space:
mode:
Diffstat (limited to 'core/fpdfapi')
-rw-r--r--core/fpdfapi/edit/cpdf_pagecontentgenerator_unittest.cpp26
-rw-r--r--core/fpdfapi/page/cpdf_streamcontentparser.cpp8
-rw-r--r--core/fpdfapi/parser/fpdf_parser_utility.cpp6
3 files changed, 21 insertions, 19 deletions
diff --git a/core/fpdfapi/edit/cpdf_pagecontentgenerator_unittest.cpp b/core/fpdfapi/edit/cpdf_pagecontentgenerator_unittest.cpp
index 1f4d821dae..c7a98c9493 100644
--- a/core/fpdfapi/edit/cpdf_pagecontentgenerator_unittest.cpp
+++ b/core/fpdfapi/edit/cpdf_pagecontentgenerator_unittest.cpp
@@ -186,15 +186,18 @@ TEST_F(CPDF_PageContentGeneratorTest, ProcessStandardText) {
std::ostringstream buf;
TestProcessText(&generator, &buf, pTextObj.get());
CFX_ByteString textString(buf);
- FX_STRSIZE firstResourceAt = textString.Find('/') + 1;
- FX_STRSIZE secondResourceAt = textString.ReverseFind('/') + 1;
- EXPECT_NE(FX_STRNPOS, firstResourceAt);
- EXPECT_NE(FX_STRNPOS, secondResourceAt);
- CFX_ByteString firstString = textString.Left(firstResourceAt);
+ auto firstResourceAt = textString.Find('/');
+ ASSERT_TRUE(firstResourceAt.has_value());
+ firstResourceAt = firstResourceAt.value() + 1;
+ auto secondResourceAt = textString.ReverseFind('/');
+ ASSERT_TRUE(secondResourceAt.has_value());
+ secondResourceAt = secondResourceAt.value() + 1;
+ CFX_ByteString firstString = textString.Left(firstResourceAt.value());
CFX_ByteString midString =
- textString.Mid(firstResourceAt, secondResourceAt - firstResourceAt);
+ textString.Mid(firstResourceAt.value(),
+ secondResourceAt.value() - firstResourceAt.value());
CFX_ByteString lastString =
- textString.Right(textString.GetLength() - secondResourceAt);
+ textString.Right(textString.GetLength() - secondResourceAt.value());
// q and Q must be outside the BT .. ET operations
CFX_ByteString compareString1 =
"q 0.501961 0.701961 0.34902 rg 1 0.901961 0 RG /";
@@ -255,11 +258,12 @@ TEST_F(CPDF_PageContentGeneratorTest, ProcessText) {
}
CFX_ByteString textString(buf);
- FX_STRSIZE firstResourceAt = textString.Find('/') + 1;
- EXPECT_NE(FX_STRNPOS, firstResourceAt);
- CFX_ByteString firstString = textString.Left(firstResourceAt);
+ auto firstResourceAt = textString.Find('/');
+ ASSERT_TRUE(firstResourceAt.has_value());
+ firstResourceAt = firstResourceAt.value() + 1;
+ CFX_ByteString firstString = textString.Left(firstResourceAt.value());
CFX_ByteString lastString =
- textString.Right(textString.GetLength() - firstResourceAt);
+ textString.Right(textString.GetLength() - firstResourceAt.value());
// q and Q must be outside the BT .. ET operations
CFX_ByteString compareString1 = "q BT 1 0 0 1 0 0 Tm /";
CFX_ByteString compareString2 =
diff --git a/core/fpdfapi/page/cpdf_streamcontentparser.cpp b/core/fpdfapi/page/cpdf_streamcontentparser.cpp
index 42ed3fc3b4..6f09f92c60 100644
--- a/core/fpdfapi/page/cpdf_streamcontentparser.cpp
+++ b/core/fpdfapi/page/cpdf_streamcontentparser.cpp
@@ -315,13 +315,13 @@ void CPDF_StreamContentParser::AddNameParam(const CFX_ByteStringC& bsName) {
m_pDocument->GetByteStringPool(), PDF_NameDecode(bsName));
} else {
param.m_Type = ContentParam::NAME;
- if (bsName.Find('#') == FX_STRNPOS) {
- memcpy(param.m_Name.m_Buffer, bsName.raw_str(), bsName.GetLength());
- param.m_Name.m_Len = bsName.GetLength();
- } else {
+ if (bsName.Contains('#')) {
CFX_ByteString str = PDF_NameDecode(bsName);
memcpy(param.m_Name.m_Buffer, str.c_str(), str.GetLength());
param.m_Name.m_Len = str.GetLength();
+ } else {
+ memcpy(param.m_Name.m_Buffer, bsName.raw_str(), bsName.GetLength());
+ param.m_Name.m_Len = bsName.GetLength();
}
}
}
diff --git a/core/fpdfapi/parser/fpdf_parser_utility.cpp b/core/fpdfapi/parser/fpdf_parser_utility.cpp
index 7cea16569f..a36d640da3 100644
--- a/core/fpdfapi/parser/fpdf_parser_utility.cpp
+++ b/core/fpdfapi/parser/fpdf_parser_utility.cpp
@@ -89,7 +89,7 @@ int32_t GetDirectInteger(CPDF_Dictionary* pDict, const CFX_ByteString& key) {
}
CFX_ByteString PDF_NameDecode(const CFX_ByteStringC& bstr) {
- if (bstr.Find('#') == FX_STRNPOS)
+ if (!bstr.Contains('#'))
return CFX_ByteString(bstr);
int size = bstr.GetLength();
@@ -110,9 +110,7 @@ CFX_ByteString PDF_NameDecode(const CFX_ByteStringC& bstr) {
}
CFX_ByteString PDF_NameDecode(const CFX_ByteString& orig) {
- if (orig.Find('#') == FX_STRNPOS)
- return orig;
- return PDF_NameDecode(orig.AsStringC());
+ return orig.Contains("#") ? PDF_NameDecode(orig.AsStringC()) : orig;
}
CFX_ByteString PDF_NameEncode(const CFX_ByteString& orig) {