diff options
author | Dan Sinclair <dsinclair@chromium.org> | 2017-02-14 10:08:55 -0500 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-02-14 15:11:27 +0000 |
commit | d8b01ca3bd9c21e76443004907ea1bc02fb57b6e (patch) | |
tree | 59f80451f15fef9e4e1641e1aa3eb1b592c4010c /core/fpdfapi/render/cpdf_charposlist.cpp | |
parent | ceb3ab55ca5ad1fae590f50a09f04b7ed47656b1 (diff) | |
download | pdfium-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 'core/fpdfapi/render/cpdf_charposlist.cpp')
-rw-r--r-- | core/fpdfapi/render/cpdf_charposlist.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/core/fpdfapi/render/cpdf_charposlist.cpp b/core/fpdfapi/render/cpdf_charposlist.cpp index d7f566d5e7..64176fb054 100644 --- a/core/fpdfapi/render/cpdf_charposlist.cpp +++ b/core/fpdfapi/render/cpdf_charposlist.cpp @@ -54,20 +54,20 @@ void CPDF_CharPosList::Load(const std::vector<uint32_t>& charCodes, } else { charpos.m_FontCharWidth = 0; } - charpos.m_Origin = CFX_PointF(iChar ? charPos[iChar - 1] : 0, 0); + charpos.m_OriginX = iChar ? charPos[iChar - 1] : 0; + charpos.m_OriginY = 0; charpos.m_bGlyphAdjust = false; if (!pCIDFont) { continue; } uint16_t CID = pCIDFont->CIDFromCharCode(CharCode); if (bVertWriting) { - charpos.m_Origin = CFX_PointF(0, charpos.m_Origin.x); - - short vx; - short vy; + charpos.m_OriginY = charpos.m_OriginX; + charpos.m_OriginX = 0; + short vx, vy; pCIDFont->GetVertOrigin(CID, vx, vy); - charpos.m_Origin.x -= FontSize * vx / 1000; - charpos.m_Origin.y -= FontSize * vy / 1000; + charpos.m_OriginX -= FontSize * vx / 1000; + charpos.m_OriginY -= FontSize * vy / 1000; } const uint8_t* pTransform = pCIDFont->GetCIDTransform(CID); if (pTransform && !bVert) { @@ -75,9 +75,9 @@ void CPDF_CharPosList::Load(const std::vector<uint32_t>& charCodes, charpos.m_AdjustMatrix[2] = pCIDFont->CIDTransformToFloat(pTransform[2]); charpos.m_AdjustMatrix[1] = pCIDFont->CIDTransformToFloat(pTransform[1]); charpos.m_AdjustMatrix[3] = pCIDFont->CIDTransformToFloat(pTransform[3]); - charpos.m_Origin.x += + charpos.m_OriginX += pCIDFont->CIDTransformToFloat(pTransform[4]) * FontSize; - charpos.m_Origin.y += + charpos.m_OriginY += pCIDFont->CIDTransformToFloat(pTransform[5]) * FontSize; charpos.m_bGlyphAdjust = true; } |