diff options
| author | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-11-07 09:28:59 +0200 |
|---|---|---|
| committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-11-07 09:28:59 +0200 |
| commit | 598e1db3a082d2bb473571c6ae3359e0c687c63b (patch) | |
| tree | e88d80d6cf6aaeaf6afb8f37d4bc4404405e2bd2 /src/3rdparty/libtiff/libtiff/tif_thunder.c | |
| parent | 00187760aaa137b68e74186ee0cbfb3e1da72281 (diff) | |
| parent | 6d4cf4b392c53e3edb8573d89b5ca4b6257bb99f (diff) | |
Merge 5.12 into 5.12.6
Change-Id: Icfbebe5c86f6c8958f1fc60f98a034d9e338e076
Diffstat (limited to 'src/3rdparty/libtiff/libtiff/tif_thunder.c')
| -rw-r--r-- | src/3rdparty/libtiff/libtiff/tif_thunder.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/3rdparty/libtiff/libtiff/tif_thunder.c b/src/3rdparty/libtiff/libtiff/tif_thunder.c index 2388dbb..db6383a 100644 --- a/src/3rdparty/libtiff/libtiff/tif_thunder.c +++ b/src/3rdparty/libtiff/libtiff/tif_thunder.c @@ -122,17 +122,17 @@ ThunderDecode(TIFF* tif, uint8* op, tmsize_t maxpixels) break; case THUNDER_2BITDELTAS: /* 2-bit deltas */ if ((delta = ((n >> 4) & 3)) != DELTA2_SKIP) - SETPIXEL(op, lastpixel + twobitdeltas[delta]); + SETPIXEL(op, (unsigned)((int)lastpixel + twobitdeltas[delta])); if ((delta = ((n >> 2) & 3)) != DELTA2_SKIP) - SETPIXEL(op, lastpixel + twobitdeltas[delta]); + SETPIXEL(op, (unsigned)((int)lastpixel + twobitdeltas[delta])); if ((delta = (n & 3)) != DELTA2_SKIP) - SETPIXEL(op, lastpixel + twobitdeltas[delta]); + SETPIXEL(op, (unsigned)((int)lastpixel + twobitdeltas[delta])); break; case THUNDER_3BITDELTAS: /* 3-bit deltas */ if ((delta = ((n >> 3) & 7)) != DELTA3_SKIP) - SETPIXEL(op, lastpixel + threebitdeltas[delta]); + SETPIXEL(op, (unsigned)((int)lastpixel + threebitdeltas[delta])); if ((delta = (n & 7)) != DELTA3_SKIP) - SETPIXEL(op, lastpixel + threebitdeltas[delta]); + SETPIXEL(op, (unsigned)((int)lastpixel + threebitdeltas[delta])); break; case THUNDER_RAW: /* raw data */ SETPIXEL(op, n); |