summaryrefslogtreecommitdiff
path: root/jpegtran.c
diff options
context:
space:
mode:
authorhbono@chromium.org <hbono@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>2012-05-11 07:46:03 +0000
committerhbono@chromium.org <hbono@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>2012-05-11 07:46:03 +0000
commitdf5ffdd8b73415b78055177148995bdbdf38b12e (patch)
tree576b26685c24f24fd6aa83dda76529fde0c30ca1 /jpegtran.c
parentd1fe352415daa951ba28e4ef81bfa6a727104f5e (diff)
Update libjpeg-turbo.
This change updates our copy of libjpeg-turbo to r829. BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/10386084 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@136524 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Diffstat (limited to 'jpegtran.c')
-rw-r--r--jpegtran.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/jpegtran.c b/jpegtran.c
index f861464..6a22ed2 100644
--- a/jpegtran.c
+++ b/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
@@ -204,9 +204,9 @@ parse_switches (j_compress_ptr cinfo, int argc, char **argv,
if (! printed_version) {
fprintf(stderr, "%s version %s (build %s)\n",
PACKAGE_NAME, VERSION, BUILD);
- fprintf(stderr, "%s\n\n", LJTCOPYRIGHT);
- fprintf(stderr, "Based on Independent JPEG Group's libjpeg, version %s\n%s\n\n",
- JVERSION, JCOPYRIGHT);
+ fprintf(stderr, "%s\n\n", JCOPYRIGHT);
+ fprintf(stderr, "Emulating The Independent JPEG Group's libjpeg, version %s\n\n",
+ JVERSION);
printed_version = TRUE;
}
cinfo->err->trace_level++;