diff options
| author | Nicolas Pena <npm@chromium.org> | 2018-01-30 21:42:41 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-01-30 21:42:41 +0000 |
| commit | 2334660053e044ca79a1831a6c73f69891f039e0 (patch) | |
| tree | 1114eeb0e18288235dff4ff694a8c7129541a7f2 /core/fpdfdoc | |
| parent | 90d9386825b872a0b668eac5dff3e268fa7ad16c (diff) | |
| download | pdfium-2334660053e044ca79a1831a6c73f69891f039e0.tar.xz | |
Use unsigned for char widthchromium/3335
Bug: 806612
Change-Id: I22bd9046dd37a1b596762c46a6b29a323d6e9fa1
Reviewed-on: https://pdfium-review.googlesource.com/24410
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Nicolás Peña Moreno <npm@chromium.org>
Diffstat (limited to 'core/fpdfdoc')
| -rw-r--r-- | core/fpdfdoc/cpdf_variabletext.cpp | 10 | ||||
| -rw-r--r-- | core/fpdfdoc/cpdf_variabletext.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/core/fpdfdoc/cpdf_variabletext.cpp b/core/fpdfdoc/cpdf_variabletext.cpp index 74ea239cc6..38c631d820 100644 --- a/core/fpdfdoc/cpdf_variabletext.cpp +++ b/core/fpdfdoc/cpdf_variabletext.cpp @@ -38,8 +38,8 @@ CPDF_VariableText::Provider::Provider(IPVT_FontMap* pFontMap) CPDF_VariableText::Provider::~Provider() {} -int32_t CPDF_VariableText::Provider::GetCharWidth(int32_t nFontIndex, - uint16_t word) { +uint32_t CPDF_VariableText::Provider::GetCharWidth(int32_t nFontIndex, + uint16_t word) { if (CPDF_Font* pPDFFont = m_pFontMap->GetPDFFont(nFontIndex)) { uint32_t charcode = pPDFFont->CharCodeFromUnicode(word); if (charcode != CPDF_Font::kInvalidCharCode) @@ -917,9 +917,9 @@ CPVT_FloatRect CPDF_VariableText::RearrangeSections( return rcRet; } -int32_t CPDF_VariableText::GetCharWidth(int32_t nFontIndex, - uint16_t Word, - uint16_t SubWord) { +uint32_t CPDF_VariableText::GetCharWidth(int32_t nFontIndex, + uint16_t Word, + uint16_t SubWord) { if (!m_pVTProvider) return 0; uint16_t word = SubWord ? SubWord : Word; diff --git a/core/fpdfdoc/cpdf_variabletext.h b/core/fpdfdoc/cpdf_variabletext.h index a939dcb0e1..786ad10f3e 100644 --- a/core/fpdfdoc/cpdf_variabletext.h +++ b/core/fpdfdoc/cpdf_variabletext.h @@ -53,7 +53,7 @@ class CPDF_VariableText { explicit Provider(IPVT_FontMap* pFontMap); virtual ~Provider(); - virtual int32_t GetCharWidth(int32_t nFontIndex, uint16_t word); + virtual uint32_t GetCharWidth(int32_t nFontIndex, uint16_t word); virtual int32_t GetTypeAscent(int32_t nFontIndex); virtual int32_t GetTypeDescent(int32_t nFontIndex); virtual int32_t GetWordFontIndex(uint16_t word, @@ -165,7 +165,7 @@ class CPDF_VariableText { float GetLineIndent(); private: - int32_t GetCharWidth(int32_t nFontIndex, uint16_t Word, uint16_t SubWord); + uint32_t GetCharWidth(int32_t nFontIndex, uint16_t Word, uint16_t SubWord); int32_t GetTypeAscent(int32_t nFontIndex); int32_t GetTypeDescent(int32_t nFontIndex); int32_t GetWordFontIndex(uint16_t word, int32_t charset, int32_t nFontIndex); |