summaryrefslogtreecommitdiff
path: root/core/fxge/cfx_font.cpp
diff options
context:
space:
mode:
authorNicolas Pena <npm@chromium.org>2018-05-31 00:32:14 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-05-31 00:32:14 +0000
commit8f7ee98e2c622c21f452cd9fd5956fe85bcb2b7c (patch)
tree2aad509d1499dfd5b2837ab2102e917618f78231 /core/fxge/cfx_font.cpp
parente434833e5cefb00482223049d624301b10450717 (diff)
downloadpdfium-8f7ee98e2c622c21f452cd9fd5956fe85bcb2b7c.tar.xz
Fix font regression in AdjustMMParams
Commit 2334660 changed the |dest_width| in CFX_Font::AdjustMMParams to unsigned, but this means that dest_width - min_width becomes unsigned, which is wrong because the subtraction could be negative. This CL fixes this bug. Bug: chromium:845697 Change-Id: I88fb2f3ee3837d80ff5fa70a08309d9e0fec50e0 Reviewed-on: https://pdfium-review.googlesource.com/33150 Commit-Queue: Nicolás Peña Moreno <npm@chromium.org> Reviewed-by: Tom Sepez <tsepez@chromium.org> Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fxge/cfx_font.cpp')
-rw-r--r--core/fxge/cfx_font.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/fxge/cfx_font.cpp b/core/fxge/cfx_font.cpp
index 4634b87ac7..d04fc0dac0 100644
--- a/core/fxge/cfx_font.cpp
+++ b/core/fxge/cfx_font.cpp
@@ -501,8 +501,9 @@ void CFX_Font::ClearFaceCache() {
}
void CFX_Font::AdjustMMParams(int glyph_index,
- uint32_t dest_width,
+ int dest_width,
int weight) const {
+ ASSERT(dest_width >= 0);
FXFT_MM_Var pMasters = nullptr;
FXFT_Get_MM_Var(m_Face, &pMasters);
if (!pMasters)