summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2016-04-14 18:50:47 -0700
committerCommit bot <commit-bot@chromium.org>2016-04-14 18:50:47 -0700
commit85fc26f3411584586707798c1ebf39a194f60cf0 (patch)
treedde930f78ec3a434395919ddde8231d05801b832 /core
parentb1a59597db4b8ce3ffc34dbfda2fb1ecb80c2397 (diff)
downloadpdfium-85fc26f3411584586707798c1ebf39a194f60cf0.tar.xz
Explicity use CFX_ByteStrings in a couple of places
These are exposed by making the ByteString from ByteStringC ctor explicit, but we can clean them up independently. Review URL: https://codereview.chromium.org/1884363002
Diffstat (limited to 'core')
-rw-r--r--core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp4
-rw-r--r--core/fpdfapi/fpdf_font/fpdf_font.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp b/core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp
index c2e556c3a7..0bd07a1819 100644
--- a/core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp
+++ b/core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp
@@ -1986,7 +1986,7 @@ void CPDF_Creator::InitID(FX_BOOL bDefault) {
} else {
std::vector<uint8_t> buffer =
PDF_GenerateFileID((uint32_t)(uintptr_t) this, m_dwLastObjNum);
- CFX_ByteStringC bsBuffer(buffer.data(), buffer.size());
+ CFX_ByteString bsBuffer(buffer.data(), buffer.size());
m_pIDArray->Add(new CPDF_String(bsBuffer, TRUE), m_pDocument);
}
}
@@ -2001,7 +2001,7 @@ void CPDF_Creator::InitID(FX_BOOL bDefault) {
}
std::vector<uint8_t> buffer =
PDF_GenerateFileID((uint32_t)(uintptr_t) this, m_dwLastObjNum);
- CFX_ByteStringC bsBuffer(buffer.data(), buffer.size());
+ CFX_ByteString bsBuffer(buffer.data(), buffer.size());
m_pIDArray->Add(new CPDF_String(bsBuffer, TRUE), m_pDocument);
return;
}
diff --git a/core/fpdfapi/fpdf_font/fpdf_font.cpp b/core/fpdfapi/fpdf_font/fpdf_font.cpp
index c405072502..0ef49ce6c2 100644
--- a/core/fpdfapi/fpdf_font/fpdf_font.cpp
+++ b/core/fpdfapi/fpdf_font/fpdf_font.cpp
@@ -239,10 +239,10 @@ void CPDF_ToUnicodeMap::Load(CPDF_Stream* pStream) {
if (highcode == (uint32_t)-1) {
break;
}
- CFX_ByteString start = parser.GetWord();
+ CFX_ByteString start(parser.GetWord());
if (start == "[") {
for (uint32_t code = lowcode; code <= highcode; code++) {
- CFX_ByteString dest = parser.GetWord();
+ CFX_ByteString dest(parser.GetWord());
CFX_WideString destcode = StringToWideString(dest.AsStringC());
int len = destcode.GetLength();
if (len == 0) {