diff --git a/deps/jpeg/include/jconfig.h b/deps/jpeg-turbo/include/jconfig.h similarity index 96% rename from deps/jpeg/include/jconfig.h rename to deps/jpeg-turbo/include/jconfig.h index c3bfff99..d24b1532 100644 --- a/deps/jpeg/include/jconfig.h +++ b/deps/jpeg-turbo/include/jconfig.h @@ -4,10 +4,10 @@ #define JPEG_LIB_VERSION 62 /* libjpeg-turbo version */ -#define LIBJPEG_TURBO_VERSION 2.0.5 +#define LIBJPEG_TURBO_VERSION 2.0.6 /* libjpeg-turbo version in integer form */ -#define LIBJPEG_TURBO_VERSION_NUMBER 2000005 +#define LIBJPEG_TURBO_VERSION_NUMBER 2000006 /* Support arithmetic encoding */ #define C_ARITH_CODING_SUPPORTED 1 diff --git a/deps/jpeg/include/jerror.h b/deps/jpeg-turbo/include/jerror.h similarity index 100% rename from deps/jpeg/include/jerror.h rename to deps/jpeg-turbo/include/jerror.h diff --git a/deps/jpeg/include/jmorecfg.h b/deps/jpeg-turbo/include/jmorecfg.h similarity index 98% rename from deps/jpeg/include/jmorecfg.h rename to deps/jpeg-turbo/include/jmorecfg.h index d0b93007..aa29f0f9 100644 --- a/deps/jpeg/include/jmorecfg.h +++ b/deps/jpeg-turbo/include/jmorecfg.h @@ -5,7 +5,7 @@ * Copyright (C) 1991-1997, Thomas G. Lane. * Modified 1997-2009 by Guido Vollbeding. * libjpeg-turbo Modifications: - * Copyright (C) 2009, 2011, 2014-2015, 2018, D. R. Commander. + * Copyright (C) 2009, 2011, 2014-2015, 2018, 2020, D. R. Commander. * For conditions of distribution and use, see the accompanying README.ijg * file. * @@ -273,9 +273,9 @@ typedef int boolean; /* Capability options common to encoder and decoder: */ -#define DCT_ISLOW_SUPPORTED /* slow but accurate integer algorithm */ -#define DCT_IFAST_SUPPORTED /* faster, less accurate integer method */ -#define DCT_FLOAT_SUPPORTED /* floating-point: accurate, fast on fast HW */ +#define DCT_ISLOW_SUPPORTED /* accurate integer method */ +#define DCT_IFAST_SUPPORTED /* less accurate int method [legacy feature] */ +#define DCT_FLOAT_SUPPORTED /* floating-point method [legacy feature] */ /* Encoder capability options: */ diff --git a/deps/jpeg/include/jpeglib.h b/deps/jpeg-turbo/include/jpeglib.h similarity index 99% rename from deps/jpeg/include/jpeglib.h rename to deps/jpeg-turbo/include/jpeglib.h index 33f8ad27..d7664f06 100644 --- a/deps/jpeg/include/jpeglib.h +++ b/deps/jpeg-turbo/include/jpeglib.h @@ -5,7 +5,7 @@ * Copyright (C) 1991-1998, Thomas G. Lane. * Modified 2002-2009 by Guido Vollbeding. * libjpeg-turbo Modifications: - * Copyright (C) 2009-2011, 2013-2014, 2016-2017, D. R. Commander. + * Copyright (C) 2009-2011, 2013-2014, 2016-2017, 2020, D. R. Commander. * Copyright (C) 2015, Google, Inc. * For conditions of distribution and use, see the accompanying README.ijg * file. @@ -244,9 +244,9 @@ typedef enum { /* DCT/IDCT algorithm options. */ typedef enum { - JDCT_ISLOW, /* slow but accurate integer algorithm */ - JDCT_IFAST, /* faster, less accurate integer method */ - JDCT_FLOAT /* floating-point: accurate, fast on fast HW */ + JDCT_ISLOW, /* accurate integer method */ + JDCT_IFAST, /* less accurate integer method [legacy feature] */ + JDCT_FLOAT /* floating-point method [legacy feature] */ } J_DCT_METHOD; #ifndef JDCT_DEFAULT /* may be overridden in jconfig.h */ diff --git a/deps/jpeg/lib/libjpeg.a b/deps/jpeg-turbo/lib/libjpeg.a similarity index 65% rename from deps/jpeg/lib/libjpeg.a rename to deps/jpeg-turbo/lib/libjpeg.a index b84f601b..f7ba4ddb 100644 Binary files a/deps/jpeg/lib/libjpeg.a and b/deps/jpeg-turbo/lib/libjpeg.a differ