diff options
| author | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2023-02-03 09:34:03 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-02-13 18:23:35 +0000 |
| commit | 7dddb9df64d33a6a7e88ff63b4e1d93c3a9d5ab9 (patch) | |
| tree | b4bf0c73f9ba4eb76d477e2c8aa7d218ce7e7803 /src/3rdparty/libjpeg/src/jdmerge.c | |
| parent | 598022cdc80f813000d6ccba16e33f876230b25e (diff) | |
| download | qtbase-7dddb9df64d33a6a7e88ff63b4e1d93c3a9d5ab9.tar.gz | |
Update bundled libjpeg-turbo to version 2.1.5
[ChangeLog][Third-Party Code] libjpeg-turbo was updated to version 2.1.5
Task-number: QTBUG-110336
Change-Id: Ifc08ad7f1a3c5b3e66b11e5a51d523b091288790
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 94efcf9be4c5e46dff463806e278fcee90ff4d53)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/3rdparty/libjpeg/src/jdmerge.c')
| -rw-r--r-- | src/3rdparty/libjpeg/src/jdmerge.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/3rdparty/libjpeg/src/jdmerge.c b/src/3rdparty/libjpeg/src/jdmerge.c index 3a456d6581..38b002729c 100644 --- a/src/3rdparty/libjpeg/src/jdmerge.c +++ b/src/3rdparty/libjpeg/src/jdmerge.c @@ -42,7 +42,6 @@ #include "jpeglib.h" #include "jdmerge.h" #include "jsimd.h" -#include "jconfigint.h" #ifdef UPSAMPLE_MERGING_SUPPORTED |