summaryrefslogtreecommitdiff
path: root/xfa/fxgraphics/cfx_graphics.cpp
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-02-14 10:08:55 -0500
committerChromium commit bot <commit-bot@chromium.org>2017-02-14 15:11:27 +0000
commitd8b01ca3bd9c21e76443004907ea1bc02fb57b6e (patch)
tree59f80451f15fef9e4e1641e1aa3eb1b592c4010c /xfa/fxgraphics/cfx_graphics.cpp
parentceb3ab55ca5ad1fae590f50a09f04b7ed47656b1 (diff)
downloadpdfium-d8b01ca3bd9c21e76443004907ea1bc02fb57b6e.tar.xz
Revert "Convert Origins to points"
This reverts commit da83d3a5cc09c4056310b3cf299dbbccd5c70d11. Reason for revert: Reverting chain to see if fixes Chrome roll. Original change's description: > Convert Origins to points > > This CL converts various OriginX, OriginY pairs into CFX_PointF objects. > > Change-Id: I9141f7fc713c710b2014d4fdcdec7dc93501f844 > Reviewed-on: https://pdfium-review.googlesource.com/2575 > Commit-Queue: dsinclair <dsinclair@chromium.org> > Reviewed-by: Nicolás Peña <npm@chromium.org> > TBR=tsepez@chromium.org,dsinclair@chromium.org,npm@chromium.org,pdfium-reviews@googlegroups.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG= Change-Id: I949fb4ec712e2587e7d0ef0191c34db198b61dcc Reviewed-on: https://pdfium-review.googlesource.com/2696 Reviewed-by: dsinclair <dsinclair@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxgraphics/cfx_graphics.cpp')
-rw-r--r--xfa/fxgraphics/cfx_graphics.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/xfa/fxgraphics/cfx_graphics.cpp b/xfa/fxgraphics/cfx_graphics.cpp
index 2b8bd17aad..f1abfb7cb5 100644
--- a/xfa/fxgraphics/cfx_graphics.cpp
+++ b/xfa/fxgraphics/cfx_graphics.cpp
@@ -1484,7 +1484,8 @@ FWL_Error CFX_Graphics::CalcTextInfo(const CFX_WideString& text,
FX_FLOAT left = (FX_FLOAT)(0);
FX_FLOAT top = (FX_FLOAT)(0);
charCodes[0] = text.GetAt(0);
- charPos[0].m_Origin = CFX_PointF(penX + left, penY + top);
+ charPos[0].m_OriginX = penX + left;
+ charPos[0].m_OriginY = penY + top;
charPos[0].m_GlyphIndex = encoding->GlyphFromCharCode(charCodes[0]);
charPos[0].m_FontCharWidth = FXSYS_round(
m_info.font->GetGlyphWidth(charPos[0].m_GlyphIndex) * m_info.fontHScale);
@@ -1497,7 +1498,8 @@ FWL_Error CFX_Graphics::CalcTextInfo(const CFX_WideString& text,
m_info.fontSpacing;
for (int32_t i = 1; i < length; i++) {
charCodes[i] = text.GetAt(i);
- charPos[i].m_Origin = CFX_PointF(penX + left, penY + top);
+ charPos[i].m_OriginX = penX + left;
+ charPos[i].m_OriginY = penY + top;
charPos[i].m_GlyphIndex = encoding->GlyphFromCharCode(charCodes[i]);
charPos[i].m_FontCharWidth =
FXSYS_round(m_info.font->GetGlyphWidth(charPos[i].m_GlyphIndex) *