diff options
| author | Tom Gall <tom.gall@linaro.org> | 2011-12-22 16:11:51 -0600 |
|---|---|---|
| committer | Tom Gall <tom.gall@linaro.org> | 2011-12-22 16:11:51 -0600 |
| commit | af63675e8468bf102b3d60733f19050f4c924395 (patch) | |
| tree | f5da0673158e41d2a3072930ffabf2c36585323d | |
| parent | 1ec2079f92a536e18a524430367a915fd01b55d2 (diff) | |
r731 : Add LIBJPEG_TURBO_VERSION macro for checking the libjpeg-turbo version at compile time
| -rw-r--r-- | ChangeLog.txt | 3 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | jconfig.h.in | 3 | ||||
| -rw-r--r-- | win/jconfig.h.in | 1 |
4 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index be091dd..0776105 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -11,6 +11,9 @@ This was more of an annoyance than an actual bug, since it did not cause any actual run-time problems, but the issue showed up when running libjpeg-turbo in valgrind. See http://crbug.com/72399 for more information. +[3] Added a compile-time macro (LIBJPEG_TURBO_VERSION) that can be used to +check the version of libjpeg-turbo against which an application was compiled. + 1.1.90 (1.2 beta1) ================== diff --git a/configure.ac b/configure.ac index bb1c68b..440f454 100644 --- a/configure.ac +++ b/configure.ac @@ -140,6 +140,8 @@ AC_MSG_RESULT([$SO_MAJOR_VERSION:$SO_MINOR_VERSION]) AC_SUBST(SO_MAJOR_VERSION) AC_SUBST(SO_MINOR_VERSION) +AC_DEFINE_UNQUOTED(LIBJPEG_TURBO_VERSION, [$VERSION], [libjpeg-turbo version]) + VERSION_SCRIPT=yes AC_ARG_ENABLE([ld-version-script], AS_HELP_STRING([--disable-ld-version-script], diff --git a/jconfig.h.in b/jconfig.h.in index 4aef763..e0d9dc8 100644 --- a/jconfig.h.in +++ b/jconfig.h.in @@ -3,6 +3,9 @@ */ #define JPEG_LIB_VERSION 62 /* Version 6b */ +/* libjpeg-turbo version */ +#define LIBJPEG_TURBO_VERSION 0 + /* Support arithmetic encoding */ #undef C_ARITH_CODING_SUPPORTED diff --git a/win/jconfig.h.in b/win/jconfig.h.in index 373976d..382e576 100644 --- a/win/jconfig.h.in +++ b/win/jconfig.h.in @@ -2,6 +2,7 @@ /* see jconfig.txt for explanations */ #define JPEG_LIB_VERSION @JPEG_LIB_VERSION@ +#define LIBJPEG_TURBO_VERSION @VERSION@ #cmakedefine C_ARITH_CODING_SUPPORTED #cmakedefine D_ARITH_CODING_SUPPORTED |