From 9c13ec5fa392930e9a1880ad20c11ba47fdc54ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Klitzing?= Date: Fri, 28 Jul 2017 18:38:55 +0200 Subject: Replace bundled libjpeg by libjpeg-turbo 1.5.2 Most linux distribution uses libjpeg-turbo as a replacement for libjpeg. Since Qt will be linked against -turbo more frequently than the "original" libjpeg we should use it for the bundled copy, too. Also add an import script. [ChangeLog][Third-Party Code] Replaced bundled libjpeg by libjpeg-turbo 1.5.2 Change-Id: I41081db74f194cbc288820fc783c9fef16545efd Reviewed-by: Oswald Buddenhagen Reviewed-by: Lars Knoll Reviewed-by: Eirik Aavitsland --- src/3rdparty/libjpeg/src/jconfigint.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 src/3rdparty/libjpeg/src/jconfigint.h (limited to 'src/3rdparty/libjpeg/src/jconfigint.h') diff --git a/src/3rdparty/libjpeg/src/jconfigint.h b/src/3rdparty/libjpeg/src/jconfigint.h new file mode 100644 index 0000000000..2131bf52a1 --- /dev/null +++ b/src/3rdparty/libjpeg/src/jconfigint.h @@ -0,0 +1,13 @@ +#define VERSION "@VERSION@" +#define BUILD "@BUILD@" +#define PACKAGE_NAME "@CMAKE_PROJECT_NAME@" + +#ifndef INLINE +#if defined(__GNUC__) +#define INLINE inline __attribute__((always_inline)) +#elif defined(_MSC_VER) +#define INLINE __forceinline +#else +#define INLINE +#endif +#endif -- cgit v1.2.3