summaryrefslogtreecommitdiff
path: root/core/fpdfdoc/doc_vt.cpp
diff options
context:
space:
mode:
authorthestig <thestig@chromium.org>2016-04-29 18:14:37 -0700
committerCommit bot <commit-bot@chromium.org>2016-04-29 18:14:37 -0700
commit8c32dfa88b9deedb5add135301a0f6b1128882ed (patch)
treeea2b004c4286b3b16113189b16a274dafe9c8163 /core/fpdfdoc/doc_vt.cpp
parente801d4e064690fbe1815d25d220cfbca79976a4f (diff)
downloadpdfium-8c32dfa88b9deedb5add135301a0f6b1128882ed.tar.xz
Subtract instead of adding the negation.
Do more cleanup in modified files. Review-Url: https://codereview.chromium.org/1938613003
Diffstat (limited to 'core/fpdfdoc/doc_vt.cpp')
-rw-r--r--core/fpdfdoc/doc_vt.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/core/fpdfdoc/doc_vt.cpp b/core/fpdfdoc/doc_vt.cpp
index b728c68af6..88a4636bbc 100644
--- a/core/fpdfdoc/doc_vt.cpp
+++ b/core/fpdfdoc/doc_vt.cpp
@@ -372,7 +372,7 @@ CPVT_FloatRect CTypeset::CharArray() {
pLine->m_LineInfo.fLineWidth = x - pLine->m_LineInfo.fLineX;
pLine->m_LineInfo.fLineAscent = fLineAscent;
pLine->m_LineInfo.fLineDescent = fLineDescent;
- y += (-fLineDescent);
+ y -= fLineDescent;
}
return m_rcRet = CPVT_FloatRect(0, 0, x, y);
}
@@ -640,7 +640,7 @@ void CTypeset::SplitLines(FX_BOOL bTypeset, FX_FLOAT fFontSize) {
m_pSection->AddLine(line);
}
fMaxY += (fLineAscent + m_pVT->GetLineLeading(m_pSection->m_SecInfo));
- fMaxY += (-fLineDescent);
+ fMaxY -= fLineDescent;
fMaxX = std::max(fLineWidth, fMaxX);
nLineHead = i;
fLineWidth = 0.0f;
@@ -666,7 +666,7 @@ void CTypeset::SplitLines(FX_BOOL bTypeset, FX_FLOAT fFontSize) {
m_pSection->AddLine(line);
}
fMaxY += (fLineAscent + m_pVT->GetLineLeading(m_pSection->m_SecInfo));
- fMaxY += (-fLineDescent);
+ fMaxY -= fLineDescent;
fMaxX = std::max(fLineWidth, fMaxX);
}
} else {
@@ -688,8 +688,8 @@ void CTypeset::SplitLines(FX_BOOL bTypeset, FX_FLOAT fFontSize) {
line.fLineDescent = fLineDescent;
m_pSection->AddLine(line);
}
- fMaxY += (m_pVT->GetLineLeading(m_pSection->m_SecInfo) + fLineAscent +
- (-fLineDescent));
+ fMaxY += m_pVT->GetLineLeading(m_pSection->m_SecInfo) + fLineAscent -
+ fLineDescent;
}
m_rcRet = CPVT_FloatRect(0, 0, fMaxX, fMaxY);
}
@@ -761,7 +761,7 @@ void CTypeset::OutputLines() {
fPosX += m_pVT->GetWordWidth(*pWord);
}
}
- fPosY += (-pLine->m_LineInfo.fLineDescent);
+ fPosY -= pLine->m_LineInfo.fLineDescent;
}
}
}