diff options
author | Lei Zhang <thestig@chromium.org> | 2018-05-29 20:52:50 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-05-29 20:52:50 +0000 |
commit | a210ee1eba66e53de374ccae56a89d0b1976509d (patch) | |
tree | 866efd97b7b9c12eaa30fdf36191361b00cd2ec8 /core/fxge/cfx_renderdevice.cpp | |
parent | 6af5369477ec05554ef9e73ae6762860095f09e9 (diff) | |
download | pdfium-a210ee1eba66e53de374ccae56a89d0b1976509d.tar.xz |
Pass a CFX_Matrix by reference in font code.chromium/3445
The callers always pass in a valid CFX_Matrix, so eliminate the
possibility of a nullptr.
Change-Id: Id7d8b731ed60d5f66517b50c56efeca343e897c4
Reviewed-on: https://pdfium-review.googlesource.com/33152
Reviewed-by: Nicolás Peña Moreno <npm@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fxge/cfx_renderdevice.cpp')
-rw-r--r-- | core/fxge/cfx_renderdevice.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/fxge/cfx_renderdevice.cpp b/core/fxge/cfx_renderdevice.cpp index aed1bff94e..c63f2f5ec3 100644 --- a/core/fxge/cfx_renderdevice.cpp +++ b/core/fxge/cfx_renderdevice.cpp @@ -936,11 +936,11 @@ bool CFX_RenderDevice::DrawNormalText(int nChars, charpos.m_AdjustMatrix[2], charpos.m_AdjustMatrix[3], 0, 0); new_matrix.Concat(deviceCtm); glyph.m_pGlyph = pFont->LoadGlyphBitmap( - charpos.m_GlyphIndex, charpos.m_bFontStyle, &new_matrix, + charpos.m_GlyphIndex, charpos.m_bFontStyle, new_matrix, charpos.m_FontCharWidth, anti_alias, nativetext_flags); } else { glyph.m_pGlyph = pFont->LoadGlyphBitmap( - charpos.m_GlyphIndex, charpos.m_bFontStyle, &deviceCtm, + charpos.m_GlyphIndex, charpos.m_bFontStyle, deviceCtm, charpos.m_FontCharWidth, anti_alias, nativetext_flags); } } |