Merge commit '10ba6ed3365615ed5c2995fe2d240cb2d5000173'
* commit '10ba6ed3365615ed5c2995fe2d240cb2d5000173': (32 commits) Travis: Install MacPorts without using macports-ci Build: Set FLOATTEST more intelligently BUILDING.md: Use min. iOS v8 in iOS Armv8 example Fix build if WITH_12BIT==1 && WITH_JPEG(7|8)==1 Travis: Combine PPC/Arm tests with jpeg-7/8 tests Build: Fix test failures w/ Arm Neon SIMD exts Travis: Regression-test Armv8 and PPC SIMD exts Demote "fast" [I]DCT algorithms to legacy status jpegtran.c: "subarea" = "region" jpegtran.1: Minor formatting tweak transupp.c: Code formatting tweaks cdjpeg.h: Remove unused function stub Consistify formatting to simplify checkstyle README.ijg: Update URLs; remove Usenet info jversion.h: Update copyrights Build: Improve Arm 32-bit cross-comp./packaging "ARM"="Arm", "NEON"="Neon" Build: Fix permissions ChangeLog: Fix minor formatting issue ChangeLog.md: jpeg_crop_scanline(), not scanlines ...
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
* This file was part of the Independent JPEG Group's software:
|
||||
* Copyright (C) 1995-2010, Thomas G. Lane, Guido Vollbeding.
|
||||
* libjpeg-turbo Modifications:
|
||||
* Copyright (C) 2010, 2014, 2017, D. R. Commander.
|
||||
* Copyright (C) 2010, 2014, 2017, 2020, D. R. Commander.
|
||||
* mozjpeg Modifications:
|
||||
* Copyright (C) 2014, Mozilla Corporation.
|
||||
* For conditions of distribution and use, see the accompanying README file.
|
||||
@@ -75,7 +75,7 @@ usage(void)
|
||||
fprintf(stderr, " -fastcrush Disable progressive scan optimization\n");
|
||||
fprintf(stderr, "Switches for modifying the image:\n");
|
||||
#if TRANSFORMS_SUPPORTED
|
||||
fprintf(stderr, " -crop WxH+X+Y Crop to a rectangular subarea\n");
|
||||
fprintf(stderr, " -crop WxH+X+Y Crop to a rectangular region\n");
|
||||
fprintf(stderr, " -grayscale Reduce to grayscale (omit color data)\n");
|
||||
fprintf(stderr, " -flip [horizontal|vertical] Mirror image (left-right or top-bottom)\n");
|
||||
fprintf(stderr, " -perfect Fail if there is non-transformable edge blocks\n");
|
||||
|
||||
Reference in New Issue
Block a user