diff options
| author | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2021-03-04 14:21:13 +0100 |
|---|---|---|
| committer | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2021-03-05 12:25:36 +0100 |
| commit | cb1eed0989095e6086394e4b1eec0db50461fbb7 (patch) | |
| tree | 7ccf346f270af007ba3bad9af1be7526a834f27d /src/3rdparty/libjpeg/src/jdcolor.c | |
| parent | 326c4ac4cb42b3ec62d69bdb16ce7a2100d18683 (diff) | |
Update bundled libjpeg-turbo to version 2.0.6
[ChangeLog][Third-Party Code] libjpeg-turbo was updated to version 2.0.6
Change-Id: I3e308d241853edf3c1d616955cda203220a258d8
Reviewed-by: Liang Qi <liang.qi@qt.io>
(cherry picked from commit ede0082f861146d441df641d93f815dbe63a9076)
Diffstat (limited to 'src/3rdparty/libjpeg/src/jdcolor.c')
| -rw-r--r-- | src/3rdparty/libjpeg/src/jdcolor.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/3rdparty/libjpeg/src/jdcolor.c b/src/3rdparty/libjpeg/src/jdcolor.c index dc0e3b6c0e..d3ae40c7da 100644 --- a/src/3rdparty/libjpeg/src/jdcolor.c +++ b/src/3rdparty/libjpeg/src/jdcolor.c @@ -571,11 +571,10 @@ ycck_cmyk_convert(j_decompress_ptr cinfo, JSAMPIMAGE input_buf, * RGB565 conversion */ -#define PACK_SHORT_565_LE(r, g, b) ((((r) << 8) & 0xF800) | \ - (((g) << 3) & 0x7E0) | ((b) >> 3)) -#define PACK_SHORT_565_BE(r, g, b) (((r) & 0xF8) | ((g) >> 5) | \ - (((g) << 11) & 0xE000) | \ - (((b) << 5) & 0x1F00)) +#define PACK_SHORT_565_LE(r, g, b) \ + ((((r) << 8) & 0xF800) | (((g) << 3) & 0x7E0) | ((b) >> 3)) +#define PACK_SHORT_565_BE(r, g, b) \ + (((r) & 0xF8) | ((g) >> 5) | (((g) << 11) & 0xE000) | (((b) << 5) & 0x1F00)) #define PACK_TWO_PIXELS_LE(l, r) ((r << 16) | l) #define PACK_TWO_PIXELS_BE(l, r) ((l << 16) | r) |