diff --git a/BUILDING.txt b/BUILDING.txt index 3737987e..0af9fdf2 100644 --- a/BUILDING.txt +++ b/BUILDING.txt @@ -98,17 +98,17 @@ This will generate the following files under .libs/ Development stub for TurboJPEG/OSS shared library {version} is 62.0.0, 7.0.0, or 8.0.2, depending on whether libjpeg v6b -(default), v7, or v8b emulation is enabled. If using Cygwin, {version} is +(default), v7, or v8 emulation is enabled. If using Cygwin, {version} is 62, 7, or 8. -libjpeg v7 or v8b Emulation ---------------------------- +libjpeg v7 or v8 Emulation +-------------------------- Add --with-jpeg7 to the configure command line to build a version of libjpeg-turbo that is compatible with libjpeg v7. Add --with-jpeg8 to the configure command to build a version of libjpeg-turbo that is compatible with -libjpeg v8b. See README-turbo.txt for more information on libjpeg v7 and v8b +libjpeg v8. See README-turbo.txt for more information on libjpeg v7 and v8 emulation. @@ -117,7 +117,7 @@ Arithmetic Coding Support Since the patent on arithmetic coding has expired, this functionality has been included in this release of libjpeg-turbo. libjpeg-turbo's implementation is -based on the implementation in libjpeg v8b, but it works when emulating libjpeg +based on the implementation in libjpeg v8, but it works when emulating libjpeg v7 or v6b as well. The default is to enable both arithmetic encoding and decoding, but those who have philosophical objections to arithmetic coding can add --without-arith-enc or --without-arith-dec to the configure command line to @@ -365,7 +365,7 @@ The following files will be generated under {build_directory}: Import library for TurboJPEG/OSS DLL {version} is 62, 7, or 8, depending on whether libjpeg v6b (default), v7, or -v8b emulation is enabled. +v8 emulation is enabled. Visual C++ (IDE) @@ -399,7 +399,7 @@ This will generate the following files under {build_directory}: {configuration} is Debug, Release, RelWithDebInfo, or MinSizeRel, depending on the configuration you built in the IDE, and {version} is 62, 7, or 8, -depending on whether libjpeg v6b (default), v7, or v8b emulation is enabled. +depending on whether libjpeg v6b (default), v7, or v8 emulation is enabled. MinGW @@ -425,7 +425,7 @@ This will generate the following files under {build_directory} Import library for TurboJPEG/OSS DLL {version} is 62, 7, or 8, depending on whether libjpeg v6b (default), v7, or -v8b emulation is enabled. +v8 emulation is enabled. Debug Build @@ -436,13 +436,13 @@ NMake, remove "-DCMAKE_BUILD_TYPE=Release" (Debug builds are the default with NMake.) -libjpeg v7 or v8b Emulation ---------------------------- +libjpeg v7 or v8 Emulation +-------------------------- Add "-DWITH_JPEG7=1" to the cmake command line to build a version of libjpeg-turbo that is compatible with libjpeg v7. Add "-DWITH_JPEG8=1" to the cmake command to build a version of libjpeg-turbo that is compatible with -libjpeg v8b. See README-turbo.txt for more information on libjpeg v7 and v8b +libjpeg v8. See README-turbo.txt for more information on libjpeg v7 and v8 emulation. @@ -451,7 +451,7 @@ Arithmetic Coding Support Since the patent on arithmetic coding has expired, this functionality has been included in this release of libjpeg-turbo. libjpeg-turbo's implementation is -based on the implementation in libjpeg v8b, but it works when emulating libjpeg +based on the implementation in libjpeg v8, but it works when emulating libjpeg v7 or v6b as well. The default is to enable both arithmetic encoding and decoding, but those who have philosophical objections to arithmetic coding can add "-DWITH_ARITH_ENC=0" or "-DWITH_ARITH_DEC=0" to the cmake command line to diff --git a/CMakeLists.txt b/CMakeLists.txt index 96cdf86d..4a2978bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,7 +75,7 @@ if(WITH_JPEG8) set(JPEG_LIB_VERSION 80) set(DLL_VERSION 8) set(FULLVERSION ${DLL_VERSION}.0.2) - message(STATUS "Emulating libjpeg v8b API/ABI") + message(STATUS "Emulating libjpeg v8 API/ABI") elseif(WITH_JPEG7) set(JPEG_LIB_VERSION 70) set(DLL_VERSION 7) diff --git a/ChangeLog.txt b/ChangeLog.txt index 7537a0f2..13857873 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -32,7 +32,7 @@ the RGB-to-chrominance lookup tables. 1.0.90 (1.1 beta1) ================== -[1] Added emulation of the libjpeg v7 and v8b APIs and ABIs. See +[1] Added emulation of the libjpeg v7 and v8 APIs and ABIs. See README-turbo.txt for more details. This feature was sponsored by CamTrace SAS. [2] Created a new CMake-based build system for the Visual C++ and MinGW builds. diff --git a/configure.ac b/configure.ac index 57724f9f..84fca81f 100644 --- a/configure.ac +++ b/configure.ac @@ -108,7 +108,7 @@ if test "x$JPEG_LIB_VERSION" = "x"; then AC_ARG_WITH([jpeg7], AC_HELP_STRING([--with-jpeg7], [Emulate libjpeg v7 API/ABI (this makes libjpeg-turbo backward incompatible with libjpeg v6b.)])) AC_ARG_WITH([jpeg8], - AC_HELP_STRING([--with-jpeg8], [Emulate libjpeg v8b API/ABI (this makes libjpeg-turbo backward incompatible with libjpeg v6b.)])) + AC_HELP_STRING([--with-jpeg8], [Emulate libjpeg v8 API/ABI (this makes libjpeg-turbo backward incompatible with libjpeg v6b.)])) if test "x${with_jpeg8}" = "xyes"; then JPEG_LIB_VERSION=80 else