From: cristy Date: Tue, 11 Nov 2014 15:51:46 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~1747 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3b8891ec76991448a9995f6c2bbda51582942cee;p=imagemagick --- diff --git a/MagickCore/version.h b/MagickCore/version.h index a5119535c..fabe97a1b 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,7 +27,7 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2014 ImageMagick Studio LLC" -#define MagickSVNRevision "16921:16940M" +#define MagickSVNRevision "17017:17027" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 1,0,0 @@ -48,7 +48,7 @@ extern "C" { #define MagickppLibAddendum "-0" #define MagickppLibInterface 1 #define MagickppLibMinInterface 1 -#define MagickReleaseDate "2014-11-04" +#define MagickReleaseDate "2014-11-11" #define MagickChangeDate "20120427" #define MagickAuthoritativeURL "http://www.imagemagick.org" #define MagickFeatures "DPC HDRI OpenMP" diff --git a/configure b/configure index f02995afc..d9e4b9ad0 100755 --- a/configure +++ b/configure @@ -3703,7 +3703,7 @@ MAGICK_PATCHLEVEL_VERSION=0 MAGICK_VERSION=7.0.0-0 -MAGICK_SVN_REVISION=16921:16940M +MAGICK_SVN_REVISION=17017:17027 # Substitute library versioning diff --git a/utilities/composite.1 b/utilities/composite.1 index d250cf045..446b27faf 100644 --- a/utilities/composite.1 +++ b/utilities/composite.1 @@ -15,7 +15,6 @@ Image Settings: \ transparent, extract, background, or shape \-authenticate value decrypt image with this password \-blue-primary point chromaticity blue primary point - \-channel type apply option to select image channels \-colorspace type alternate image colorspace \-comment string annotate image with comment \-compose operator composite operator @@ -71,6 +70,7 @@ Image Operators: \-blend geometry blend images \-border geometry surround image with a border of color \-bordercolor color border color + \-channel mask set the image channel mask \-colors value preferred number of colors in the image \-displace geometry shift image pixels defined by a displacement map \-dissolve value dissolve the two images a given percent diff --git a/utilities/convert.1 b/utilities/convert.1 index f56fc7408..9bb1e1de7 100644 --- a/utilities/convert.1 +++ b/utilities/convert.1 @@ -24,7 +24,6 @@ Image Settings: \-bordercolor color border color \-caption string assign a caption to an image \-cdl filename color correct with a color decision list - \-channel type apply option to select image channels \-clip clip along the first path from the 8BIM profile \-clip-mask filename associate a clip mask with the image \-clip-path id clip along a named path from the 8BIM profile @@ -136,6 +135,7 @@ Image Operators: \-brightness-contrast geometry \ 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 \-chop geometry remove pixels from the image interior \-clamp keep pixel values in range (0-QuantumRange) diff --git a/utilities/display.1 b/utilities/display.1 index 9d3dcd65c..a8ff9eaeb 100644 --- a/utilities/display.1 +++ b/utilities/display.1 @@ -15,7 +15,6 @@ Image Settings: \-antialias remove pixel-aliasing \-authenticate value decrypt image with this password \-backdrop display image centered on a backdrop - \-channel type apply option to select image channels \-colormap type Shared or Private \-colorspace type alternate image colorspace \-comment string annotate image with comment @@ -79,6 +78,7 @@ Image Settings: Image Operators: \-auto-orient automatically orient image \-border geometry surround image with a border of color + \-channel mask set the image channel mask \-clip clip along the first path from the 8BIM profile \-clip-path id clip along a named path from the 8BIM profile \-colors value preferred number of colors in the image diff --git a/utilities/identify.1 b/utilities/identify.1 index aeabf02a8..27ab50498 100644 --- a/utilities/identify.1 +++ b/utilities/identify.1 @@ -14,7 +14,6 @@ Image Settings: transparent, extract, background, or shape \-antialias remove pixel-aliasing \-authenticate value decrypt image with this password - \-channel type apply option to select image channels \-clip clip along the first path from the 8BIM profile \-clip-mask filename associate a clip mask with the image \-clip-path id clip along a named path from the 8BIM profile @@ -58,6 +57,7 @@ Image Settings: virtual pixel access method Image Operators: + \-channel mask set the image channel mask \-grayscale method convert image to grayscale \-negate replace each pixel with its complementary color diff --git a/utilities/import.1 b/utilities/import.1 index dad9ba1dd..56d3313f3 100644 --- a/utilities/import.1 +++ b/utilities/import.1 @@ -12,7 +12,6 @@ For more information about the import command, point your browser to file:///usr Image Settings: \-adjoin join images into a single multi-image file \-border include window border in the output image - \-channel type apply option to select image channels \-colorspace type alternate image colorspace \-comment string annotate image with comment \-compress type type of pixel compression when writing the image @@ -67,6 +66,7 @@ Image Settings: Image Operators: \-annotate geometry text annotate the image with text + \-channel mask set the image channel mask \-colors value preferred number of colors in the image \-crop geometry preferred size and location of the cropped image \-geometry geometry preferred size or location of the image diff --git a/utilities/mogrify.1 b/utilities/mogrify.1 index deb904eed..c21fcfc86 100644 --- a/utilities/mogrify.1 +++ b/utilities/mogrify.1 @@ -23,7 +23,6 @@ Image Settings: \-bordercolor color border color \-caption string assign a caption to an image \-cdl filename color correct with a color decision list - \-channel type apply option to select image channels \-colors value preferred number of colors in the image \-colorspace type alternate image colorspace \-comment string annotate image with comment @@ -134,6 +133,7 @@ Image Operators: \-brightness-contrast geometry 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 \-chop geometry remove pixels from the image interior \-clamp keep pixel values in range (0-QuantumRange) diff --git a/utilities/montage.1 b/utilities/montage.1 index 624f71b6e..918538013 100644 --- a/utilities/montage.1 +++ b/utilities/montage.1 @@ -18,7 +18,6 @@ Image Settings: \-blue-primary point chromaticity blue primary point \-bordercolor color border color \-caption string assign a caption to an image - \-channel type apply option to select image channels \-colors value preferred number of colors in the image \-colorspace type alternate image colorsapce \-comment string annotate image with comment @@ -95,6 +94,7 @@ Image Operators: \-auto-orient automagically orient image \-blur geometry reduce image noise and reduce detail levels \-border geometry surround image with a border of color + \-channel mask set the image channel mask \-crop geometry preferred size and location of the cropped image \-extent geometry set the image size \-flatten flatten a sequence of images diff --git a/utilities/stream.1 b/utilities/stream.1 index fbcb80bae..668866d63 100644 --- a/utilities/stream.1 +++ b/utilities/stream.1 @@ -11,7 +11,6 @@ For more information about the stream command, point your browser to file:///usr .SH DESCRIPTION Image Settings: \-authenticate value decrypt image with this password - \-channel type apply option to select image channels \-colorspace type alternate image colorspace \-compress type type of pixel compression when writing the image \-define format:option @@ -44,6 +43,7 @@ Image Settings: virtual pixel access method Miscellaneous Options: + \-channel mask set the image channel mask \-debug events display copious debugging information \-help print program options \-log format format of debugging information