diff --git a/.gitmodules b/.gitmodules index 870df81b3..faf74d247 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "native/src/main/jni/image/libjpeg-turbo/libjpeg-turbo"] path = native/src/main/jni/image/libjpeg-turbo/libjpeg-turbo - url = https://gitlab.com/NekoInverter/libjpeg-turbo.git + url = https://github.com/asuka-mio/libjpeg-turbo [submodule "native/src/main/jni/image/giflib/giflib"] path = native/src/main/jni/image/giflib/giflib url = https://gitlab.com/NekoInverter/giflib.git diff --git a/native/src/main/jni/image/libjpeg-turbo/jconfig.h b/native/src/main/jni/image/libjpeg-turbo/jconfig.h index d2e52cf8e..bf0da58fa 100644 --- a/native/src/main/jni/image/libjpeg-turbo/jconfig.h +++ b/native/src/main/jni/image/libjpeg-turbo/jconfig.h @@ -4,22 +4,22 @@ #define JPEG_LIB_VERSION 62 /* libjpeg-turbo version */ -#define LIBJPEG_TURBO_VERSION 2.0.0 +#define LIBJPEG_TURBO_VERSION 2.1.3 /* libjpeg-turbo version in integer form */ -#define LIBJPEG_TURBO_VERSION_NUMBER 2000000 +#define LIBJPEG_TURBO_VERSION_NUMBER 2001003 /* Support arithmetic encoding */ -#define C_ARITH_CODING_SUPPORTED +#define C_ARITH_CODING_SUPPORTED 1 /* Support arithmetic decoding */ -#define D_ARITH_CODING_SUPPORTED +#define D_ARITH_CODING_SUPPORTED 1 /* Support in-memory source/destination managers */ -#define MEM_SRCDST_SUPPORTED +#define MEM_SRCDST_SUPPORTED 1 /* Use accelerated SIMD routines. */ -#define WITH_SIMD +#define WITH_SIMD 1 /* * Define BITS_IN_JSAMPLE as either @@ -32,42 +32,6 @@ #define BITS_IN_JSAMPLE 8 /* use 8 or 12 */ -/* Define to 1 if you have the header file. */ -#define HAVE_LOCALE_H - -/* Define to 1 if you have the header file. */ -#define HAVE_STDDEF_H - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H - -/* Define if you need to include to get size_t. */ -#define NEED_SYS_TYPES_H - -/* Define if you have BSD-like bzero and bcopy in rather than - memset/memcpy in . */ -/* #undef NEED_BSD_STRINGS */ - -/* Define to 1 if the system has the type `unsigned char'. */ -#define HAVE_UNSIGNED_CHAR - -/* Define to 1 if the system has the type `unsigned short'. */ -#define HAVE_UNSIGNED_SHORT - -/* 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 does not define. */ -/* #undef size_t */ diff --git a/native/src/main/jni/image/libjpeg-turbo/jconfigint.h b/native/src/main/jni/image/libjpeg-turbo/jconfigint.h index f7a7057cc..854a292e3 100644 --- a/native/src/main/jni/image/libjpeg-turbo/jconfigint.h +++ b/native/src/main/jni/image/libjpeg-turbo/jconfigint.h @@ -1,5 +1,5 @@ /* libjpeg-turbo build number */ -#define BUILD "20180730" +#define BUILD "20220523" /* Compiler's inline keyword */ #undef inline @@ -7,14 +7,17 @@ /* 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.0" +#define VERSION "2.1.3" /* The size of `size_t', as computed by sizeof. */ -#define SIZEOF_SIZE_T __SIZEOF_SIZE_T__ +#define SIZEOF_SIZE_T 8 /* Define if your compiler has __builtin_ctzl() and sizeof(unsigned long) == sizeof(size_t). */ #define HAVE_BUILTIN_CTZL diff --git a/native/src/main/jni/image/libjpeg-turbo/jversion.h b/native/src/main/jni/image/libjpeg-turbo/jversion.h new file mode 100644 index 000000000..63db95b99 --- /dev/null +++ b/native/src/main/jni/image/libjpeg-turbo/jversion.h @@ -0,0 +1,54 @@ +/* + * jversion.h + * + * This file was part of the Independent JPEG Group's software: + * Copyright (C) 1991-2020, 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-2020 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-2020 Thomas G. Lane, Guido Vollbeding" + +#define JCOPYRIGHT_SHORT \ + "Copyright (C) 1991-2022 The libjpeg-turbo Project and many others" diff --git a/native/src/main/jni/image/libjpeg-turbo/libjpeg-turbo b/native/src/main/jni/image/libjpeg-turbo/libjpeg-turbo index 7e3cd1ac2..3331f85ed 160000 --- a/native/src/main/jni/image/libjpeg-turbo/libjpeg-turbo +++ b/native/src/main/jni/image/libjpeg-turbo/libjpeg-turbo @@ -1 +1 @@ -Subproject commit 7e3cd1ac22055368125aa00679b814fd77a59e41 +Subproject commit 3331f85edcf03db0d8baee63de92657e62e8eff4