summaryrefslogtreecommitdiff
path: root/xfa/fgas/layout
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2017-01-06 09:48:18 -0800
committerCommit bot <commit-bot@chromium.org>2017-01-06 09:48:18 -0800
commit6fd07ef0a817dca5acbcadea41b8f880376f339a (patch)
treee330419f0289e503478bffc7638e836e113a7fe7 /xfa/fgas/layout
parent8d94b6687f27e1238f352939434704f75b330c1d (diff)
downloadpdfium-6fd07ef0a817dca5acbcadea41b8f880376f339a.tar.xz
Remove CFX_MapPtrToPtr in xfa/fgas, part 2
Review-Url: https://codereview.chromium.org/2616623005
Diffstat (limited to 'xfa/fgas/layout')
-rw-r--r--xfa/fgas/layout/fgas_rtfbreak.cpp4
-rw-r--r--xfa/fgas/layout/fgas_textbreak.cpp8
2 files changed, 6 insertions, 6 deletions
diff --git a/xfa/fgas/layout/fgas_rtfbreak.cpp b/xfa/fgas/layout/fgas_rtfbreak.cpp
index cacb77fcf8..f7ba0e72b9 100644
--- a/xfa/fgas/layout/fgas_rtfbreak.cpp
+++ b/xfa/fgas/layout/fgas_rtfbreak.cpp
@@ -1319,7 +1319,7 @@ int32_t CFX_RTFBreak::GetDisplayPos(const FX_RTFTEXTOBJ* pText,
if (!bAdjusted && bVerticalChar && (dwProps & 0x00010000) != 0) {
CFX_Rect rtBBox;
rtBBox.Reset();
- if (pFont->GetCharBBox(wForm, rtBBox, bMBCSCode)) {
+ if (pFont->GetCharBBox(wForm, &rtBBox, bMBCSCode)) {
ptOffset.x = fFontSize * (850 - rtBBox.right()) / 1000.0f;
ptOffset.y = fFontSize * (1000 - rtBBox.height) / 2000.0f;
}
@@ -1436,7 +1436,7 @@ int32_t CFX_RTFBreak::GetCharRects(const FX_RTFTEXTOBJ* pText,
CFX_Rect bbox;
bbox.Set(0, 0, 0, 0);
if (bCharBBox)
- bCharBBox = pFont->GetBBox(bbox);
+ bCharBBox = pFont->GetBBox(&bbox);
FX_FLOAT fLeft = std::max(0.0f, bbox.left * fScale);
FX_FLOAT fHeight = FXSYS_fabs(bbox.height * fScale);
diff --git a/xfa/fgas/layout/fgas_textbreak.cpp b/xfa/fgas/layout/fgas_textbreak.cpp
index a9d35a3cd7..35984f5017 100644
--- a/xfa/fgas/layout/fgas_textbreak.cpp
+++ b/xfa/fgas/layout/fgas_textbreak.cpp
@@ -1468,7 +1468,7 @@ int32_t CFX_TxtBreak::GetDisplayPos(const FX_TXTRUN* pTxtRun,
if (chartype == FX_CHARTYPE_Combination) {
CFX_Rect rtBBox;
rtBBox.Reset();
- if (pFont->GetCharBBox(wForm, rtBBox, false)) {
+ if (pFont->GetCharBBox(wForm, &rtBBox, false)) {
pCharPos->m_OriginY =
fYBase + fFontSize -
fFontSize * (FX_FLOAT)rtBBox.height / (FX_FLOAT)iMaxHeight;
@@ -1479,7 +1479,7 @@ int32_t CFX_TxtBreak::GetDisplayPos(const FX_TXTRUN* pTxtRun,
FX_CHARTYPE_Combination) {
CFX_Rect rtBox;
rtBox.Reset();
- if (pFont->GetCharBBox(wLast, rtBox, false)) {
+ if (pFont->GetCharBBox(wLast, &rtBox, false)) {
pCharPos->m_OriginY -= fFontSize * rtBox.height / iMaxHeight;
}
}
@@ -1494,7 +1494,7 @@ int32_t CFX_TxtBreak::GetDisplayPos(const FX_TXTRUN* pTxtRun,
if (!bAdjusted && bVerticalChar && (dwProps & 0x00010000) != 0) {
CFX_Rect rtBBox;
rtBBox.Reset();
- if (pFont->GetCharBBox(wForm, rtBBox, false)) {
+ if (pFont->GetCharBBox(wForm, &rtBBox, false)) {
ptOffset.x = fFontSize * (850 - rtBBox.right()) / iMaxHeight;
ptOffset.y = fFontSize * (iAscent - rtBBox.top - 150) / iMaxHeight;
}
@@ -1610,7 +1610,7 @@ int32_t CFX_TxtBreak::GetCharRects(const FX_TXTRUN* pTxtRun,
CFX_Rect bbox;
bbox.Set(0, 0, 0, 0);
if (bCharBBox)
- bCharBBox = pFont->GetBBox(bbox);
+ bCharBBox = pFont->GetBBox(&bbox);
FX_FLOAT fLeft = std::max(0.0f, bbox.left * fScale);
FX_FLOAT fHeight = FXSYS_fabs(bbox.height * fScale);