Be clear that we are only emulating the libjpeg v7/v8 API/ABI, not the library itself.

This commit is contained in:
DRC
2012-01-27 09:52:20 +00:00
parent 44e6c174ee
commit 311728cd98
2 changed files with 24 additions and 21 deletions

View File

@@ -107,14 +107,14 @@ This will generate the following files under .libs/
62, 7, or 8. 62, 7, or 8.
libjpeg v7 or v8 Emulation libjpeg v7 or v8 API/ABI 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 API/ABI-compatible with libjpeg v7. Add --with-jpeg8 to
configure command to build a version of libjpeg-turbo that is compatible with the configure command to build a version of libjpeg-turbo that is
libjpeg v8. See README-turbo.txt for more information on libjpeg v7 and v8 API/ABI-compatible with libjpeg v8. See README-turbo.txt for more information
emulation. on libjpeg v7 and v8 emulation.
Arithmetic Coding Support Arithmetic Coding Support
@@ -492,14 +492,14 @@ NMake, remove "-DCMAKE_BUILD_TYPE=Release" (Debug builds are the default with
NMake.) NMake.)
libjpeg v7 or v8 Emulation libjpeg v7 or v8 API/ABI 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 API/ABI-compatible with libjpeg v7. Add "-DWITH_JPEG8=1"
cmake command to build a version of libjpeg-turbo that is compatible with to the cmake command to build a version of libjpeg-turbo that is
libjpeg v8. See README-turbo.txt for more information on libjpeg v7 and v8 API/ABI-compatible with libjpeg v8. See README-turbo.txt for more information
emulation. on libjpeg v7 and v8 emulation.
Arithmetic Coding Support Arithmetic Coding Support

View File

@@ -850,8 +850,9 @@ int jpeg_quality_scaling (int quality)
premise of this routine collapses. Caveat user. premise of this routine collapses. Caveat user.
jpeg_default_qtables (j_compress_ptr cinfo, boolean force_baseline) jpeg_default_qtables (j_compress_ptr cinfo, boolean force_baseline)
[libjpeg v7/v8 only] Set default quantization tables with linear [libjpeg v7+ API/ABI emulation only]
q_scale_factor[] values (see below). Set default quantization tables with linear q_scale_factor[] values
(see below).
jpeg_add_quant_table (j_compress_ptr cinfo, int which_tbl, jpeg_add_quant_table (j_compress_ptr cinfo, int which_tbl,
const unsigned int *basic_table, const unsigned int *basic_table,
@@ -976,8 +977,9 @@ JQUANT_TBL * quant_tbl_ptrs[NUM_QUANT_TBLS]
slot 1 for chrominance. slot 1 for chrominance.
int q_scale_factor[NUM_QUANT_TBLS] int q_scale_factor[NUM_QUANT_TBLS]
[libjpeg v7+ only] Linear quantization scaling factors (0-100, default [libjpeg v7+ API/ABI emulation only]
100) for use with jpeg_default_qtables(). Linear quantization scaling factors (0-100, default 100)
for use with jpeg_default_qtables().
See rdswitch.c and cjpeg.c for an example of usage. See rdswitch.c and cjpeg.c for an example of usage.
Note that the q_scale_factor[] values use "linear" scales, so JPEG Note that the q_scale_factor[] values use "linear" scales, so JPEG
quality levels chosen by the user must be converted to these scales quality levels chosen by the user must be converted to these scales
@@ -1012,11 +1014,12 @@ JHUFF_TBL * ac_huff_tbl_ptrs[NUM_HUFF_TBLS]
any need to mess with providing your own Huffman tables. any need to mess with providing your own Huffman tables.
[libjpeg v7+ only] The actual dimensions of the JPEG image that will be written [libjpeg v7+ API/ABI emulation only]
to the file are given by the following fields. These are computed from the The actual dimensions of the JPEG image that will be written to the file are
input image dimensions and the compression parameters by jpeg_start_compress(). given by the following fields. These are computed from the input image
You can also call jpeg_calc_jpeg_dimensions() to obtain the values that will dimensions and the compression parameters by jpeg_start_compress(). You can
result from the current parameter settings. also call jpeg_calc_jpeg_dimensions() to obtain the values that will result
from the current parameter settings.
JDIMENSION jpeg_width Actual dimensions of output image. JDIMENSION jpeg_width Actual dimensions of output image.
JDIMENSION jpeg_height JDIMENSION jpeg_height