From 9c8659b3419b64209aed1edadc77a40d832b881b Mon Sep 17 00:00:00 2001 From: Cristy Date: Fri, 19 May 2017 20:05:03 -0400 Subject: [PATCH] ... --- MagickWand/compare.c | 27 +++++++++++++++++++++++++++ configure | 2 +- utilities/animate.1 | 2 +- utilities/compare.1 | 19 ++++++++++++++++++- utilities/compare.1.in | 4 ++++ utilities/composite.1 | 4 ++-- utilities/convert.1 | 14 +++++++------- utilities/display.1 | 2 +- utilities/import.1 | 2 +- utilities/magick-script.1 | 2 +- utilities/magick.1 | 2 +- utilities/mogrify.1 | 4 ++-- utilities/montage.1 | 4 ++-- 13 files changed, 68 insertions(+), 20 deletions(-) diff --git a/MagickWand/compare.c b/MagickWand/compare.c index 5dd5a1cef..af3e3bc1e 100644 --- a/MagickWand/compare.c +++ b/MagickWand/compare.c @@ -107,6 +107,7 @@ static MagickBooleanType CompareUsage(void) "-sigmoidal-contrast geometry", " increase the contrast without saturating highlights or", "-trim trim image edges", + "-write filename write images to this file", (char *) NULL }, *sequence_operators[]= @@ -173,6 +174,11 @@ static MagickBooleanType CompareUsage(void) " virtual pixel access method", "-write-mask filename associate a write mask with the image", (char *) NULL + }, + *stack_operators[]= + { + "-delete indexes delete the image from the image sequence", + (char *) NULL }; ListMagickVersion(stdout); @@ -187,6 +193,9 @@ static MagickBooleanType CompareUsage(void) (void) printf("\nImage Sequence Operators:\n"); for (p=sequence_operators; *p != (char *) NULL; p++) (void) printf(" %s\n",*p); + (void) printf("\nImage Stack Operators:\n"); + for (p=stack_operators; *p != (char *) NULL; p++) + (void) printf(" %s\n",*p); (void) printf("\nMiscellaneous Options:\n"); for (p=miscellaneous; *p != (char *) NULL; p++) (void) printf(" %s\n",*p); @@ -557,6 +566,17 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info, } break; } + if (LocaleCompare("delete",option+1) == 0) + { + if (*option == '+') + break; + i++; + if (i == (ssize_t) argc) + ThrowCompareException(OptionError,"MissingArgument",option); + if (IsSceneGeometry(argv[i],MagickFalse) == MagickFalse) + ThrowCompareInvalidArgumentException(option,argv[i]); + break; + } if (LocaleCompare("density",option+1) == 0) { if (*option == '+') @@ -1067,6 +1087,13 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info, } case 'w': { + if (LocaleCompare("write",option+1) == 0) + { + i++; + if (i == (ssize_t) argc) + ThrowCompareException(OptionError,"MissingArgument",option); + break; + } if (LocaleCompare("write-mask",option+1) == 0) { if (*option == '+') diff --git a/configure b/configure index ff7576acd..a35fc4508 100755 --- a/configure +++ b/configure @@ -4519,7 +4519,7 @@ MAGICK_PATCHLEVEL_VERSION=7 MAGICK_VERSION=7.0.5-7 -MAGICK_GIT_REVISION=20065:a5d49d1:20170516 +MAGICK_GIT_REVISION=20079:fa77e72:20170519 # Substitute library versioning diff --git a/utilities/animate.1 b/utilities/animate.1 index 456abc0fd..8d2d912e9 100644 --- a/utilities/animate.1 +++ b/utilities/animate.1 @@ -45,6 +45,7 @@ Image Settings: \-quiet suppress all warning messages \-regard-warnings pay attention to warning messages \-remote command execute a command in an remote display process + \-repage geometry size and location of an image canvas (operator) \-respect-parentheses settings remain in effect until parenthesis boundary \-sampling-factor geometry horizontal and vertical sampling factor @@ -68,7 +69,6 @@ Image Operators: \-crop geometry preferred size and location of the cropped image \-extract geometry extract area from image \-monochrome transform image to black and white - \-repage geometry size and location of an image canvas (operator) \-resample geometry change the resolution of an image \-resize geometry resize the image \-rotate degrees apply Paeth rotation to the image diff --git a/utilities/compare.1 b/utilities/compare.1 index abf0a6533..9e01178aa 100644 --- a/utilities/compare.1 +++ b/utilities/compare.1 @@ -11,8 +11,9 @@ For more information about the compare command, point your browser to file:///us .SH DESCRIPTION Image Settings: \-alpha option on, activate, off, deactivate, set, opaque, copy - \ transparent, extract, background, or shape + transparent, extract, background, or shape \-authenticate value decrypt image with this password + \-background color background color \-colorspace type alternate image colorspace \-compose operator set image composite operator \-compress type type of pixel compression when writing the image @@ -43,6 +44,7 @@ Image Settings: \-quantize colorspace reduce colors in this colorspace \-read-mask filename associate a read mask with the image \-regard-warnings pay attention to warning messages + \-repage geometry size and location of an image canvas \-respect-parentheses settings remain in effect until parenthesis boundary \-sampling-factor geometry horizontal and vertical sampling factor @@ -62,6 +64,21 @@ Image Settings: \-virtual-pixel method virtual pixel access method +Image Operators: + \-brightness-contrast geometry + improve brightness / contrast of the image + \-distort method args + distort images according to given method and args + \-level value adjust the level of image contrast + \-resize geometry resize the image + \-rotate degrees apply Paeth rotation to the image + \-sigmoidal-contrast geometry + lightness rescaling using sigmoidal contrast enhancement + \-trim trim image edges + +Image Sequence Operators: + \-crop geometry cut out a rectangular region of the image + Miscellaneous Options: \-channel mask set the image channel mask \-debug events display copious debugging information diff --git a/utilities/compare.1.in b/utilities/compare.1.in index 96415cab3..8cba1e503 100644 --- a/utilities/compare.1.in +++ b/utilities/compare.1.in @@ -78,6 +78,10 @@ Image Operators: Image Sequence Operators: \-crop geometry cut out a rectangular region of the image + \-write filename write images to this file + +Image Stack Operators: + \-delete indexes delete the image from the image sequence Miscellaneous Options: \-channel mask set the image channel mask diff --git a/utilities/composite.1 b/utilities/composite.1 index 5ed01a6c0..ab46fddc3 100644 --- a/utilities/composite.1 +++ b/utilities/composite.1 @@ -12,7 +12,7 @@ For more information about the composite command, point your browser to file:/// Image Settings: \-affine matrix affine transform matrix \-alpha option on, activate, off, deactivate, set, opaque, copy - \ transparent, extract, background, or shape + transparent, extract, background, or shape \-authenticate value decrypt image with this password \-blue-primary point chromaticity blue primary point \-colorspace type alternate image colorspace @@ -47,6 +47,7 @@ Image Settings: \-quiet suppress all warning messages \-red-primary point chromaticity red primary point \-regard-warnings pay attention to warning messages + \-repage geometry size and location of an image canvas (operator) \-respect-parentheses settings remain in effect until parenthesis boundary \-sampling-factor geometry horizontal and vertical sampling factor @@ -82,7 +83,6 @@ Image Operators: \-negate replace each pixel with its complementary color \-profile filename add ICM or IPTC information profile to image \-quantize colorspace reduce colors in this colorspace - \-repage geometry size and location of an image canvas (operator) \-rotate degrees apply Paeth rotation to the image \-resize geometry resize the image \-sharpen geometry sharpen the image diff --git a/utilities/convert.1 b/utilities/convert.1 index 738360bd2..75345a5fd 100644 --- a/utilities/convert.1 +++ b/utilities/convert.1 @@ -59,10 +59,10 @@ Image Settings: \-intent type type of rendering intent when managing the image color \-interlace type type of image interlacing scheme \-interline-spacing value - \ set the space between two text lines + set the space between two text lines \-interpolate method pixel color interpolation method \-interword-spacing value - \ set the space between two words + set the space between two words \-kerning value set the space between two letters \-label string assign a label to an image \-limit type value pixel cache resource limit @@ -84,6 +84,7 @@ Image Settings: \-red-primary point chromaticity red primary point \-regard-warnings pay attention to warning messages \-remap filename transform image colors to match this set of colors + \-repage geometry size and location of an image canvas \-respect-parentheses settings remain in effect until parenthesis boundary \-sampling-factor geometry horizontal and vertical sampling factor @@ -133,7 +134,7 @@ Image Operators: \-blur geometry reduce image noise and reduce detail levels \-border geometry surround image with a border of color \-brightness-contrast geometry - \ improve brightness / contrast of the image + improve brightness / contrast of the image \-canny geometry detect edges in the image \-channel mask set the image channel mask \-charcoal radius simulate a charcoal drawing @@ -155,7 +156,7 @@ Image Operators: \-deskew threshold straighten an image \-despeckle reduce the speckles within an image \-distort method args - \ distort images according to given method ad args + distort images according to given method and args \-draw string annotate the image with a graphic primitive \-edge radius apply a filter to detect edges in the image \-emboss radius emboss an image @@ -186,7 +187,7 @@ Image Operators: \-layers method optimize or compare image layers \-level value adjust the level of image contrast \-level-colors color,color - \ level image with the given colors + level image with the given colors \-linear-stretch geometry improve contrast by `stretching with saturation' the intensity range \-liquid-rescale geometry @@ -220,7 +221,6 @@ Image Operators: random threshold the image \-region geometry apply options to a portion of the image \-render render vector graphics - \-repage geometry size and location of an image canvas \-resample geometry change the resolution of an image \-resize geometry resize the image \-roll geometry roll an image vertically or horizontally @@ -243,7 +243,7 @@ Image Operators: \-sketch geometry simulate a pencil sketch \-solarize threshold negate all pixels above the threshold level \-sparse-color method args - \ fill in a image based on a few color points + fill in a image based on a few color points \-splice geometry splice the background color into the image \-spread amount displace image pixels by a random amount \-strip strip image of all profiles and comments diff --git a/utilities/display.1 b/utilities/display.1 index 24945d92a..31d6b0635 100644 --- a/utilities/display.1 +++ b/utilities/display.1 @@ -11,7 +11,7 @@ For more information about the display command, point your browser to file:///us .SH DESCRIPTION Image Settings: \-alpha option on, activate, off, deactivate, set, opaque, copy - \ transparent, extract, background, or shape + transparent, extract, background, or shape \-antialias remove pixel-aliasing \-authenticate value decrypt image with this password \-backdrop display image centered on a backdrop diff --git a/utilities/import.1 b/utilities/import.1 index e4bc9b50f..8d7f7852c 100644 --- a/utilities/import.1 +++ b/utilities/import.1 @@ -43,6 +43,7 @@ Image Settings: \-quality value JPEG/MIFF/PNG compression level \-quiet suppress all warning messages \-regard-warnings pay attention to warning messages + \-repage geometry size and location of an image canvas \-respect-parentheses settings remain in effect until parenthesis boundary \-sampling-factor geometry horizontal and vertical sampling factor @@ -73,7 +74,6 @@ Image Operators: \-help print program options \-monochrome transform image to black and white \-negate replace each pixel with its complementary color - \-repage geometry size and location of an image canvas \-quantize colorspace reduce colors in this colorspace \-resize geometry resize the image \-rotate degrees apply Paeth rotation to the image diff --git a/utilities/magick-script.1 b/utilities/magick-script.1 index 30f46a1b5..7404f2243 100644 --- a/utilities/magick-script.1 +++ b/utilities/magick-script.1 @@ -73,6 +73,7 @@ Image Settings: \-quiet suppress all warning messages \-red-primary point chromaticity red primary point \-regard-warnings pay attention to warning messages + \-repage geometry size and location of an image canvas \-sampling-factor geometry horizontal and vertical sampling factor \-scene value image scene number @@ -185,7 +186,6 @@ Image Operators: random threshold the image \-region geometry apply options to a portion of the image \-render render vector graphics - \-repage geometry size and location of an image canvas \-resample geometry change the resolution of an image \-resize geometry resize the image \-roll geometry roll an image vertically or horizontally diff --git a/utilities/magick.1 b/utilities/magick.1 index 021c258f1..24dd3d321 100644 --- a/utilities/magick.1 +++ b/utilities/magick.1 @@ -70,6 +70,7 @@ Image Settings: \-quiet suppress all warning messages \-red-primary point chromaticity red primary point \-regard-warnings pay attention to warning messages + \-repage geometry size and location of an image canvas \-sampling-factor geometry horizontal and vertical sampling factor \-scene value image scene number @@ -182,7 +183,6 @@ Image Operators: random threshold the image \-region geometry apply options to a portion of the image \-render render vector graphics - \-repage geometry size and location of an image canvas \-resample geometry change the resolution of an image \-resize geometry resize the image \-roll geometry roll an image vertically or horizontally diff --git a/utilities/mogrify.1 b/utilities/mogrify.1 index 7ac57fc95..274b2a7d1 100644 --- a/utilities/mogrify.1 +++ b/utilities/mogrify.1 @@ -83,6 +83,7 @@ Image Settings: \-red-primary point chromaticity red primary point \-regard-warnings pay attention to warning messages \-remap filename transform image colors to match this set of colors + \-repage geometry size and location of an image canvas \-respect-parentheses settings remain in effect until parenthesis boundary \-sampling-factor geometry horizontal and vertical sampling factor @@ -153,7 +154,7 @@ Image Operators: \-deskew threshold straighten an image \-despeckle reduce the speckles within an image \-distort method args - distort images according to given method ad args + distort images according to given method and args \-draw string annotate the image with a graphic primitive \-edge radius apply a filter to detect edges in the image \-emboss radius emboss an image @@ -217,7 +218,6 @@ Image Operators: random threshold the image \-region geometry apply options to a portion of the image \-render render vector graphics - \-repage geometry size and location of an image canvas \-resample geometry change the resolution of an image \-resize geometry resize the image \-roll geometry roll an image vertically or horizontally diff --git a/utilities/montage.1 b/utilities/montage.1 index 3fb97f43c..f812497e6 100644 --- a/utilities/montage.1 +++ b/utilities/montage.1 @@ -13,7 +13,7 @@ Image Settings: \-adjoin join images into a single multi-image file \-affine matrix affine transform matrix \-alpha option on, activate, off, deactivate, set, opaque, copy - \ transparent, extract, background, or shape + transparent, extract, background, or shape \-authenticate value decrypt image with this password \-blue-primary point chromaticity blue primary point \-bordercolor color border color @@ -60,6 +60,7 @@ Image Settings: \-quiet suppress all warning messages \-red-primary point chromaticity red primary point \-regard-warnings pay attention to warning messages + \-repage geometry size and location of an image canvas (operator) \-respect-parentheses settings remain in effect until parenthesis boundary \-sampling-factor geometry horizontal and vertical sampling factor @@ -103,7 +104,6 @@ Image Operators: \-frame geometry surround image with an ornamental border \-monochrome transform image to black and white \-polaroid angle simulate a Polaroid picture - \-repage geometry size and location of an image canvas (operator) \-resize geometry resize the image \-rotate degrees apply Paeth rotation to the image \-scale geometry scale the image -- 2.50.1