diff options
| author | tsepez <tsepez@chromium.org> | 2016-08-30 10:32:36 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-08-30 10:32:36 -0700 |
| commit | fbda17d61de1e02799f5d77dceb23df3688b764e (patch) | |
| tree | ad15940f6c9bf31ca390a711636981ecd0e52ff6 /core/fpdfapi/fpdf_page/cpdf_textobject.cpp | |
| parent | f7252a074ed013e2ad3cc11e08eba90502262ce0 (diff) | |
| download | pdfium-fbda17d61de1e02799f5d77dceb23df3688b764e.tar.xz | |
Make CPDF_TextState have a CPDF_TextStateData rather than inheriting one.
Review-Url: https://codereview.chromium.org/2287313004
Diffstat (limited to 'core/fpdfapi/fpdf_page/cpdf_textobject.cpp')
| -rw-r--r-- | core/fpdfapi/fpdf_page/cpdf_textobject.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/fpdfapi/fpdf_page/cpdf_textobject.cpp b/core/fpdfapi/fpdf_page/cpdf_textobject.cpp index af6ae06741..f9e6bdaa76 100644 --- a/core/fpdfapi/fpdf_page/cpdf_textobject.cpp +++ b/core/fpdfapi/fpdf_page/cpdf_textobject.cpp @@ -334,9 +334,9 @@ void CPDF_TextObject::CalcPositionData(FX_FLOAT* pTextAdvanceX, } curpos += charwidth; if (charcode == ' ' && (!pCIDFont || pCIDFont->GetCharSize(32) == 1)) { - curpos += m_TextState.GetObject()->m_WordSpace; + curpos += m_TextState.GetWordSpace(); } - curpos += m_TextState.GetObject()->m_CharSpace; + curpos += m_TextState.GetCharSpace(); } if (bVertWriting) { if (pTextAdvanceX) { @@ -364,7 +364,7 @@ void CPDF_TextObject::CalcPositionData(FX_FLOAT* pTextAdvanceX, m_Bottom = min_y; m_Top = max_y; matrix.TransformRect(m_Left, m_Right, m_Top, m_Bottom); - if (TextRenderingModeIsStrokeMode(m_TextState.GetObject()->m_TextMode)) { + if (TextRenderingModeIsStrokeMode(m_TextState.GetTextMode())) { FX_FLOAT half_width = m_GraphState.GetObject()->m_LineWidth / 2; m_Left -= half_width; m_Right += half_width; |