summaryrefslogtreecommitdiff
path: root/core/fpdfapi/fpdf_page
diff options
context:
space:
mode:
Diffstat (limited to 'core/fpdfapi/fpdf_page')
-rw-r--r--core/fpdfapi/fpdf_page/fpdf_page_doc.cpp7
-rw-r--r--core/fpdfapi/fpdf_page/fpdf_page_parser.cpp8
-rw-r--r--core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp6
-rw-r--r--core/fpdfapi/fpdf_page/pageint.h4
4 files changed, 13 insertions, 12 deletions
diff --git a/core/fpdfapi/fpdf_page/fpdf_page_doc.cpp b/core/fpdfapi/fpdf_page/fpdf_page_doc.cpp
index 8287ea562d..f872906674 100644
--- a/core/fpdfapi/fpdf_page/fpdf_page_doc.cpp
+++ b/core/fpdfapi/fpdf_page/fpdf_page_doc.cpp
@@ -159,7 +159,7 @@ CPDF_Font* CPDF_DocPageData::GetFont(CPDF_Dictionary* pFontDict,
return fontData->AddRef();
}
-CPDF_Font* CPDF_DocPageData::GetStandardFont(const CFX_ByteStringC& fontName,
+CPDF_Font* CPDF_DocPageData::GetStandardFont(const CFX_ByteString& fontName,
CPDF_FontEncoding* pEncoding) {
if (fontName.IsEmpty())
return nullptr;
@@ -425,7 +425,8 @@ CPDF_IccProfile* CPDF_DocPageData::GetIccProfile(
stream.LoadAllData(pIccProfileStream, FALSE);
uint8_t digest[20];
CRYPT_SHA1Generate(stream.GetData(), stream.GetSize(), digest);
- auto hash_it = m_HashProfileMap.find(CFX_ByteStringC(digest, 20));
+ CFX_ByteString bsDigest(digest, 20);
+ auto hash_it = m_HashProfileMap.find(bsDigest);
if (hash_it != m_HashProfileMap.end()) {
auto it_copied_stream = m_IccProfileMap.find(hash_it->second);
return it_copied_stream->second->AddRef();
@@ -434,7 +435,7 @@ CPDF_IccProfile* CPDF_DocPageData::GetIccProfile(
new CPDF_IccProfile(stream.GetData(), stream.GetSize());
CPDF_CountedIccProfile* ipData = new CPDF_CountedIccProfile(pProfile);
m_IccProfileMap[pIccProfileStream] = ipData;
- m_HashProfileMap[CFX_ByteStringC(digest, 20)] = pIccProfileStream;
+ m_HashProfileMap[bsDigest] = pIccProfileStream;
return ipData->AddRef();
}
diff --git a/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp b/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp
index da1355724f..8c16d8c41f 100644
--- a/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp
+++ b/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp
@@ -1143,7 +1143,7 @@ void CPDF_StreamContentParser::Handle_SetFont() {
}
CPDF_Object* CPDF_StreamContentParser::FindResourceObj(
- const CFX_ByteStringC& type,
+ const CFX_ByteString& type,
const CFX_ByteString& name) {
if (!m_pResources) {
return NULL;
@@ -1683,9 +1683,9 @@ void PDF_ReplaceAbbr(CPDF_Object* pObj) {
}
for (const auto& op : replacements) {
if (op.is_replace_key)
- pDict->ReplaceKey(op.key, op.replacement);
+ pDict->ReplaceKey(op.key, CFX_ByteString(op.replacement));
else
- pDict->SetAtName(op.key, op.replacement);
+ pDict->SetAtName(op.key, CFX_ByteString(op.replacement));
}
break;
}
@@ -1699,7 +1699,7 @@ void PDF_ReplaceAbbr(CPDF_Object* pObj) {
PDF_InlineValueAbbr, FX_ArraySize(PDF_InlineValueAbbr),
name.AsStringC());
if (!fullname.IsEmpty()) {
- pArray->SetAt(i, new CPDF_Name(fullname));
+ pArray->SetAt(i, new CPDF_Name(CFX_ByteString(fullname)));
}
} else {
PDF_ReplaceAbbr(pElement);
diff --git a/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp b/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp
index 58ecb6c4d6..5bac23e137 100644
--- a/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp
+++ b/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp
@@ -502,7 +502,7 @@ CFX_ByteString CPDF_StreamParser::ReadString() {
if (buf.GetLength() > kMaxStringLength) {
return CFX_ByteString(buf.GetBuffer(), kMaxStringLength);
}
- return buf.AsStringC();
+ return buf.MakeString();
}
parlevel--;
buf.AppendChar(')');
@@ -581,7 +581,7 @@ CFX_ByteString CPDF_StreamParser::ReadString() {
if (buf.GetLength() > kMaxStringLength) {
return CFX_ByteString(buf.GetBuffer(), kMaxStringLength);
}
- return buf.AsStringC();
+ return buf.MakeString();
}
CFX_ByteString CPDF_StreamParser::ReadHexString() {
@@ -615,7 +615,7 @@ CFX_ByteString CPDF_StreamParser::ReadHexString() {
if (buf.GetLength() > kMaxStringLength)
return CFX_ByteString(buf.GetBuffer(), kMaxStringLength);
- return buf.AsStringC();
+ return buf.MakeString();
}
bool CPDF_StreamParser::PositionIsInBounds() const {
diff --git a/core/fpdfapi/fpdf_page/pageint.h b/core/fpdfapi/fpdf_page/pageint.h
index e904234e9f..6534186dc8 100644
--- a/core/fpdfapi/fpdf_page/pageint.h
+++ b/core/fpdfapi/fpdf_page/pageint.h
@@ -155,7 +155,7 @@ class CPDF_StreamContentParser {
CPDF_Font* FindFont(const CFX_ByteString& name);
CPDF_ColorSpace* FindColorSpace(const CFX_ByteString& name);
CPDF_Pattern* FindPattern(const CFX_ByteString& name, bool bShading);
- CPDF_Object* FindResourceObj(const CFX_ByteStringC& type,
+ CPDF_Object* FindResourceObj(const CFX_ByteString& type,
const CFX_ByteString& name);
protected:
@@ -318,7 +318,7 @@ class CPDF_DocPageData {
void Clear(FX_BOOL bRelease = FALSE);
CPDF_Font* GetFont(CPDF_Dictionary* pFontDict, FX_BOOL findOnly);
- CPDF_Font* GetStandardFont(const CFX_ByteStringC& fontName,
+ CPDF_Font* GetStandardFont(const CFX_ByteString& fontName,
CPDF_FontEncoding* pEncoding);
void ReleaseFont(CPDF_Dictionary* pFontDict);
CPDF_ColorSpace* GetColorSpace(CPDF_Object* pCSObj,