Switch to libjpeg-turbo (version 2.0.7 ESR).
This commit is contained in:
Joseph Cloutier
@@ -137,6 +137,7 @@
|
||||
|
||||
<section if="LIME_JPEG">
|
||||
|
||||
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/overrides/jpeg/" />
|
||||
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/jpeg/" />
|
||||
<compilerflag value="-DLIME_JPEG" />
|
||||
|
||||
|
||||
Submodule project/lib/jpeg updated: a105289f5a...e811baf301
@@ -1,75 +1,80 @@
|
||||
<xml>
|
||||
|
||||
<files id="native-toolkit-jpeg-depends" >
|
||||
<depend name="${NATIVE_TOOLKIT_PATH}/jpeg/jpeglib.h"/>
|
||||
</files>
|
||||
|
||||
|
||||
<files id="native-toolkit-jpeg" tags="">
|
||||
|
||||
<cache value="1" />
|
||||
|
||||
|
||||
<tag value="${NATIVE_TOOLKIT_OPTIM_TAG}" if="NATIVE_TOOLKIT_OPTIM_TAG" />
|
||||
|
||||
<depend files="native-toolkit-jpeg-depends"/>
|
||||
|
||||
<depend name="${NATIVE_TOOLKIT_PATH}/jpeg/transupp.h"/>
|
||||
<depend name="${NATIVE_TOOLKIT_PATH}/jpeg/jversion.h"/>
|
||||
<depend name="${NATIVE_TOOLKIT_PATH}/jpeg/jmemsys.h"/>
|
||||
<depend name="${NATIVE_TOOLKIT_PATH}/jpeg/jmorecfg.h"/>
|
||||
<depend name="${NATIVE_TOOLKIT_PATH}/jpeg/jpegint.h"/>
|
||||
<depend name="${NATIVE_TOOLKIT_PATH}/jpeg/jinclude.h"/>
|
||||
<depend name="${NATIVE_TOOLKIT_PATH}/jpeg/jerror.h"/>
|
||||
<depend name="${NATIVE_TOOLKIT_PATH}/jpeg/jdct.h"/>
|
||||
<depend name="${NATIVE_TOOLKIT_PATH}/jpeg/jconfig.h"/>
|
||||
<depend name="${NATIVE_TOOLKIT_PATH}/jpeg/cdjpeg.h"/>
|
||||
<depend name="${NATIVE_TOOLKIT_PATH}/jpeg/cderror.h"/>
|
||||
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jcapimin.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jcapistd.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jctrans.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jcparam.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jdatadst.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jcinit.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jcmaster.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jcmarker.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jcmainct.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jcprepct.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jccoefct.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jccolor.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jcsample.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jchuff.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jcdctmgr.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jfdctfst.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jfdctflt.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jfdctint.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jdapimin.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jdapistd.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jdtrans.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jdatasrc.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jdmaster.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jdinput.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jdmarker.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jdhuff.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jdmainct.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jdcoefct.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jdpostct.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jddctmgr.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jidctfst.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jidctflt.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jidctint.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jdsample.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jdcolor.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jquant1.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jquant2.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jdmerge.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jcomapi.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jutils.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jerror.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jmemmgr.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jmemnobs.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jaricom.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jcarith.c"/>
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jdarith.c"/>
|
||||
|
||||
|
||||
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/overrides/jpeg/" />
|
||||
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/jpeg/" />
|
||||
|
||||
<depend name="${NATIVE_TOOLKIT_PATH}/jpeg/cderror.h" />
|
||||
<depend name="${NATIVE_TOOLKIT_PATH}/jpeg/cdjpeg.h" />
|
||||
<depend name="${NATIVE_TOOLKIT_PATH}/overrides/jpeg/jconfig.h" />
|
||||
<depend name="${NATIVE_TOOLKIT_PATH}/overrides/jpeg/jconfigint.h" />
|
||||
<depend name="${NATIVE_TOOLKIT_PATH}/jpeg/jdct.h" />
|
||||
<depend name="${NATIVE_TOOLKIT_PATH}/jpeg/jerror.h" />
|
||||
<depend name="${NATIVE_TOOLKIT_PATH}/jpeg/jinclude.h" />
|
||||
<depend name="${NATIVE_TOOLKIT_PATH}/jpeg/jmemsys.h" />
|
||||
<depend name="${NATIVE_TOOLKIT_PATH}/jpeg/jmorecfg.h" />
|
||||
<depend name="${NATIVE_TOOLKIT_PATH}/jpeg/jpegint.h" />
|
||||
<depend name="${NATIVE_TOOLKIT_PATH}/jpeg/jpeglib.h" />
|
||||
<depend name="${NATIVE_TOOLKIT_PATH}/jpeg/simd/jsimd.h" />
|
||||
<depend name="${NATIVE_TOOLKIT_PATH}/jpeg/transupp.h" />
|
||||
<depend name="${NATIVE_TOOLKIT_PATH}/overrides/jpeg/jversion.h" />
|
||||
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jaricom.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jcapimin.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jcapistd.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jcarith.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jccoefct.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jccolor.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jcdctmgr.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jchuff.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jcinit.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jcmainct.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jcmarker.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jcmaster.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jcomapi.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jcparam.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jcphuff.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jcprepct.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jcsample.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jctrans.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jdapimin.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jdapistd.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jdarith.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jdatadst.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jdatasrc.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jdcoefct.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jdcolor.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jddctmgr.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jdhuff.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jdinput.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jdmainct.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jdmarker.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jdmaster.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jdmerge.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jdphuff.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jdpostct.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jdsample.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jdtrans.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jerror.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jfdctflt.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jfdctfst.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jfdctint.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jidctflt.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jidctfst.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jidctint.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jidctred.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jmemmgr.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jmemnobs.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jsimd_none.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jquant1.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jquant2.c" />
|
||||
<file name="${NATIVE_TOOLKIT_PATH}/jpeg/jutils.c" />
|
||||
|
||||
</files>
|
||||
|
||||
|
||||
</xml>
|
||||
73
project/lib/overrides/jpeg/jconfig.h
Normal file
73
project/lib/overrides/jpeg/jconfig.h
Normal file
@@ -0,0 +1,73 @@
|
||||
/* Version ID for the JPEG library.
|
||||
* Might be useful for tests like "#if JPEG_LIB_VERSION >= 60".
|
||||
*/
|
||||
#define JPEG_LIB_VERSION 62
|
||||
|
||||
/* libjpeg-turbo version */
|
||||
#define LIBJPEG_TURBO_VERSION 2.0.7
|
||||
|
||||
/* libjpeg-turbo version in integer form */
|
||||
#define LIBJPEG_TURBO_VERSION_NUMBER 2000007
|
||||
|
||||
/* Support arithmetic encoding */
|
||||
#define C_ARITH_CODING_SUPPORTED 1
|
||||
|
||||
/* Support arithmetic decoding */
|
||||
#define D_ARITH_CODING_SUPPORTED 1
|
||||
|
||||
/* Support in-memory source/destination managers */
|
||||
#define MEM_SRCDST_SUPPORTED 1
|
||||
|
||||
/* Use accelerated SIMD routines. */
|
||||
#define WITH_SIMD 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.
|
||||
*/
|
||||
|
||||
#define BITS_IN_JSAMPLE 8 /* use 8 or 12 */
|
||||
|
||||
/* 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
|
||||
|
||||
/* Define to 1 if you have the <stdlib.h> header file. */
|
||||
#define HAVE_STDLIB_H 1
|
||||
|
||||
/* Define if you need to include <sys/types.h> to get size_t. */
|
||||
#define NEED_SYS_TYPES_H 1
|
||||
|
||||
/* Define if you have BSD-like bzero and bcopy in <strings.h> rather than
|
||||
memset/memcpy in <string.h>. */
|
||||
/* #undef NEED_BSD_STRINGS */
|
||||
|
||||
/* Define to 1 if the system has the type `unsigned char'. */
|
||||
#define HAVE_UNSIGNED_CHAR 1
|
||||
|
||||
/* Define to 1 if the system has the type `unsigned short'. */
|
||||
#define HAVE_UNSIGNED_SHORT 1
|
||||
|
||||
/* Compiler does not support pointers to undefined structures. */
|
||||
/* #undef INCOMPLETE_TYPES_BROKEN */
|
||||
|
||||
/* Define if your (broken) compiler shifts signed values as if they were
|
||||
unsigned. */
|
||||
/* #undef RIGHT_SHIFT_IS_UNSIGNED */
|
||||
|
||||
/* Define to 1 if type `char' is unsigned and you are not using gcc. */
|
||||
#ifndef __CHAR_UNSIGNED__
|
||||
/* #undef __CHAR_UNSIGNED__ */
|
||||
#endif
|
||||
|
||||
/* Define to empty if `const' does not conform to ANSI C. */
|
||||
/* #undef const */
|
||||
|
||||
/* Define to `unsigned int' if <sys/types.h> does not define. */
|
||||
/* #undef size_t */
|
||||
44
project/lib/overrides/jpeg/jconfigint.h
Normal file
44
project/lib/overrides/jpeg/jconfigint.h
Normal file
@@ -0,0 +1,44 @@
|
||||
/* libjpeg-turbo build number */
|
||||
#define BUILD "20220513"
|
||||
|
||||
/* Compiler's inline keyword */
|
||||
#undef inline
|
||||
|
||||
/* How to obtain function inlining. */
|
||||
#define INLINE __inline__ __attribute__((always_inline))
|
||||
|
||||
/* How to obtain thread-local storage */
|
||||
#define THREAD_LOCAL __thread
|
||||
|
||||
/* Define to the full name of this package. */
|
||||
#define PACKAGE_NAME "libjpeg-turbo"
|
||||
|
||||
/* Version number of package */
|
||||
#define VERSION "2.0.7"
|
||||
|
||||
/* The size of `size_t', as computed by sizeof. */
|
||||
#define SIZEOF_SIZE_T 8
|
||||
|
||||
/* Define if your compiler has __builtin_ctzl() and sizeof(unsigned long) == sizeof(size_t). */
|
||||
#define HAVE_BUILTIN_CTZL
|
||||
|
||||
/* Define to 1 if you have the <intrin.h> header file. */
|
||||
/* #undef HAVE_INTRIN_H */
|
||||
|
||||
#if defined(_MSC_VER) && defined(HAVE_INTRIN_H)
|
||||
#if (SIZEOF_SIZE_T == 8)
|
||||
#define HAVE_BITSCANFORWARD64
|
||||
#elif (SIZEOF_SIZE_T == 4)
|
||||
#define HAVE_BITSCANFORWARD
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if defined(__has_attribute)
|
||||
#if __has_attribute(fallthrough)
|
||||
#define FALLTHROUGH __attribute__((fallthrough));
|
||||
#else
|
||||
#define FALLTHROUGH
|
||||
#endif
|
||||
#else
|
||||
#define FALLTHROUGH
|
||||
#endif
|
||||
54
project/lib/overrides/jpeg/jversion.h
Normal file
54
project/lib/overrides/jpeg/jversion.h
Normal file
@@ -0,0 +1,54 @@
|
||||
/*
|
||||
* jversion.h
|
||||
*
|
||||
* This file was part of the Independent JPEG Group's software:
|
||||
* Copyright (C) 1991-2012, Thomas G. Lane, Guido Vollbeding.
|
||||
* libjpeg-turbo Modifications:
|
||||
* Copyright (C) 2010, 2012-2022, D. R. Commander.
|
||||
* For conditions of distribution and use, see the accompanying README.ijg
|
||||
* file.
|
||||
*
|
||||
* This file contains software version identification.
|
||||
*/
|
||||
|
||||
|
||||
#if JPEG_LIB_VERSION >= 80
|
||||
|
||||
#define JVERSION "8d 15-Jan-2012"
|
||||
|
||||
#elif JPEG_LIB_VERSION >= 70
|
||||
|
||||
#define JVERSION "7 27-Jun-2009"
|
||||
|
||||
#else
|
||||
|
||||
#define JVERSION "6b 27-Mar-1998"
|
||||
|
||||
#endif
|
||||
|
||||
/*
|
||||
* NOTE: It is our convention to place the authors in the following order:
|
||||
* - libjpeg-turbo authors (2009-) in descending order of the date of their
|
||||
* most recent contribution to the project, then in ascending order of the
|
||||
* date of their first contribution to the project, then in alphabetical
|
||||
* order
|
||||
* - Upstream authors in descending order of the date of the first inclusion of
|
||||
* their code
|
||||
*/
|
||||
|
||||
#define JCOPYRIGHT \
|
||||
"Copyright (C) 2009-2022 D. R. Commander\n" \
|
||||
"Copyright (C) 2015, 2020 Google, Inc.\n" \
|
||||
"Copyright (C) 2019 Arm Limited\n" \
|
||||
"Copyright (C) 2015-2016, 2018 Matthieu Darbois\n" \
|
||||
"Copyright (C) 2011-2016 Siarhei Siamashka\n" \
|
||||
"Copyright (C) 2015 Intel Corporation\n" \
|
||||
"Copyright (C) 2013-2014 Linaro Limited\n" \
|
||||
"Copyright (C) 2013-2014 MIPS Technologies, Inc.\n" \
|
||||
"Copyright (C) 2009, 2012 Pierre Ossman for Cendio AB\n" \
|
||||
"Copyright (C) 2009-2011 Nokia Corporation and/or its subsidiary(-ies)\n" \
|
||||
"Copyright (C) 1999-2006 MIYASAKA Masaru\n" \
|
||||
"Copyright (C) 1991-2017 Thomas G. Lane, Guido Vollbeding"
|
||||
|
||||
#define JCOPYRIGHT_SHORT \
|
||||
"Copyright (C) 1991-2022 The libjpeg-turbo Project and many others"
|
||||
Reference in New Issue
Block a user