diff options
author | dcommander <dcommander@3789f03b-4d11-0410-bbf8-ca57d06f2519> | 2012-01-27 09:39:46 +0000 |
---|---|---|
committer | dcommander <dcommander@3789f03b-4d11-0410-bbf8-ca57d06f2519> | 2012-01-27 09:39:46 +0000 |
commit | 63712470eacf1054803e141deab058fde0acd796 (patch) | |
tree | 9e932c2fb9186f84109c3668ab6913f9ef162847 | |
parent | f227bbb8fe98bfd43f5eead6062d46871066e805 (diff) |
Move -arithmetic into "switches for advanced users"
git-svn-id: https://libjpeg-turbo.svn.sourceforge.net/svnroot/libjpeg-turbo@744 3789f03b-4d11-0410-bbf8-ca57d06f2519
-rw-r--r-- | trunk/cjpeg.1 | 14 | ||||
-rw-r--r-- | trunk/cjpeg.c | 6 | ||||
-rw-r--r-- | trunk/jpegtran.c | 6 |
3 files changed, 13 insertions, 13 deletions
diff --git a/trunk/cjpeg.1 b/trunk/cjpeg.1 index e4d95ee..d348964 100644 --- a/trunk/cjpeg.1 +++ b/trunk/cjpeg.1 @@ -1,4 +1,4 @@ -.TH CJPEG 1 "11 October 2010" +.TH CJPEG 1 "27 January 2012" .SH NAME cjpeg \- compress an image file to a JPEG file .SH SYNOPSIS @@ -150,6 +150,12 @@ about the same --- often a little smaller. .PP Switches for advanced users: .TP +.B \-arithmetic +Use arithmetic coding. +.B Caution: +arithmetic coded JPEG is not yet widely implemented, so many decoders will be +unable to view an arithmetic coded JPEG file at all. +.TP .B \-dct int Use integer DCT method (default). .TP @@ -214,12 +220,6 @@ visibly blur the image, however. .PP Switches for wizards: .TP -.B \-arithmetic -Use arithmetic coding. -.B Caution: -arithmetic coded JPEG is not yet widely implemented, so many decoders will be -unable to view an arithmetic coded JPEG file at all. -.TP .B \-baseline Force baseline-compatible quantization tables to be generated. This clamps quantization values to 8 bits even at low quality settings. (This switch is diff --git a/trunk/cjpeg.c b/trunk/cjpeg.c index 3daa259..fa306d3 100644 --- a/trunk/cjpeg.c +++ b/trunk/cjpeg.c @@ -164,6 +164,9 @@ usage (void) fprintf(stderr, " -targa Input file is Targa format (usually not needed)\n"); #endif fprintf(stderr, "Switches for advanced users:\n"); +#ifdef C_ARITH_CODING_SUPPORTED + fprintf(stderr, " -arithmetic Use arithmetic coding\n"); +#endif #ifdef DCT_ISLOW_SUPPORTED fprintf(stderr, " -dct int Use integer DCT method%s\n", (JDCT_DEFAULT == JDCT_ISLOW ? " (default)" : "")); @@ -184,9 +187,6 @@ usage (void) fprintf(stderr, " -outfile name Specify name for output file\n"); fprintf(stderr, " -verbose or -debug Emit debug output\n"); fprintf(stderr, "Switches for wizards:\n"); -#ifdef C_ARITH_CODING_SUPPORTED - fprintf(stderr, " -arithmetic Use arithmetic coding\n"); -#endif fprintf(stderr, " -baseline Force baseline quantization tables\n"); fprintf(stderr, " -qtables file Use quantization tables given in file\n"); fprintf(stderr, " -qslots N[,...] Set component quantization tables\n"); diff --git a/trunk/jpegtran.c b/trunk/jpegtran.c index f861464..9e49e44 100644 --- a/trunk/jpegtran.c +++ b/trunk/jpegtran.c @@ -78,14 +78,14 @@ usage (void) fprintf(stderr, " -trim Drop non-transformable edge blocks\n"); #endif fprintf(stderr, "Switches for advanced users:\n"); +#ifdef C_ARITH_CODING_SUPPORTED + fprintf(stderr, " -arithmetic Use arithmetic coding\n"); +#endif fprintf(stderr, " -restart N Set restart interval in rows, or in blocks with B\n"); fprintf(stderr, " -maxmemory N Maximum memory to use (in kbytes)\n"); fprintf(stderr, " -outfile name Specify name for output file\n"); fprintf(stderr, " -verbose or -debug Emit debug output\n"); fprintf(stderr, "Switches for wizards:\n"); -#ifdef C_ARITH_CODING_SUPPORTED - fprintf(stderr, " -arithmetic Use arithmetic coding\n"); -#endif #ifdef C_MULTISCAN_FILES_SUPPORTED fprintf(stderr, " -scans file Create multi-scan JPEG per script file\n"); #endif |