From 07f771e1d46f65ad9842f7ecef05bdee1fc4f6a1 Mon Sep 17 00:00:00 2001 From: dcommander Date: Fri, 27 Jan 2012 09:52:20 +0000 Subject: Be clear that we are only emulating the libjpeg v7/v8 API/ABI, not the library itself. git-svn-id: https://libjpeg-turbo.svn.sourceforge.net/svnroot/libjpeg-turbo@748 3789f03b-4d11-0410-bbf8-ca57d06f2519 --- trunk/BUILDING.txt | 24 ++++++++++++------------ trunk/libjpeg.txt | 21 ++++++++++++--------- 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/trunk/BUILDING.txt b/trunk/BUILDING.txt index e399785..730eaf7 100644 --- a/trunk/BUILDING.txt +++ b/trunk/BUILDING.txt @@ -107,14 +107,14 @@ This will generate the following files under .libs/ 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 -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 v8. See README-turbo.txt for more information on libjpeg v7 and v8 -emulation. +libjpeg-turbo that is API/ABI-compatible with libjpeg v7. Add --with-jpeg8 to +the configure command to build a version of libjpeg-turbo that is +API/ABI-compatible with libjpeg v8. See README-turbo.txt for more information +on libjpeg v7 and v8 emulation. Arithmetic Coding Support @@ -492,14 +492,14 @@ NMake, remove "-DCMAKE_BUILD_TYPE=Release" (Debug builds are the default with 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 -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 v8. See README-turbo.txt for more information on libjpeg v7 and v8 -emulation. +libjpeg-turbo that is API/ABI-compatible with libjpeg v7. Add "-DWITH_JPEG8=1" +to the cmake command to build a version of libjpeg-turbo that is +API/ABI-compatible with libjpeg v8. See README-turbo.txt for more information +on libjpeg v7 and v8 emulation. Arithmetic Coding Support diff --git a/trunk/libjpeg.txt b/trunk/libjpeg.txt index 191b35e..c781757 100644 --- a/trunk/libjpeg.txt +++ b/trunk/libjpeg.txt @@ -850,8 +850,9 @@ int jpeg_quality_scaling (int quality) premise of this routine collapses. Caveat user. jpeg_default_qtables (j_compress_ptr cinfo, boolean force_baseline) - [libjpeg v7/v8 only] Set default quantization tables with linear - q_scale_factor[] values (see below). + [libjpeg v7+ API/ABI emulation only] + Set default quantization tables with linear q_scale_factor[] values + (see below). jpeg_add_quant_table (j_compress_ptr cinfo, int which_tbl, const unsigned int *basic_table, @@ -976,8 +977,9 @@ JQUANT_TBL * quant_tbl_ptrs[NUM_QUANT_TBLS] slot 1 for chrominance. int q_scale_factor[NUM_QUANT_TBLS] - [libjpeg v7+ only] Linear quantization scaling factors (0-100, default - 100) for use with jpeg_default_qtables(). + [libjpeg v7+ API/ABI emulation only] + 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. Note that the q_scale_factor[] values use "linear" scales, so JPEG 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. -[libjpeg v7+ only] The actual dimensions of the JPEG image that will be written -to the file are given by the following fields. These are computed from the -input image dimensions and the compression parameters by jpeg_start_compress(). -You can also call jpeg_calc_jpeg_dimensions() to obtain the values that will -result from the current parameter settings. +[libjpeg v7+ API/ABI emulation only] +The actual dimensions of the JPEG image that will be written to the file are +given by the following fields. These are computed from the input image +dimensions and the compression parameters by jpeg_start_compress(). You can +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_height -- cgit v1.2.3