diff options
| author | The Qt Project <gerrit-noreply@qt-project.org> | 2019-11-25 14:49:13 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-11-25 14:49:13 +0000 |
| commit | bc1cae774ad8cc084a98cb37d363770efbde025c (patch) | |
| tree | aeb16a5fa9093632eba6143fe53ef1dad3e383a4 /src/3rdparty/libjpeg/src/jdmerge.c | |
| parent | 8d35ad8726f44c4e853b5a192203ffcbbd2476e1 (diff) | |
| parent | 26e876912435bdafbca2b425af43824d7ec5b876 (diff) | |
Merge "Merge remote-tracking branch 'origin/dev' into wip/cmake" into wip/cmake
Diffstat (limited to 'src/3rdparty/libjpeg/src/jdmerge.c')
| -rw-r--r-- | src/3rdparty/libjpeg/src/jdmerge.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/3rdparty/libjpeg/src/jdmerge.c b/src/3rdparty/libjpeg/src/jdmerge.c index b3fec04f71..dff5a35087 100644 --- a/src/3rdparty/libjpeg/src/jdmerge.c +++ b/src/3rdparty/libjpeg/src/jdmerge.c @@ -429,8 +429,6 @@ h2v2_merged_upsample(j_decompress_ptr cinfo, JSAMPIMAGE input_buf, #define PACK_TWO_PIXELS_LE(l, r) ((r << 16) | l) #define PACK_TWO_PIXELS_BE(l, r) ((l << 16) | r) -#define PACK_NEED_ALIGNMENT(ptr) (((size_t)(ptr)) & 3) - #define WRITE_TWO_PIXELS_LE(addr, pixels) { \ ((INT16 *)(addr))[0] = (INT16)(pixels); \ ((INT16 *)(addr))[1] = (INT16)((pixels) >> 16); \ |