The API/ABI should be described as "libjpeg v8", not "libjpeg v8b", since there are multiple libjpeg releases with the same interface

git-svn-id: https://libjpeg-turbo.svn.sourceforge.net/svnroot/libjpeg-turbo@391 3789f03b-4d11-0410-bbf8-ca57d06f2519

4 files changed, 15 insertions, 15 deletions

diff --git a/branches/1.1.x/BUILDING.txt b/branches/1.1.x/BUILDING.txt
index b0792b2..50e2fb7 100644
--- a/branches/1.1.x/BUILDING.txt
+++ b/branches/1.1.x/BUILDING.txt
@@ -91,17 +91,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.
 
 
@@ -110,7 +110,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
@@ -341,7 +341,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)
@@ -375,7 +375,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
@@ -401,7 +401,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
@@ -412,13 +412,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.
 
 
@@ -427,7 +427,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/branches/1.1.x/CMakeLists.txt b/branches/1.1.x/CMakeLists.txt
index 932c3af..9fd0241 100644
--- a/branches/1.1.x/CMakeLists.txt
+++ b/branches/1.1.x/CMakeLists.txt
@@ -65,7 +65,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/branches/1.1.x/ChangeLog.txt b/branches/1.1.x/ChangeLog.txt
index 100eddd..a0c6466 100644
--- a/branches/1.1.x/ChangeLog.txt
+++ b/branches/1.1.x/ChangeLog.txt
@@ -24,7 +24,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/branches/1.1.x/configure.ac b/branches/1.1.x/configure.ac
index 7b646c2..06b3859 100644
--- a/branches/1.1.x/configure.ac
+++ b/branches/1.1.x/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