summaryrefslogtreecommitdiff
path: root/core/src/fxge/ge
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-06-09 11:29:12 -0700
committerTom Sepez <tsepez@chromium.org>2015-06-09 11:29:12 -0700
commitb116136da234afcad018bb44a3ccb64b9ad2a554 (patch)
treee81b2016bc21485d1d6bdc7c1a5c65f610f18b20 /core/src/fxge/ge
parentb69545dd059b8a5bb3695969e622462559c97276 (diff)
downloadpdfium-b116136da234afcad018bb44a3ccb64b9ad2a554.tar.xz
Merge to XFA: Remove more cruft from fx_system.h
New manual edits in the following to fix compilation: fx_bmp.h, fx_gif.h, fx_graphics.h Original Review URL: https://codereview.chromium.org/1169963003 R=thestig@chromium.org Review URL: https://codereview.chromium.org/1170103004
Diffstat (limited to 'core/src/fxge/ge')
-rw-r--r--core/src/fxge/ge/fx_ge_fontmap.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/src/fxge/ge/fx_ge_fontmap.cpp b/core/src/fxge/ge/fx_ge_fontmap.cpp
index ec4530b8ed..acae306d6f 100644
--- a/core/src/fxge/ge/fx_ge_fontmap.cpp
+++ b/core/src/fxge/ge/fx_ge_fontmap.cpp
@@ -4,6 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include <limits>
+
#include "../../../include/fxge/fx_ge.h"
#include "../../../include/fxge/fx_freetype.h"
#include "text_int.h"
@@ -1462,7 +1464,7 @@ void CFX_FolderFontInfo::ScanFile(CFX_ByteString& path)
if (GET_TT_LONG(buffer) == 0x74746366) {
FX_DWORD nFaces = GET_TT_LONG(buffer + 8);
- if (nFaces > FX_DWORD_MAX / 4) {
+ if (nFaces > std::numeric_limits<FX_DWORD>::max() / 4) {
FXSYS_fclose(pFile);
return;
}