diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-10-23 12:37:42 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-10-23 12:37:42 -0700 |
| commit | 1b04bcc6af13669920700322052fc4ab4fad47a2 (patch) | |
| tree | 14a70efd6df9acf3e5e0a611415e95955f1b5d8f /core/src/fpdfapi/fpdf_edit | |
| parent | 2a4e4ce8efaf8b6466962eef292a9876c17976ad (diff) | |
| download | pdfium-1b04bcc6af13669920700322052fc4ab4fad47a2.tar.xz | |
XFA: Manually apply changes to fpdf_text.h and fx_font.h from master
Driven off of https://codereview.chromium.org/1398383002/
Then make the other files as similar as possible. Note that this
required changes to xfa/ code, and required adding some Set() methods.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1411833003 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_edit')
| -rw-r--r-- | core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp b/core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp index 72df84ed95..0f6d973a3a 100644 --- a/core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp +++ b/core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp @@ -978,7 +978,7 @@ CPDF_Font* CPDF_Document::AddFont(CFX_Font* pFont, int charset, FX_BOOL bVert) { pFontDesc->SetAtInteger("Flags", flags); pFontDesc->SetAtInteger( "ItalicAngle", - pFont->m_pSubstFont ? pFont->m_pSubstFont->m_ItalicAngle : 0); + pFont->GetSubstFont() ? pFont->GetSubstFont()->m_ItalicAngle : 0); pFontDesc->SetAtInteger("Ascent", pFont->GetAscent()); pFontDesc->SetAtInteger("Descent", pFont->GetDescent()); FX_RECT bbox; @@ -990,8 +990,8 @@ CPDF_Font* CPDF_Document::AddFont(CFX_Font* pFont, int charset, FX_BOOL bVert) { pBBox->AddInteger(bbox.top); pFontDesc->SetAt("FontBBox", pBBox); int32_t nStemV = 0; - if (pFont->m_pSubstFont) { - nStemV = pFont->m_pSubstFont->m_Weight / 5; + if (pFont->GetSubstFont()) { + nStemV = pFont->GetSubstFont()->m_Weight / 5; } else { static const FX_CHAR stem_chars[] = {'i', 'I', '!', '1'}; const size_t count = sizeof(stem_chars) / sizeof(stem_chars[0]); |