summaryrefslogtreecommitdiff
path: root/jconfig.h
diff options
context:
space:
mode:
authorTom Hudson <tomhudson@google.com>2016-05-04 13:22:56 -0400
committerTom Hudson <tomhudson@google.com>2016-05-04 13:22:56 -0400
commit0d47d2d3a728e78676a15b1d818cc668cb7e5a9c (patch)
tree044a430eeaa2dec4d6de7b624da15fda1b8ed25f /jconfig.h
parent9d35298a6223278a66423f828a949d93d94d5911 (diff)
Update to libjpeg_turbo 1.4.90
(Duplicate of https://codereview.chromium.org/1939823002/ for landing.) TBR=noel@chromium.org,thakis@chromium.org BUG=608347, 398235, 591927 Review URL: https://codereview.chromium.org/1953443002 .
Diffstat (limited to 'jconfig.h')
-rw-r--r--jconfig.h40
1 files changed, 25 insertions, 15 deletions
diff --git a/jconfig.h b/jconfig.h
index b619181..fe4a437 100644
--- a/jconfig.h
+++ b/jconfig.h
@@ -5,19 +5,27 @@
#define JPEG_LIB_VERSION 62
/* libjpeg-turbo version */
-#define LIBJPEG_TURBO_VERSION 1.3.1
+#define LIBJPEG_TURBO_VERSION 1.4.2
/* Support arithmetic encoding */
-/* #undef C_ARITH_CODING_SUPPORTED */
+/* #define C_ARITH_CODING_SUPPORTED 1 */
/* Support arithmetic decoding */
-/* #undef D_ARITH_CODING_SUPPORTED */
+/* #define D_ARITH_CODING_SUPPORTED 1 */
+
+/*
+ * Define BITS_IN_JSAMPLE as either
+ * 8 for 8-bit sample values (the usual setting)
+ * 12 for 12-bit sample values
+ * Only 8 and 12 are legal data precisions for lossy JPEG according to the
+ * JPEG standard, and the IJG code does not support anything else!
+ * We do not support run-time selection of data precision, sorry.
+ */
-/* Support in-memory source/destination managers */
-/* #undef MEM_SRCDST_SUPPORTED */
+#define BITS_IN_JSAMPLE 8 /* use 8 or 12 */
-/* Define if your compiler supports prototypes */
-#define HAVE_PROTOTYPES 1
+/* Define to 1 if you have the <locale.h> header file. */
+#define HAVE_LOCALE_H 1
/* Define to 1 if you have the <stddef.h> header file. */
#define HAVE_STDDEF_H 1
@@ -31,19 +39,21 @@
/* Define to 1 if the system has the type `unsigned short'. */
#define HAVE_UNSIGNED_SHORT 1
-/* Define if you want use complete types */
+/* Compiler does not support pointers to undefined structures. */
/* #undef INCOMPLETE_TYPES_BROKEN */
-/* Define if you have BSD-like bzero and bcopy */
-/* #undef NEED_BSD_STRINGS */
+/* Support in-memory source/destination managers */
+/* #undef MEM_SRCDST_SUPPORTED */
-/* Define if you need short function names */
-/* #undef NEED_SHORT_EXTERNAL_NAMES */
+/* Define if you have BSD-like bzero and bcopy in <strings.h> rather than
+ memset/memcpy in <string.h>. */
+/* #undef NEED_BSD_STRINGS */
-/* Define if you have sys/types.h */
-/* #undef NEED_SYS_TYPES_H */
+/* Define if you need to include <sys/types.h> to get size_t. */
+/* #undef NEED_SYS_TYPES_H 1 */
-/* Define if shift is unsigned */
+/* Define if your (broken) compiler shifts signed values as if they were
+ unsigned. */
/* #undef RIGHT_SHIFT_IS_UNSIGNED */
/* Use accelerated SIMD routines. */