diff options
| author | Nicolas Pena <npm@chromium.org> | 2017-07-27 15:52:36 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-07-27 21:18:34 +0000 |
| commit | d4362fe972442cfd2d6aa9b32134240c0ddaa6c5 (patch) | |
| tree | 5975131a491697ccbb3f78b37e27cffe3e315ce5 /core | |
| parent | 33805cc811c722a0c5cd439cff419de252cd39c9 (diff) | |
| download | pdfium-d4362fe972442cfd2d6aa9b32134240c0ddaa6c5.tar.xz | |
Define SIZEOF_VOIDP and other cleanup in tiffconf
This CL uses sizeof to calculate sizes in tiffconf. It adds SIZEOF_VOIDP
to allow LibTIFF to take codepaths reducing OOMs. Finally, it gets rid
of _FX_WIN32_MOBILE_ since it's never defined.
Bug: chromium:718494
Change-Id: I9e6fb2812487ccd7d08e56fd1954c716ddccd07b
Reviewed-on: https://pdfium-review.googlesource.com/9410
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Nicolás Peña <npm@chromium.org>
Diffstat (limited to 'core')
| -rw-r--r-- | core/fxcrt/cfx_datetime.cpp | 6 | ||||
| -rw-r--r-- | core/fxcrt/cfx_seekablestreamproxy.cpp | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/core/fxcrt/cfx_datetime.cpp b/core/fxcrt/cfx_datetime.cpp index b59aabcc94..a6d4636820 100644 --- a/core/fxcrt/cfx_datetime.cpp +++ b/core/fxcrt/cfx_datetime.cpp @@ -92,8 +92,7 @@ bool FX_IsLeapYear(int32_t iYear) { void CFX_DateTime::Now() { FXUT_SYSTEMTIME utLocal; -#if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN32_MOBILE_ || \ - _FX_OS_ == _FX_WIN64_ +#if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_ ::GetLocalTime((LPSYSTEMTIME)&utLocal); #elif _FX_OS_ != _FX_EMBEDDED_ timeval curTime; @@ -109,8 +108,7 @@ void CFX_DateTime::Now() { utLocal.wMinute = st.tm_min; utLocal.wSecond = st.tm_sec; utLocal.wMillisecond = curTime.tv_usec / 1000; -#endif // _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN32_MOBILE_ || - // _FX_OS_ == _FX_WIN64_ +#endif // _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_ year_ = utLocal.wYear; month_ = static_cast<uint8_t>(utLocal.wMonth); diff --git a/core/fxcrt/cfx_seekablestreamproxy.cpp b/core/fxcrt/cfx_seekablestreamproxy.cpp index 8cf855217a..9b44f95d13 100644 --- a/core/fxcrt/cfx_seekablestreamproxy.cpp +++ b/core/fxcrt/cfx_seekablestreamproxy.cpp @@ -6,8 +6,7 @@ #include "core/fxcrt/cfx_seekablestreamproxy.h" -#if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN32_MOBILE_ || \ - _FX_OS_ == _FX_WIN64_ +#if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_ #include <io.h> #endif |