summaryrefslogtreecommitdiff
path: root/fpdfsdk
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2018-08-07 23:24:09 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-08-07 23:24:09 +0000
commit69e19e2c0b6753a69470840226456858cdef5773 (patch)
treed7e2890b20c6a9fe683bcd5903b8cd957d1ef2f2 /fpdfsdk
parente4d2cffd31a1f705f04d11223444455aa35923a6 (diff)
downloadpdfium-69e19e2c0b6753a69470840226456858cdef5773.tar.xz
Make CPDF_Font::GetFontBBox() return the bounding box.
Instead of using an out parameter. Fix nits in the only caller as well. Change-Id: I04eb92705b2fbda001191c36da972eee499acbc7 Reviewed-on: https://pdfium-review.googlesource.com/39490 Reviewed-by: Nicolás Peña Moreno <npm@chromium.org> Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'fpdfsdk')
-rw-r--r--fpdfsdk/pwl/cpwl_edit.cpp5
-rw-r--r--fpdfsdk/pwl/cpwl_edit.h3
2 files changed, 3 insertions, 5 deletions
diff --git a/fpdfsdk/pwl/cpwl_edit.cpp b/fpdfsdk/pwl/cpwl_edit.cpp
index 41f2517a0a..5e28a4aa02 100644
--- a/fpdfsdk/pwl/cpwl_edit.cpp
+++ b/fpdfsdk/pwl/cpwl_edit.cpp
@@ -369,14 +369,13 @@ bool CPWL_Edit::IsTextFull() const {
return m_pEdit->IsTextFull();
}
-float CPWL_Edit::GetCharArrayAutoFontSize(CPDF_Font* pFont,
+float CPWL_Edit::GetCharArrayAutoFontSize(const CPDF_Font* pFont,
const CFX_FloatRect& rcPlate,
int32_t nCharArray) {
if (!pFont || pFont->IsStandardFont())
return 0.0f;
- FX_RECT rcBBox;
- pFont->GetFontBBox(rcBBox);
+ const FX_RECT& rcBBox = pFont->GetFontBBox();
CFX_FloatRect rcCell = rcPlate;
float xdiv = rcCell.Width() / nCharArray * 1000.0f / rcBBox.Width();
diff --git a/fpdfsdk/pwl/cpwl_edit.h b/fpdfsdk/pwl/cpwl_edit.h
index 3f9cd433f5..ce1d682dad 100644
--- a/fpdfsdk/pwl/cpwl_edit.h
+++ b/fpdfsdk/pwl/cpwl_edit.h
@@ -84,7 +84,7 @@ class CPWL_Edit : public CPWL_EditCtrl {
bool IsTextFull() const;
- static float GetCharArrayAutoFontSize(CPDF_Font* pFont,
+ static float GetCharArrayAutoFontSize(const CPDF_Font* pFont,
const CFX_FloatRect& rcPlate,
int32_t nCharArray);
@@ -114,7 +114,6 @@ class CPWL_Edit : public CPWL_EditCtrl {
bool IsVScrollBarVisible() const;
void SetParamByFlag();
- float GetCharArrayAutoFontSize(int32_t nCharArray);
CFX_PointF GetWordRightBottomPoint(const CPVT_WordPlace& wpWord);
CPVT_WordRange CombineWordRange(const CPVT_WordRange& wr1,