diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-10-16 16:29:59 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-10-16 16:29:59 -0700 |
| commit | 0c6e6824979c9a3e7006a925f7b307db04342146 (patch) | |
| tree | 12be3af6450fbb37cc5c12247eea888c9cf09d11 /core/src/fpdfapi | |
| parent | c40ccaff017691b7d31e0597863bfb954aebd739 (diff) | |
| download | pdfium-0c6e6824979c9a3e7006a925f7b307db04342146.tar.xz | |
Merge to XFA: Don't bother passing -1 as the length to the CFX_ByteString ctor.
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1406363002 .
(cherry picked from commit 316e482630d5f5d9084edd9725f98a0d89a5bbdf)
Review URL: https://codereview.chromium.org/1406303006 .
Diffstat (limited to 'core/src/fpdfapi')
| -rw-r--r-- | core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp | 2 | ||||
| -rw-r--r-- | core/src/fpdfapi/fpdf_font/fpdf_font_charset.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp b/core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp index 95eac538bb..72df84ed95 100644 --- a/core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp +++ b/core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp @@ -1109,7 +1109,7 @@ CPDF_Dictionary* CPDF_Document::CreateNewPage(int iPage) { CPDF_Font* CPDF_Document::AddStandardFont(const FX_CHAR* font, CPDF_FontEncoding* pEncoding) { - CFX_ByteString name(font, -1); + CFX_ByteString name(font); if (PDF_GetStandardFontName(&name) < 0) return nullptr; return GetPageData()->GetStandardFont(name, pEncoding); diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font_charset.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font_charset.cpp index 308dac9782..92d1719efe 100644 --- a/core/src/fpdfapi/fpdf_font/fpdf_font_charset.cpp +++ b/core/src/fpdfapi/fpdf_font/fpdf_font_charset.cpp @@ -1778,5 +1778,5 @@ FX_WCHAR PDF_UnicodeFromAdobeName(const FX_CHAR* name) { CFX_ByteString PDF_AdobeNameFromUnicode(FX_WCHAR unicode) { char glyph_name[64]; FXFT_adobe_name_from_unicode(glyph_name, unicode); - return CFX_ByteString(glyph_name, -1); + return CFX_ByteString(glyph_name); } |