ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@398 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
DRC
2011-02-18 20:55:20 +00:00
parent 4db36eb09e f38eee0739
commit 9af407729b
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
BUILDING.txt
View File

@@ -98,17 +98,17 @@ This will generate the following files under .libs/
Development stub for TurboJPEG/OSS shared library Development stub for TurboJPEG/OSS shared library
{version} is 62.0.0, 7.0.0, or 8.0.2, depending on whether libjpeg v6b {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. 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 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 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 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. emulation.
@@ -117,7 +117,7 @@ Arithmetic Coding Support
Since the patent on arithmetic coding has expired, this functionality has been Since the patent on arithmetic coding has expired, this functionality has been
included in this release of libjpeg-turbo. libjpeg-turbo's implementation is 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 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 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 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 Import library for TurboJPEG/OSS DLL
{version} is 62, 7, or 8, depending on whether libjpeg v6b (default), v7, or {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) 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 {configuration} is Debug, Release, RelWithDebInfo, or MinSizeRel, depending on
the configuration you built in the IDE, and {version} is 62, 7, or 8, 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 MinGW
@@ -425,7 +425,7 @@ This will generate the following files under {build_directory}
Import library for TurboJPEG/OSS DLL Import library for TurboJPEG/OSS DLL
{version} is 62, 7, or 8, depending on whether libjpeg v6b (default), v7, or {version} is 62, 7, or 8, depending on whether libjpeg v6b (default), v7, or
v8b emulation is enabled. v8 emulation is enabled.
Debug Build Debug Build
@@ -436,13 +436,13 @@ NMake, remove "-DCMAKE_BUILD_TYPE=Release" (Debug builds are the default with
NMake.) 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 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 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 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. emulation.
@@ -451,7 +451,7 @@ Arithmetic Coding Support
Since the patent on arithmetic coding has expired, this functionality has been Since the patent on arithmetic coding has expired, this functionality has been
included in this release of libjpeg-turbo. libjpeg-turbo's implementation is 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 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 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 add "-DWITH_ARITH_ENC=0" or "-DWITH_ARITH_DEC=0" to the cmake command line to

2
CMakeLists.txt
View File

@@ -75,7 +75,7 @@ if(WITH_JPEG8)
set(JPEG_LIB_VERSION 80) set(JPEG_LIB_VERSION 80)
set(DLL_VERSION 8) set(DLL_VERSION 8)
set(FULLVERSION ${DLL_VERSION}.0.2) set(FULLVERSION ${DLL_VERSION}.0.2)
message(STATUS "Emulating libjpeg v8b API/ABI") message(STATUS "Emulating libjpeg v8 API/ABI")
elseif(WITH_JPEG7) elseif(WITH_JPEG7)
set(JPEG_LIB_VERSION 70) set(JPEG_LIB_VERSION 70)
set(DLL_VERSION 7) set(DLL_VERSION 7)

2
ChangeLog.txt
View File

@@ -32,7 +32,7 @@ the RGB-to-chrominance lookup tables.
1.0.90 (1.1 beta1) 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. 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. [2] Created a new CMake-based build system for the Visual C++ and MinGW builds.

2
configure.ac
View File

@@ -108,7 +108,7 @@ if test "x$JPEG_LIB_VERSION" = "x"; then
AC_ARG_WITH([jpeg7], AC_ARG_WITH([jpeg7],
AC_HELP_STRING([--with-jpeg7], [Emulate libjpeg v7 API/ABI (this makes libjpeg-turbo backward incompatible with libjpeg v6b.)])) AC_HELP_STRING([--with-jpeg7], [Emulate libjpeg v7 API/ABI (this makes libjpeg-turbo backward incompatible with libjpeg v6b.)]))
AC_ARG_WITH([jpeg8], 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 if test "x${with_jpeg8}" = "xyes"; then
JPEG_LIB_VERSION=80 JPEG_LIB_VERSION=80
else else