diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-30 10:25:20 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-30 10:25:20 +0100 |
| commit | 8ca5b34c1aacc4b7a8f20bf9aadd04f1eeafd3f6 (patch) | |
| tree | d27d03bf55f92c7a362e5bed53c578fcb1b5cf03 /src/3rdparty/libtiff/libtiff/tif_luv.c | |
| parent | ff6cf6764ded8c028f693da70b876a00fbff2a5f (diff) | |
| parent | 9fe1f2e918d39031852805f1add23125c061d3c3 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3
Conflicts:
.qmake.conf
Change-Id: Ib4b1a3a3604fdce35f61dadc26770ca9b749e008
Diffstat (limited to 'src/3rdparty/libtiff/libtiff/tif_luv.c')
| -rw-r--r-- | src/3rdparty/libtiff/libtiff/tif_luv.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/3rdparty/libtiff/libtiff/tif_luv.c b/src/3rdparty/libtiff/libtiff/tif_luv.c index aa35ea0..46d2dff 100644 --- a/src/3rdparty/libtiff/libtiff/tif_luv.c +++ b/src/3rdparty/libtiff/libtiff/tif_luv.c @@ -1264,16 +1264,10 @@ LogL16GuessDataFmt(TIFFDirectory *td) return (SGILOGDATAFMT_UNKNOWN); } - -#define TIFF_SIZE_T_MAX ((size_t) ~ ((size_t)0)) -#define TIFF_TMSIZE_T_MAX (tmsize_t)(TIFF_SIZE_T_MAX >> 1) - static tmsize_t multiply_ms(tmsize_t m1, tmsize_t m2) { - if( m1 == 0 || m2 > TIFF_TMSIZE_T_MAX / m1 ) - return 0; - return m1 * m2; + return _TIFFMultiplySSize(NULL, m1, m2, NULL); } static int |