summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/libjpeg/src/jpegcomp.h
diff options
context:
space:
mode:
authorEirik Aavitsland <eirik.aavitsland@qt.io>2021-02-23 16:38:15 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-03-19 05:40:24 +0000
commit5463203fa2002dd50bd65b140ec8d78ae595b9b6 (patch)
tree12af15bf7cad3816f4056852bf202620703e9ab8 /src/3rdparty/libjpeg/src/jpegcomp.h
parent13c0eee15f783b695149739ad04cd9bef67fd630 (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) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/3rdparty/libjpeg/src/jpegcomp.h')
-rw-r--r--src/3rdparty/libjpeg/src/jpegcomp.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/libjpeg/src/jpegcomp.h b/src/3rdparty/libjpeg/src/jpegcomp.h
index b32d544bf1..c4834ac0df 100644
--- a/src/3rdparty/libjpeg/src/jpegcomp.h
+++ b/src/3rdparty/libjpeg/src/jpegcomp.h
@@ -1,7 +1,7 @@
/*
* jpegcomp.h
*
- * Copyright (C) 2010, D. R. Commander.
+ * Copyright (C) 2010, 2020, D. R. Commander.
* For conditions of distribution and use, see the accompanying README.ijg
* file.
*
@@ -19,6 +19,7 @@
#define _min_DCT_v_scaled_size min_DCT_v_scaled_size
#define _jpeg_width jpeg_width
#define _jpeg_height jpeg_height
+#define JERR_ARITH_NOTIMPL JERR_NOT_COMPILED
#else
#define _DCT_scaled_size DCT_scaled_size
#define _DCT_h_scaled_size DCT_scaled_size