summaryrefslogtreecommitdiff
path: root/core/fpdfapi/render
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 /core/fpdfapi/render
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 'core/fpdfapi/render')
-rw-r--r--core/fpdfapi/render/cpdf_charposlist.cpp18
-rw-r--r--core/fpdfapi/render/cpdf_renderstatus.cpp15
2 files changed, 17 insertions, 16 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;
}
diff --git a/core/fpdfapi/render/cpdf_renderstatus.cpp b/core/fpdfapi/render/cpdf_renderstatus.cpp
index 197a244e0b..60b7a49858 100644
--- a/core/fpdfapi/render/cpdf_renderstatus.cpp
+++ b/core/fpdfapi/render/cpdf_renderstatus.cpp
@@ -1828,8 +1828,8 @@ bool CPDF_RenderStatus::ProcessType3Text(CPDF_TextObject* textobj,
continue;
m_pDevice->SetBitMask(&glyph.m_pGlyph->m_Bitmap,
- glyph.m_Origin.x + glyph.m_pGlyph->m_Left,
- glyph.m_Origin.y - glyph.m_pGlyph->m_Top,
+ glyph.m_OriginX + glyph.m_pGlyph->m_Left,
+ glyph.m_OriginY - glyph.m_pGlyph->m_Top,
fill_argb);
}
glyphs.clear();
@@ -1894,7 +1894,8 @@ bool CPDF_RenderStatus::ProcessType3Text(CPDF_TextObject* textobj,
origin_y - pBitmap->m_Top, fill_argb);
} else {
glyphs[iChar].m_pGlyph = pBitmap;
- glyphs[iChar].m_Origin = CFX_Point(origin_x, origin_y);
+ glyphs[iChar].m_OriginX = origin_x;
+ glyphs[iChar].m_OriginY = origin_y;
}
} else {
CFX_Matrix image_matrix = pType3Char->m_ImageMatrix;
@@ -1924,14 +1925,14 @@ bool CPDF_RenderStatus::ProcessType3Text(CPDF_TextObject* textobj,
if (!glyph.m_pGlyph)
continue;
- pdfium::base::CheckedNumeric<int> left = glyph.m_Origin.x;
+ pdfium::base::CheckedNumeric<int> left = glyph.m_OriginX;
left += glyph.m_pGlyph->m_Left;
left -= rect.left;
left *= sa;
if (!left.IsValid())
continue;
- pdfium::base::CheckedNumeric<int> top = glyph.m_Origin.y;
+ pdfium::base::CheckedNumeric<int> top = glyph.m_OriginY;
top -= glyph.m_pGlyph->m_Top;
top -= rect.top;
top *= sd;
@@ -1995,8 +1996,8 @@ void CPDF_RenderStatus::DrawTextPathWithPattern(const CPDF_TextObject* textobj,
charpos.m_AdjustMatrix[2], charpos.m_AdjustMatrix[3],
0, 0);
}
- matrix.Concat(CFX_Matrix(font_size, 0, 0, font_size, charpos.m_Origin.x,
- charpos.m_Origin.y));
+ matrix.Concat(CFX_Matrix(font_size, 0, 0, font_size, charpos.m_OriginX,
+ charpos.m_OriginY));
path.m_Path.Append(pPath, &matrix);
path.m_Matrix = *pTextMatrix;
path.m_bStroke = bStroke;