diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-10-16 14:35:18 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-10-16 14:35:18 -0700 |
| commit | 3d7d1d2f29e5fb099367a40822684d31f684fd62 (patch) | |
| tree | 7f3c0e754e7a582ab7986393dba0f95d1f7bf036 /core/src/fpdfapi | |
| parent | 887795881ba3babdc1d2c310e3b68deb5ad9b53b (diff) | |
| download | pdfium-3d7d1d2f29e5fb099367a40822684d31f684fd62.tar.xz | |
Declare PDF_GetStandardFontName() in the header.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1410043003 .
Diffstat (limited to 'core/src/fpdfapi')
| -rw-r--r-- | core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp | 8 | ||||
| -rw-r--r-- | core/src/fpdfapi/fpdf_font/fpdf_font.cpp | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp b/core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp index a3281999fe..dc79de687d 100644 --- a/core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp +++ b/core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp @@ -1105,15 +1105,15 @@ CPDF_Dictionary* CPDF_Document::CreateNewPage(int iPage) { } return pDict; } -int _PDF_GetStandardFontName(CFX_ByteString& name); + CPDF_Font* CPDF_Document::AddStandardFont(const FX_CHAR* font, CPDF_FontEncoding* pEncoding) { CFX_ByteString name(font, -1); - if (_PDF_GetStandardFontName(name) < 0) { - return NULL; - } + if (PDF_GetStandardFontName(&name) < 0) + return nullptr; return GetPageData()->GetStandardFont(name, pEncoding); } + void CPDF_Document::DeletePage(int iPage) { CPDF_Dictionary* pRoot = GetRoot(); if (pRoot == NULL) { diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp index ed5809c8a8..7a57889a35 100644 --- a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp +++ b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp @@ -370,13 +370,13 @@ int CPDF_Font::GetCharTypeWidth(FX_DWORD charcode) { } return m_Font.GetGlyphWidth(glyph_index); } -int _PDF_GetStandardFontName(CFX_ByteString& name); + CPDF_Font* CPDF_Font::GetStockFont(CPDF_Document* pDoc, const CFX_ByteStringC& name) { CFX_ByteString fontname(name); - int font_id = _PDF_GetStandardFontName(fontname); + int font_id = PDF_GetStandardFontName(&fontname); if (font_id < 0) { - return NULL; + return nullptr; } CPDF_FontGlobals* pFontGlobals = CPDF_ModuleMgr::Get()->GetPageModule()->GetFontGlobals(); @@ -1001,7 +1001,7 @@ CPDF_Type1Font::CPDF_Type1Font() : CPDF_SimpleFont(PDFFONT_TYPE1) { m_Base14Font = -1; } FX_BOOL CPDF_Type1Font::_Load() { - m_Base14Font = _PDF_GetStandardFontName(m_BaseFont); + m_Base14Font = PDF_GetStandardFontName(&m_BaseFont); if (m_Base14Font >= 0) { CPDF_Dictionary* pFontDesc = m_pFontDict->GetDict(FX_BSTRC("FontDescriptor")); |