diff options
| author | Nico Weber <thakis@chromium.org> | 2015-12-03 18:57:27 -0500 |
|---|---|---|
| committer | Nico Weber <thakis@chromium.org> | 2015-12-03 18:57:27 -0500 |
| commit | c88dfeefd13145cdb9492154c05ccbc33b80ceef (patch) | |
| tree | 51cc26a1f220d65bb46547e15819ed660197c381 | |
| parent | be3ad4b56b38221b40e2a1f0ee56e371738a752a (diff) | |
| download | pdfium-c88dfeefd13145cdb9492154c05ccbc33b80ceef.tar.xz | |
Revert downstream patch to libopenjpeg2000
This reverts https://codereview.chromium.org/1405553003/
clang-cl now understands __emul.
BUG=543182
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1491933006 .
| -rw-r--r-- | third_party/libopenjpeg20/opj_intmath.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/third_party/libopenjpeg20/opj_intmath.h b/third_party/libopenjpeg20/opj_intmath.h index c52e7e0155..3f7934c470 100644 --- a/third_party/libopenjpeg20/opj_intmath.h +++ b/third_party/libopenjpeg20/opj_intmath.h @@ -192,8 +192,7 @@ Multiply two fixed-precision rational numbers. @return Returns a * b */ static INLINE OPJ_INT32 opj_int_fix_mul(OPJ_INT32 a, OPJ_INT32 b) { -// TODO(thakis): Remove __clang__ once chromium's clang has clang r250301 -#if defined(_MSC_VER) && (_MSC_VER >= 1400) && !defined(__INTEL_COMPILER) && defined(_M_IX86) && !defined(__clang__) +#if defined(_MSC_VER) && (_MSC_VER >= 1400) && !defined(__INTEL_COMPILER) && defined(_M_IX86) OPJ_INT64 temp = __emul(a, b); #else OPJ_INT64 temp = (OPJ_INT64) a * (OPJ_INT64) b ; @@ -205,8 +204,7 @@ static INLINE OPJ_INT32 opj_int_fix_mul(OPJ_INT32 a, OPJ_INT32 b) { } static INLINE OPJ_INT32 opj_int_fix_mul_t1(OPJ_INT32 a, OPJ_INT32 b) { -// TODO(thakis): Remove __clang__ once chromium's clang has clang r250301 -#if defined(_MSC_VER) && (_MSC_VER >= 1400) && !defined(__INTEL_COMPILER) && defined(_M_IX86) && !defined(__clang__) +#if defined(_MSC_VER) && (_MSC_VER >= 1400) && !defined(__INTEL_COMPILER) && defined(_M_IX86) OPJ_INT64 temp = __emul(a, b); #else OPJ_INT64 temp = (OPJ_INT64) a * (OPJ_INT64) b ; |