From: Cristy Date: Fri, 17 Jun 2016 19:37:28 +0000 (-0400) Subject: ... X-Git-Tag: 7.0.2-1~17 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=912a922489051113e98fce817e14ebf2161947e7;p=imagemagick ... --- diff --git a/index.html b/index.html index dbe6d40d5..51d373948 100644 --- a/index.html +++ b/index.html @@ -5,8 +5,10 @@ - ImageMagick: Convert, Edit, Or Compose Bitmap Images + + + @@ -19,11 +21,13 @@ - + + + @@ -209,7 +213,8 @@ ImageMagickNews

Now that ImageMagick version 7 is released, we continue to maintain the legacy release of ImageMagick, version 6, at https://legacy.imagemagick.org.

-

ImageMagick best practices strongly encourages you to configure a policy that suits your local environment.

+ +

ImageMagick best practices strongly encourages you to configure a security policy that suits your local environment.

Community

To join the ImageMagick community, try the discourse server. You can review questions or comments (with informed responses) posed by ImageMagick users or ask your own questions. If you want to contribute image processing algorithms, other enhancements, or bug fixes, open an issue.

@@ -232,4 +237,4 @@ ImageMagick - ImageMagick: Install the ImageMagickObject COM+ Component + + + @@ -19,11 +21,13 @@ - + + + @@ -61,7 +65,7 @@

ImageMagick provides a statically-built ImageMagick object as part of its Windows installation package. When this package is installed, ImageMagickObject and its sample programs are installed to this path:

-  c:\Program Files\ImageMagick-7.0.1-Q16\ImageMagickObject
+  c:\Program Files\ImageMagick-7.0.2-Q16\ImageMagickObject
 

The ImageMagickObject is registered if the checkbox, Register ImageMagickObject, is checked at install time.

@@ -124,4 +128,3 @@ regsvr32 /u /s ImageMagickObject.dll - \ No newline at end of file diff --git a/www/Magick++/Documentation.html b/www/Magick++/Documentation.html index 7d75920ce..74179ae61 100644 --- a/www/Magick++/Documentation.html +++ b/www/Magick++/Documentation.html @@ -9,7 +9,7 @@

-

Magick++ provides a simple C++ API to the ImageMagick image processing library which supports reading and writing a huge number of image formats as well as supporting a broad spectrum of traditional image processing operations. The ImageMagick C API is complex and the data structures are currently not documented. Magick++ provides access to most of the features available from the C API but in a simple object-oriented and well-documented framework.

+

Magick++ provides a simple C++ API to the ImageMagick image processing library which supports reading and writing a huge number of image formats as well as supporting a broad spectrum of traditional image processing operations. The ImageMagick C API is complex and the data structures are currently not documented. Magick++ provides access to most of the features available from the C API but in a simple object-oriented and well-documented framework.

Magick++ is intended to support commercial-grade application development. In order to avoid possible conflicts with the user's application, all symbols contained in Magick++ (included by the header <Magick++.h>) are scoped to the namespace Magick. Symbols from the ImageMagick C library are imported under the MagickCore namespace to avoid possible conflicts and ImageMagick macros are only included within the Magick++ implementation so they won't impact the user's application.

The core class in Magick++ is the Image class. The Image class provides methods to manipulate a single image frame (e.g. a JPEG image). Standard Template Library (STL)compatible algorithms and function objects are provided in order to manipulate multiple image frames or to read and write file formats which support multiple image frames (e.g. GIF animations, MPEG animations, and Postscript files).

The Image class supports reference-counted memory management which supports the semantics of an intrinsic variable type (e.g. 'int') with an extremely efficient operator = and copy constructor (only a pointer is assigned) while ensuring that the image data is replicated as required so that it the image may be modified without impacting earlier generations. Since the Image class manages heap memory internally, images are best allocated via C++ automatic (stack-based) memory allocation. This support allows most programs using Magick++ to be written without using any pointers, simplifying the implementation and avoiding the risks of using pointers. When a program uses automatic memory allocation to allocate Magick++ images, that aspect of the program becomes naturally exception-safe and thread-safe.

diff --git a/www/Magick++/Enumerations.html b/www/Magick++/Enumerations.html index 87a0fc05e..2182b2c74 100644 --- a/www/Magick++/Enumerations.html +++ b/www/Magick++/Enumerations.html @@ -240,7 +240,7 @@ storage class. that quantization (color reduction and mapping) is done under or to specify the colorspace when encoding an output image. Colorspaces are ways of describing colors to fit the requirements of a particular -application (e.g. Television, offset printing, color monitors).  +application (e.g. Television, offset printing, color monitors). Color reduction, by default, takes place in the RGBColorspace. Empirical evidence suggests that distances in color spaces such as YUVColorspace or YIQColorspace correspond to perceptual @@ -287,7 +287,7 @@ Photoshop bitmap (PSD) files.

GRAYColorspace

-

 Grayscale colorspace

+

Grayscale colorspace

@@ -295,7 +295,7 @@ Photoshop bitmap (PSD) files.

HCLColorspace

-

 

+

@@ -303,7 +303,7 @@ Photoshop bitmap (PSD) files.

LabColorspace

-

 

+

@@ -311,7 +311,7 @@ Photoshop bitmap (PSD) files.

LCHabColorspace

-

 

+

@@ -319,7 +319,7 @@ Photoshop bitmap (PSD) files.

LuvColorspace

-

 

+

@@ -327,7 +327,7 @@ Photoshop bitmap (PSD) files.

OHTAColorspace

-

 

+

@@ -343,7 +343,7 @@ Photoshop bitmap (PSD) files.

sRGBColorspace

-

 

+

@@ -351,7 +351,7 @@ Photoshop bitmap (PSD) files.

scRGBColorspace

-

 

+

@@ -368,7 +368,7 @@ Photoshop bitmap (PSD) files.

XYZColorspace

-

 

+

@@ -376,7 +376,7 @@ Photoshop bitmap (PSD) files.

YCbCrColorspace

-

 

+

@@ -384,7 +384,7 @@ Photoshop bitmap (PSD) files.

YCCColorspace

-

 

+

@@ -392,7 +392,7 @@ Photoshop bitmap (PSD) files.

YIQColorspace

-

 

+

@@ -400,7 +400,7 @@ Photoshop bitmap (PSD) files.

YPbPrColorspace

-

 

+

@@ -504,7 +504,7 @@ Specify CompositeOperator to select a different algorithm.

PlusCompositeOp

-

The result is just the sum of the  image data. Output +

The result is just the sum of the image data. Output values are cropped to 255 (no overflow). This operation is independent of the matte channels.

@@ -552,7 +552,7 @@ Specify CompositeOperator to select a different algorithm.

MultiplyCompositeOp

-

 

+

@@ -616,7 +616,7 @@ Specify CompositeOperator to select a different algorithm. mask which represents a sort of a cookie-cutter for the image. This is the case when matte is 255 (full coverage) for pixels inside the shape, zero outside, and between zero and 255 on the - boundary.  For certain operations, if image does not + boundary. For certain operations, if image does not have a matte channel, it is initialized with 0 for any pixel matching in color to pixel location (0,0), otherwise 255 (to work properly borderWidth must be 0).

@@ -627,7 +627,7 @@ Specify CompositeOperator to select a different algorithm.

ClearCompositeOp

-

 

+

@@ -635,7 +635,7 @@ Specify CompositeOperator to select a different algorithm.

DissolveCompositeOp

-

 

+

@@ -643,7 +643,7 @@ Specify CompositeOperator to select a different algorithm.

DisplaceCompositeOp

-

 

+

@@ -651,7 +651,7 @@ Specify CompositeOperator to select a different algorithm.

ModulateCompositeOp

-

 

+

@@ -659,7 +659,7 @@ Specify CompositeOperator to select a different algorithm.

ThresholdCompositeOp

-

 

+

@@ -711,7 +711,7 @@ with the image type.

BZip (Burrows-Wheeler block-sorting text compression algorithm - and Huffman coding)  as used by bzip2 utilities

+ and Huffman coding) as used by bzip2 utilities

@@ -882,7 +882,7 @@ TIFF).

FillRule specifies the algorithm which is to be used to determine what parts of the canvas are -included inside the shape. See the documentation on SVG's fill-rule  +included inside the shape. See the documentation on SVG's fill-rule property for usage details.

FillRule

@@ -2000,7 +2000,7 @@ Quantums

-


  +


diff --git a/www/Magick++/Image++.html b/www/Magick++/Image++.html index f03856e9c..4940c7a52 100644 --- a/www/Magick++/Image++.html +++ b/www/Magick++/Image++.html @@ -1260,9 +1260,9 @@ values and type_ parameters. diff --git a/www/Magick++/Image.html b/www/Magick++/Image.html index 8257f8f17..2060125a6 100644 --- a/www/Magick++/Image.html +++ b/www/Magick++/Image.html @@ -1260,9 +1260,9 @@ values and type_ parameters. diff --git a/www/Magick++/Montage.html b/www/Magick++/Montage.html index b2a234a40..cb6ff91d0 100644 --- a/www/Magick++/Montage.html +++ b/www/Magick++/Montage.html @@ -11,12 +11,12 @@

Magick::Montage Class

A montage is a single image which is composed of thumbnail images composed in a uniform grid. The size of the montage image is determined by the size of the individual thumbnails and the number of rows and columns in the grid.

The following illustration shows a montage consisting of three columns and two rows of thumbnails rendered on a gray background:

-

+

Montages may be either "plain" (undecorated thumbnails) or "framed" (decorated thumbnails). In order to more easily understand the options supplied to MontageImages(), montage options are supplied by two different classes: Magick::Montage and Magick::MontageFramed.

Plain Montages

Magick::Montage is the base class to provide montage options and provides methods to set all options required to render simple (unframed) montages. See Magick::MontageFramedif you would like to create a framed montage.

Unframed thumbnails consist of four components: the thumbnail image, the thumbnail border, an optional thumbnail shadow, and an optional thumbnail label area.

-

+

Montage Methods

    Random threshold the image. Changes the value of individual pixels based on the intensity of -each pixel compared to a random threshold.  The result is a -low-contrast, two color image.  The thresholds_ argument is a -geometry containing LOWxHIGH thresholds.  If the string contains +each pixel compared to a random threshold. The result is a +low-contrast, two color image. The thresholds_ argument is a +geometry containing LOWxHIGH thresholds. If the string contains 2x2, 3x3, or 4x4, then an ordered dither of order 2, 3, or 4 will be performed instead. This is a very fast alternative to 'quantize' based dithering.
    @@ -3064,7 +3064,7 @@ alpha channel.
    Returns a pointer to the Image pixel indexes corresponding to the pixel region requested by the last getConstPixels , getPixels -, or setPixels call. setPixels call. The returned pointer remains valid until the next getPixel, getConstPixels, or setPixels call and should never be deallocated by the user.colorMap )  for that pixel. For +(see colorMap ) for that pixel. For CMYKA images, the indexes are used to contain the alpha channel.
    Random threshold the image. Changes the value of individual pixels based on the intensity of -each pixel compared to a random threshold.  The result is a -low-contrast, two color image.  The thresholds_ argument is a -geometry containing LOWxHIGH thresholds.  If the string contains +each pixel compared to a random threshold. The result is a +low-contrast, two color image. The thresholds_ argument is a +geometry containing LOWxHIGH thresholds. If the string contains 2x2, 3x3, or 4x4, then an ordered dither of order 2, 3, or 4 will be performed instead. This is a very fast alternative to 'quantize' based dithering.
    @@ -3064,7 +3064,7 @@ alpha channel.
    Returns a pointer to the Image pixel indexes corresponding to the pixel region requested by the last getConstPixels , getPixels -, or setPixels call. setPixels call. The returned pointer remains valid until the next getPixel, getConstPixels, or setPixels call and should never be deallocated by the user.colorMap )  for that pixel. For +(see colorMap ) for that pixel. For CMYKA images, the indexes are used to contain the alpha channel.
    diff --git a/www/advanced-unix-installation.html b/www/advanced-unix-installation.html index fde54f5c6..85ed7288d 100644 --- a/www/advanced-unix-installation.html +++ b/www/advanced-unix-installation.html @@ -5,8 +5,10 @@ - ImageMagick: Advanced Unix Source Installation + + + @@ -19,11 +21,13 @@ - + + + @@ -73,7 +77,7 @@ tar xvzf ImageMagick.tar.gz

    The configure script looks at your environment and decides what it can cobble together to get ImageMagick compiled and installed on your system. This includes finding a compiler, where your compiler header files are located (e.g. stdlib.h), and if any delegate libraries are available for ImageMagick to use (e.g. JPEG, PNG, TIFF, etc.). If you are willing to accept configure's default options, and build from within the source directory, you can simply type:

    -
     cd ImageMagick-7.0.1-7 ./configure
    +
     cd ImageMagick-7.0.2-0 ./configure

    Watch the configure script output to verify that it finds everything that you think it should. Pay particular attention to the last lines of the script output. For example, here is a recent report from our system:

    @@ -503,7 +507,7 @@ rpmbuild --rebuild ImageMagick.src.rpm

    After the build you, locate the RPMS folder and install the ImageMagick binary RPM distribution:

    -
     rpm -ivh ImageMagick-7.0.1-?.*.rpm
    +
     rpm -ivh ImageMagick-7.0.2-?.*.rpm

    Mac OS X-specific Build instructions

    Perform these steps as an administrator or with the sudo command:

    @@ -530,7 +534,7 @@ sudo port install jpeg

    Download the ImageMagick source distribution and verify the distribution against its message digest.

    Unpack and change into the top-level ImageMagick directory:

    -
     tar xvzf ImageMagick-7.0.1-7.tar.gz cd ImageMagick-7.0.1-7

    Configure ImageMagick:

    +
     tar xvzf ImageMagick-7.0.2-0.tar.gz cd ImageMagick-7.0.2-0

    Configure ImageMagick:

     ./configure --prefix=/opt --with-quantum-depth=16 \
       --disable-dependency-tracking --with-x=yes \
    @@ -562,7 +566,7 @@ display -display :0
     
     

    Although you can download and install delegate libraries yourself, many are already available in the GnuWin32 distribution. Download and install whichever delegate libraries you require such as JPEG, PNG, TIFF, etc. Make sure you specify the development headers when you install a package. Next type,

    -
     tar jxvf ImageMagick-7.0.1-?.tar.bz2
    cd ImageMagick-7.0.1-7
    export CPPFLAGS="-Ic:/Progra~1/GnuWin32/include"
    export LDFLAGS="-Lc:/Progra~1/GnuWin32/lib"
    ./configure --without-perl
    make
    sudo make install
    +
     tar jxvf ImageMagick-7.0.2-?.tar.bz2
    cd ImageMagick-7.0.2-0
    export CPPFLAGS="-Ic:/Progra~1/GnuWin32/include"
    export LDFLAGS="-Lc:/Progra~1/GnuWin32/lib"
    ./configure --without-perl
    make
    sudo make install

    Dealing with Unexpected Problems

    Chances are the download, configure, build, and install of ImageMagick went flawlessly as it is intended, however, certain systems and environments may cause one or more steps to fail. We discuss a few problems we've run across and how to take corrective action to ensure you have a working release of ImageMagick

    @@ -631,4 +635,3 @@ identify -list format - \ No newline at end of file diff --git a/www/advanced-windows-installation.html b/www/advanced-windows-installation.html index feddbe104..f41fa11a7 100644 --- a/www/advanced-windows-installation.html +++ b/www/advanced-windows-installation.html @@ -5,8 +5,10 @@ - ImageMagick: Advanced Windows Source Installation + + + @@ -19,11 +21,13 @@ - + + + @@ -326,7 +330,7 @@ dmake release
    1. Double-click on - VisualMagick/bin/ImageMagick-7.0.1-7-Q16-windows-dll.exe + VisualMagick/bin/ImageMagick-7.0.2-0-Q16-windows-dll.exe to launch the ImageMagick binary distribution.
    2. Complete the installer screens to install ImageMagick on your system.
    @@ -395,4 +399,3 @@ _MAGICKMOD_ - \ No newline at end of file diff --git a/www/animate.html b/www/animate.html index ebd229542..f496f5eec 100644 --- a/www/animate.html +++ b/www/animate.html @@ -5,8 +5,10 @@ - ImageMagick: Command-line Tools: Animate + + + @@ -19,11 +21,13 @@ - + + + @@ -526,4 +530,3 @@ transparent, extract, background, or shape the alpha channel - \ No newline at end of file diff --git a/www/api.html b/www/api.html index 30dd379cd..a39516e7d 100644 --- a/www/api.html +++ b/www/api.html @@ -5,8 +5,10 @@ - ImageMagick: Application Program Interfaces + + + @@ -19,11 +21,13 @@ - + + + @@ -174,4 +178,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/www/api/Image++.html b/www/api/Image++.html index 8f595a21d..a6db16ce7 100644 --- a/www/api/Image++.html +++ b/www/api/Image++.html @@ -5,8 +5,10 @@ - ImageMagick: Magick++, C++ API for ImageMagick: Image Class + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/animate.html b/www/api/animate.html index f44992d57..3850789b0 100644 --- a/www/api/animate.html +++ b/www/api/animate.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Interactively Animate an Image Sequence + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/annotate.html b/www/api/annotate.html index fe4cc3748..d15b176bc 100644 --- a/www/api/annotate.html +++ b/www/api/annotate.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Annotate an Image + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/attribute.html b/www/api/attribute.html index 9c4e44a3e..f416ce81c 100644 --- a/www/api/attribute.html +++ b/www/api/attribute.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Set Text Attributes + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/blob.html b/www/api/blob.html index c298099aa..e4f38b685 100644 --- a/www/api/blob.html +++ b/www/api/blob.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Read or Write Binary Large OBjects + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/cache-view.html b/www/api/cache-view.html index 8cab135f0..36b039168 100644 --- a/www/api/cache-view.html +++ b/www/api/cache-view.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Cache Views + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/cache.html b/www/api/cache.html index 5ad45ee47..a2d758c29 100644 --- a/www/api/cache.html +++ b/www/api/cache.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Get or Set Image Pixels + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/channel.html b/www/api/channel.html index ac442b5ed..b1be936cb 100644 --- a/www/api/channel.html +++ b/www/api/channel.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Get or Set Image Channels + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/cipher.html b/www/api/cipher.html index 6ed1cdf01..2fde9aa13 100644 --- a/www/api/cipher.html +++ b/www/api/cipher.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Convert to and from Cipher Pixels + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/color.html b/www/api/color.html index 4d2e8db26..725acf32e 100644 --- a/www/api/color.html +++ b/www/api/color.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Count the Colors in an Image + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/colormap.html b/www/api/colormap.html index 3bb63b57c..dc59b033b 100644 --- a/www/api/colormap.html +++ b/www/api/colormap.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Colormap Methods + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/colorspace.html b/www/api/colorspace.html index 97a4170f1..964854f4b 100644 --- a/www/api/colorspace.html +++ b/www/api/colorspace.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Dealing with Image Colorspaces + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/compare.html b/www/api/compare.html index b67e8a791..f633de482 100644 --- a/www/api/compare.html +++ b/www/api/compare.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Compare an Image to a Reconstructed Image + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/composite.html b/www/api/composite.html index bc1071bec..6c0f76297 100644 --- a/www/api/composite.html +++ b/www/api/composite.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Composite an Image + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/constitute.html b/www/api/constitute.html index 1169d661c..062291346 100644 --- a/www/api/constitute.html +++ b/www/api/constitute.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Constitute an Image + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/decorate.html b/www/api/decorate.html index 66db8903d..d9abb6b67 100644 --- a/www/api/decorate.html +++ b/www/api/decorate.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Decorate an Image + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/deprecate.html b/www/api/deprecate.html index 6c2d33e61..a084b8fa2 100644 --- a/www/api/deprecate.html +++ b/www/api/deprecate.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Deprecated Methods + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/display.html b/www/api/display.html index ad2b84273..aed1c0d5d 100644 --- a/www/api/display.html +++ b/www/api/display.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Interactively Display and Edit an Image + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/distort.html b/www/api/distort.html index 0a2bb18e0..a0231d492 100644 --- a/www/api/distort.html +++ b/www/api/distort.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Image Distortions + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/draw.html b/www/api/draw.html index 47cfbb25d..fcd94ee1f 100644 --- a/www/api/draw.html +++ b/www/api/draw.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Draw on an Image + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/drawing-wand.html b/www/api/drawing-wand.html index c5ffd3a27..06d546227 100644 --- a/www/api/drawing-wand.html +++ b/www/api/drawing-wand.html @@ -5,8 +5,10 @@ - ImageMagick: MagickWand, C API for ImageMagick: Drawing Wand Methods + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/effect.html b/www/api/effect.html index eaa5c1d92..7cd53e655 100644 --- a/www/api/effect.html +++ b/www/api/effect.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Add an Effect + + + @@ -19,11 +21,13 @@ - + + + @@ -360,7 +364,7 @@ Image *KuwaharaImage(const Image *image,const double radius,
     Image *LocalContrastImage(const Image *image, const double radius,
    -  const double strength, ExceptionInfo *exception)
    +  const double strength,ExceptionInfo *exception)
     

    A description of each parameter follows:

    diff --git a/www/api/enhance.html b/www/api/enhance.html index 1636a50ca..9794420f7 100644 --- a/www/api/enhance.html +++ b/www/api/enhance.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Enhance an Image + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/exception.html b/www/api/exception.html index 1bcbe8072..3b4cb2522 100644 --- a/www/api/exception.html +++ b/www/api/exception.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Dealing with Exceptions + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/feature.html b/www/api/feature.html index cb79a12e9..208362cb4 100644 --- a/www/api/feature.html +++ b/www/api/feature.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Image Features + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/fourier.html b/www/api/fourier.html index 0cc9d7b38..cf32cfcda 100644 --- a/www/api/fourier.html +++ b/www/api/fourier.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Fourier Transform + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/fx.html b/www/api/fx.html index c20a16c44..bc0138a58 100644 --- a/www/api/fx.html +++ b/www/api/fx.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Add a Special Effect + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/histogram.html b/www/api/histogram.html index bb293e12b..27aab9915 100644 --- a/www/api/histogram.html +++ b/www/api/histogram.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Image Histograms + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/image-view.html b/www/api/image-view.html index 2ed3e8bec..0ef3b2ca1 100644 --- a/www/api/image-view.html +++ b/www/api/image-view.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Image View Methods + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/image.html b/www/api/image.html index eb9b2d93f..862f811f4 100644 --- a/www/api/image.html +++ b/www/api/image.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Image Methods + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/layer.html b/www/api/layer.html index 3d980e7cb..005d51c14 100644 --- a/www/api/layer.html +++ b/www/api/layer.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Dealing with Image Layers + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/list.html b/www/api/list.html index 9d17d85c8..0be4a496e 100644 --- a/www/api/list.html +++ b/www/api/list.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Working with Image Lists + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/magick++-classes.html b/www/api/magick++-classes.html index c061238d3..8ab6f665d 100644 --- a/www/api/magick++-classes.html +++ b/www/api/magick++-classes.html @@ -5,8 +5,10 @@ - ImageMagick: Magick++, C++ API for ImageMagick: Classes + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/magick-deprecate.html b/www/api/magick-deprecate.html index f33597e45..37c62234f 100644 --- a/www/api/magick-deprecate.html +++ b/www/api/magick-deprecate.html @@ -5,8 +5,10 @@ - ImageMagick: MagickWand, C API for ImageMagick: Deprecated Methods + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/magick-image.html b/www/api/magick-image.html index cacfe8a12..1030be90b 100644 --- a/www/api/magick-image.html +++ b/www/api/magick-image.html @@ -5,8 +5,10 @@ - ImageMagick: MagickWand, C API for ImageMagick: Image Methods + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/magick-property.html b/www/api/magick-property.html index 9331feccf..27b284b36 100644 --- a/www/api/magick-property.html +++ b/www/api/magick-property.html @@ -5,8 +5,10 @@ - ImageMagick: MagickWand, C API for ImageMagick: Property Methods + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/magick-wand.html b/www/api/magick-wand.html index 0039d2452..a2b9e49f6 100644 --- a/www/api/magick-wand.html +++ b/www/api/magick-wand.html @@ -5,8 +5,10 @@ - ImageMagick: MagickWand, C API for ImageMagick: Wand Methods + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/magick.html b/www/api/magick.html index ae6ea101d..b30957a64 100644 --- a/www/api/magick.html +++ b/www/api/magick.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Read or List Image formats + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/memory.html b/www/api/memory.html index bebf47907..54b72b1f1 100644 --- a/www/api/memory.html +++ b/www/api/memory.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Memory Allocation + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/mime.html b/www/api/mime.html index 0bd5010ec..3bb0d9291 100644 --- a/www/api/mime.html +++ b/www/api/mime.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Mime Methods + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/module.html b/www/api/module.html index 9cf13f1a4..addbd565c 100644 --- a/www/api/module.html +++ b/www/api/module.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Loadable Modules + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/mogrify.html b/www/api/mogrify.html index 1498c22af..5b69dc7a8 100644 --- a/www/api/mogrify.html +++ b/www/api/mogrify.html @@ -5,8 +5,10 @@ - ImageMagick: MagickWand, C API for ImageMagick: Command-line Interface + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/monitor.html b/www/api/monitor.html index 26765fe17..84096d103 100644 --- a/www/api/monitor.html +++ b/www/api/monitor.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Monitor the Progress of an Image Operation + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/montage.html b/www/api/montage.html index 50c1dbe31..a2d33045b 100644 --- a/www/api/montage.html +++ b/www/api/montage.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Create an Image Thumbnail + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/morphology.html b/www/api/morphology.html index 63ccf550e..e730a06df 100644 --- a/www/api/morphology.html +++ b/www/api/morphology.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Morphological Erosions, Dilations, Openings, and Closings + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/paint.html b/www/api/paint.html index 28fbe880a..a51651cd3 100644 --- a/www/api/paint.html +++ b/www/api/paint.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Paint on an Image + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/pixel-iterator.html b/www/api/pixel-iterator.html index 80547837b..b29b23352 100644 --- a/www/api/pixel-iterator.html +++ b/www/api/pixel-iterator.html @@ -5,8 +5,10 @@ - ImageMagick: MagickWand, C API for ImageMagick: Pixel Iterator Methods + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/pixel-wand.html b/www/api/pixel-wand.html index b45b8933d..47191d642 100644 --- a/www/api/pixel-wand.html +++ b/www/api/pixel-wand.html @@ -5,8 +5,10 @@ - ImageMagick: MagickWand, C API for ImageMagick: Pixel Wand Methods + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/profile.html b/www/api/profile.html index 618cabe37..73c8cfdbc 100644 --- a/www/api/profile.html +++ b/www/api/profile.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Dealing with Image Profiles + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/property.html b/www/api/property.html index 7b41117e1..11f22b1b3 100644 --- a/www/api/property.html +++ b/www/api/property.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Get/Set Image Properties + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/quantize.html b/www/api/quantize.html index 2de9b7364..c899ac38b 100644 --- a/www/api/quantize.html +++ b/www/api/quantize.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Reduce the Number of Unique Colors in an Image + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/registry.html b/www/api/registry.html index 70c16166b..dc3c65f4f 100644 --- a/www/api/registry.html +++ b/www/api/registry.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: The Image Registry + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/resize.html b/www/api/resize.html index 95338fb0f..1d7f719b3 100644 --- a/www/api/resize.html +++ b/www/api/resize.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Resize an Image + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/resource.html b/www/api/resource.html index 5f0413aa6..3c697070f 100644 --- a/www/api/resource.html +++ b/www/api/resource.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Monitor or Limit Resource Consumption + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/segment.html b/www/api/segment.html index 4e0440b72..f3b7c885a 100644 --- a/www/api/segment.html +++ b/www/api/segment.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Segment an Image with Thresholding Fuzzy c-Means + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/shear.html b/www/api/shear.html index 70bf53883..6540b39d5 100644 --- a/www/api/shear.html +++ b/www/api/shear.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Shear or Rotate an Image by an Arbitrary Angle + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/signature.html b/www/api/signature.html index ef0e3a21c..7a81d8c96 100644 --- a/www/api/signature.html +++ b/www/api/signature.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Compute a Message Digest for an Image + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/statistic.html b/www/api/statistic.html index 9c67cdcfd..947875953 100644 --- a/www/api/statistic.html +++ b/www/api/statistic.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Image Statistics + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/stream.html b/www/api/stream.html index a7c827ce2..25f282030 100644 --- a/www/api/stream.html +++ b/www/api/stream.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: The Pixel FIFO + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/transform.html b/www/api/transform.html index 009f18b44..8fc2a16fd 100644 --- a/www/api/transform.html +++ b/www/api/transform.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Transform an Image + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/version.html b/www/api/version.html index e0f0d4177..f6d25805e 100644 --- a/www/api/version.html +++ b/www/api/version.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, C API for ImageMagick: Get the Version and Copyrights + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/api/wand-view.html b/www/api/wand-view.html index b2c57f91c..6c4e27f6a 100644 --- a/www/api/wand-view.html +++ b/www/api/wand-view.html @@ -5,8 +5,10 @@ - ImageMagick: MagickWand, C API for ImageMagick: Wand View Methods + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/architecture.html b/www/architecture.html index 142bbe44c..479aacb2b 100644 --- a/www/architecture.html +++ b/www/architecture.html @@ -5,8 +5,10 @@ - ImageMagick: Architecture + + + @@ -19,11 +21,13 @@ - + + + @@ -130,7 +134,7 @@ if (image == (Image *) NULL)

    When the pixel cache is initialized, pixels are scaled from whatever bit depth they originated from to that required by the pixel cache. For example, a 1-channel 1-bit monochrome PBM image is scaled to 8-bit gray image, if you are using the Q8 version of ImageMagick, and 16-bit RGBA for the Q16 version. You can determine which version you have with the ‑version option:

    -
     identify -versionVersion: ImageMagick 7.0.1-7 2016-05-08 Q16 http://www.imagemagick.org
    +
     identify -versionVersion: ImageMagick 7.0.2-0 2016-06-08 Q16 http://www.imagemagick.org

    As you can see, the convenience of the pixel cache sometimes comes with a trade-off in storage (e.g. storing a 1-bit monochrome image as 16-bit is wasteful) and speed (i.e. storing the entire image in memory is generally slower than accessing one scanline of pixels at a time). In most cases, the benefits of the pixel cache typically outweigh any disadvantages.

    Access the Pixel Cache

    @@ -306,32 +310,30 @@ Resource limits: <policy domain="system" name="precision" value="6"/> <policy domain="cache" name="shared-secret" value="replace with your secret phrase" stealth="true"/> <policy domain="delegate" rights="none" pattern="HTTPS" /> - <policy domain="coder" rights="none" pattern="MVG" /> - <policy domain="path" rights="none" pattern="@*" /> - <policy domain="path" rights="none" pattern="|*" /> + <policy domain="path" rights="none" pattern="@*"/> <!-- indirect reads not permitted --> </policymap>
    -

    Since we process multiple simultaneous sessions, we don't want any one session consuming all the available memory.With this policy, large images are cached to disk. If the image is too large and exceeds the pixel cache disk limit, the program exits. In addition, we place a time limit to prevent any run-away processing tasks. If any one image has a width or height that exceeds 8192 pixels, an exception is thrown and processing stops. As of ImageMagick 7.0.1-4 you can prevent the use of any delegate or all delegates (set the pattern to "*") or remove the right to use indirect reads. Note, prior to this release, use a domain of "coder" to prevent delegate usage (e.g. domain="coder" rights="none" pattern="HTTPS").

    +

    Since we process multiple simultaneous sessions, we don't want any one session consuming all the available memory.With this policy, large images are cached to disk. If the image is too large and exceeds the pixel cache disk limit, the program exits. In addition, we place a time limit to prevent any run-away processing tasks. If any one image has a width or height that exceeds 8192 pixels, an exception is thrown and processing stops. As of ImageMagick 7.0.1-8 you can prevent the use of any delegate or all delegates (set the pattern to "*"). Note, prior to this release, use a domain of "coder" to prevent delegate usage (e.g. domain="coder" rights="none" pattern="HTTPS"). The policy also prevents indirect reads. If you want to, for example, read text from a file (e.g. caption:@myCaption.txt), you'll need to remove this policy.

    Note, the cache limits are global to each invocation of ImageMagick, meaning if you create several images, the combined resource requirements are compared to the limit to determine the pixel cache storage disposition.

    To determine which type and how much resources are consumed by the pixel cache, add the -debug cache option to the command-line:

    -> convert -debug cache logo: -sharpen 3x2 null:
    -2013-12-17T13:33:42-05:00 0:00.000 0.000u 7.0.0 Cache convert: cache.c/DestroyPixelCache/1275/Cache
    +2016-12-17T13:33:42-05:00 0:00.000 0.000u 7.0.0 Cache convert: cache.c/DestroyPixelCache/1275/Cache
       destroy 
    -2013-12-17T13:33:42-05:00 0:00.000 0.000u 7.0.0 Cache convert: cache.c/OpenPixelCache/3834/Cache
    +2016-12-17T13:33:42-05:00 0:00.000 0.000u 7.0.0 Cache convert: cache.c/OpenPixelCache/3834/Cache
       open LOGO[0] (Heap Memory, 640x480x4 4.688MiB)
    -2013-12-17T13:33:42-05:00 0:00.010 0.000u 7.0.0 Cache convert: cache.c/OpenPixelCache/3834/Cache
    +2016-12-17T13:33:42-05:00 0:00.010 0.000u 7.0.0 Cache convert: cache.c/OpenPixelCache/3834/Cache
       open LOGO[0] (Heap Memory, 640x480x3 3.516MiB)
    -2013-12-17T13:33:42-05:00 0:00.010 0.000u 7.0.0 Cache convert: cache.c/ClonePixelCachePixels/1044/Cache
    +2016-12-17T13:33:42-05:00 0:00.010 0.000u 7.0.0 Cache convert: cache.c/ClonePixelCachePixels/1044/Cache
       Memory => Memory
    -2013-12-17T13:33:42-05:00 0:00.020 0.010u 7.0.0 Cache convert: cache.c/ClonePixelCachePixels/1044/Cache
    +2016-12-17T13:33:42-05:00 0:00.020 0.010u 7.0.0 Cache convert: cache.c/ClonePixelCachePixels/1044/Cache
       Memory => Memory
    -2013-12-17T13:33:42-05:00 0:00.020 0.010u 7.0.0 Cache convert: cache.c/OpenPixelCache/3834/Cache
    +2016-12-17T13:33:42-05:00 0:00.020 0.010u 7.0.0 Cache convert: cache.c/OpenPixelCache/3834/Cache
       open LOGO[0] (Heap Memory, 640x480x3 3.516MiB)
    -2013-12-17T13:33:42-05:00 0:00.050 0.100u 7.0.0 Cache convert: cache.c/DestroyPixelCache/1275/Cache
    +2016-12-17T13:33:42-05:00 0:00.050 0.100u 7.0.0 Cache convert: cache.c/DestroyPixelCache/1275/Cache
       destroy LOGO[0]
    -2013-12-17T13:33:42-05:00 0:00.050 0.100u 7.0.0 Cache convert: cache.c/DestroyPixelCache/1275/Cache
    +2016-12-17T13:33:42-05:00 0:00.050 0.100u 7.0.0 Cache convert: cache.c/DestroyPixelCache/1275/Cache
       destroy LOGO[0]
     

    This command utilizes a pixel cache in memory. The logo consumed 4.688MiB and after it was sharpened, 3.516MiB.

    @@ -1418,4 +1420,3 @@ ModuleExport size_t analyzeImage(Image **images,const int argc,const char **argv - \ No newline at end of file diff --git a/www/binary-releases.html b/www/binary-releases.html index 7edb727d2..c60db1d44 100644 --- a/www/binary-releases.html +++ b/www/binary-releases.html @@ -5,8 +5,10 @@ - ImageMagick: Install from Binary Distribution + + + @@ -19,11 +21,13 @@ - + + + @@ -71,19 +75,12 @@ - - - + + + - - - - - - - @@ -117,7 +114,7 @@

    ImageMagick RPM's are self-installing. Simply type the following command and you're ready to start using ImageMagick:

    -
     rpm -Uvh ImageMagick-7.0.1-7.i386.rpm
    +
     rpm -Uvh ImageMagick-7.0.2-0.x86_64.rpm

    For other systems, create (or choose) a directory to install the package into and change to that directory, for example:

    @@ -132,7 +129,7 @@ tar xvzf ImageMagick.tar.gz
     
     

    Set the MAGICK_HOME environment variable to the path where you extracted the ImageMagick files. For example:

    -
     export MAGICK_HOME="$HOME/ImageMagick-7.0.1"
    +
     export MAGICK_HOME="$HOME/ImageMagick-7.0.2"

    If the bin subdirectory of the extracted package is not already in your executable search path, add it to your PATH environment variable. For example:

    @@ -150,7 +147,7 @@ export LD_LIBRARY_PATH
     

    Finally, to verify ImageMagick is working properly, type the following on the command line:

    -magick logo: logo.gif
    +convert logo: logo.gif
     identify logo.gif
     display logo.gif
     
    @@ -201,7 +198,7 @@ tar xvzf ImageMagick-x86_64-apple-darwin15.2.0.tar.gz

    Set the MAGICK_HOME environment variable to the path where you extracted the ImageMagick files. For example:

    -
     export MAGICK_HOME="$HOME/ImageMagick-7.0.1"
    +
     export MAGICK_HOME="$HOME/ImageMagick-7.0.2"

    If the bin subdirectory of the extracted package is not already in your executable search path, add it to your PATH environment variable. For example:

    @@ -218,7 +215,7 @@ export DYLD_LIBRARY_PATH="$MAGICK_HOME/lib/"
     

    Finally, to verify ImageMagick is working properly, type the following on the command line:

    -magick logo: logo.gif
    +convert logo: logo.gif
     identify logo.gif
     display logo.gif
     
    @@ -252,7 +249,7 @@ display logo.gif
     ./imagemagick_compile.sh VERSION
     
    -

    where VERSION is the version of ImageMagick you want to compile (i.e.: 7.0.1-7, svn, ...)

    +

    where VERSION is the version of ImageMagick you want to compile (i.e.: 7.0.2-0, svn, ...)

    This script compiles ImageMagick as a static library to be included in iOS projects and adds support for

      @@ -301,9 +298,9 @@ display logo.gif
    - - - + + +
    ImageMagick-7.0.1-7.x86_64.rpmdownloaddownloadImageMagick-7.0.2-0.x86_64.rpmdownloaddownload Redhat / CentOS 7.1 x86_64 RPM
    ImageMagick-7.0.1-7.i386.rpmdownloaddownloadRedhat / CentOS 5.11 i386 RPM
    ImageMagick RPM's download
    ImageMagick-7.0.1-7-Q16-x64-dll.exedownloaddownloadImageMagick-7.0.2-0-Q16-x64-dll.exedownloaddownload Win64 dynamic at 16 bits-per-pixel component
    @@ -321,93 +318,93 @@ display logo.gif - ImageMagick-7.0.1-7-Q16-x64-static.exe - download - download + ImageMagick-7.0.2-0-Q16-x64-static.exe + download + download Win64 static at 16 bits-per-pixel component - ImageMagick-7.0.1-7-Q8-x64-dll.exe - download - download + ImageMagick-7.0.2-0-Q8-x64-dll.exe + download + download Win64 dynamic at 8 bits-per-pixel component - ImageMagick-7.0.1-7-Q8-x64-static.exe - download - download + ImageMagick-7.0.2-0-Q8-x64-static.exe + download + download Win64 static at 8 bits-per-pixel component - ImageMagick-7.0.1-7-Q16-HDRI-x64-dll.exe - download - download + ImageMagick-7.0.2-0-Q16-HDRI-x64-dll.exe + download + download Win64 dynamic at 16 bits-per-pixel component with high dynamic-range imaging enabled - ImageMagick-7.0.1-7-Q16-HDRI-x64-static.exe - download - download + ImageMagick-7.0.2-0-Q16-HDRI-x64-static.exe + download + download Win64 static at 16 bits-per-pixel component with high dynamic-range imaging enabled - ImageMagick-7.0.1-7-Q16-x86-dll.exe - download - download + ImageMagick-7.0.2-0-Q16-x86-dll.exe + download + download Win32 dynamic at 16 bits-per-pixel component - ImageMagick-7.0.1-7-Q16-x86-static.exe - download - download + ImageMagick-7.0.2-0-Q16-x86-static.exe + download + download Win32 static at 16 bits-per-pixel component - ImageMagick-7.0.1-7-Q8-x86-dll.exe - download - download + ImageMagick-7.0.2-0-Q8-x86-dll.exe + download + download Win32 dynamic at 8 bits-per-pixel component - ImageMagick-7.0.1-7-Q8-x86-static.exe - download - download + ImageMagick-7.0.2-0-Q8-x86-static.exe + download + download Win32 static at 8 bits-per-pixel component - ImageMagick-7.0.1-7-Q16-HDRI-x86-dll.exe - download - download + ImageMagick-7.0.2-0-Q16-HDRI-x86-dll.exe + download + download Win32 dynamic at 16 bits-per-pixel component with high dynamic-range imaging enabled - ImageMagick-7.0.1-7-Q16-HDRI-x86-static.exe - download - download + ImageMagick-7.0.2-0-Q16-HDRI-x86-static.exe + download + download Win32 static at 16 bits-per-pixel component with high dynamic-range imaging enabled - ImageMagick-7.0.1-7-portable-Q16-x86.zip - download - download + ImageMagick-7.0.2-0-portable-Q16-x86.zip + download + download Portable Win32 static at 16 bits-per-pixel component. Just copy to your host and run (no installer, no Windows registry entries). - ImageMagick-7.0.1-7-portable-Q16-x64.zip - download - download + ImageMagick-7.0.2-0-portable-Q16-x64.zip + download + download Portable Win64 static at 16 bits-per-pixel component. Just copy to your host and run (no installer, no Windows registry entries). @@ -417,9 +414,9 @@ display logo.gif

    To verify ImageMagick is working properly, type the following in an Command Prompt window:

    -magick logo: logo.gif
    -magick identify logo.gif
    -magick display logo.gif
    +convert logo: logo.gif
    +identify logo.gif
    +imdisplay logo.gif
     

    If you have any problems, you likely need vcomp120.dll. To install it, download Visual C++ 2013 Redistributable Package.

    @@ -427,12 +424,12 @@ magick display logo.gif

    Note, use a double quote (") rather than a single quote (') for the ImageMagick command line under Windows:

    -magick "e:/myimages/image.png" "e:/myimages/image.jpg"
    +convert "e:/myimages/image.png" "e:/myimages/image.jpg"
     

    Use two double quotes for VBScript scripts:

     Set objShell = wscript.createobject("wscript.shell")
    -objShell.Exec("magick ""e:/myimages/image.png"" ""e:/myimages/image.jpg""")
    +objShell.Exec("convert ""e:/myimages/image.png"" ""e:/myimages/image.jpg""")
     

    Congratulations, you have a working ImageMagick distribution under Windows and you are ready to use ImageMagick to convert, compose, or edit your images or perhaps you'll want to use one of the Application Program Interfaces for C, C++, Perl, and others.

    @@ -457,4 +454,4 @@ objShell.Exec("magick ""e:/myimages/image.png"" ""e:/myimages/image.jpg""") - \ No newline at end of file + \ No newline at end of file diff --git a/www/changelog.html b/www/changelog.html index d95538a7d..4c65a4925 100644 --- a/www/changelog.html +++ b/www/changelog.html @@ -5,8 +5,10 @@ - ImageMagick: Changelog + + + @@ -19,11 +21,13 @@ - + + + @@ -51,7 +55,29 @@
    -
    2016-05-30 7.0.1-7 Cristy <quetzlzacatenango@image...>
    +
    2016-06-12 7.0.2-0 Cristy <quetzlzacatenango@image...>
    +
  • Release ImageMagick version 7.0.2-0, GIT revision 10884:f0e15e8:20160612.
  • +
    2016-06-09 7.0.2-0 Cristy <quetzlzacatenango@image...>
    +
  • Backoff finite precision epsilon (reference https://github.com/ImageMagick/ImageMagick/issues/215).
  • +
  • Fix drawing glitch for stroke widths greater than 2 (reference https://github.com/ImageMagick/ImageMagick/issues/218).
  • +
    2016-06-05 7.0.1-10 Cristy <quetzlzacatenango@image...>
    +
  • Release ImageMagick version 7.0.1-10, GIT revision 18406:ba4ad2d:20160607.
  • +
    2016-06-04 7.0.1-10 Cristy <quetzlzacatenango@image...>
    +
  • Deny indirect reads by policy, remove policy to permit, e.g., convert caption:@mytext.txt ...
  • +
  • RLE check for pixel offset less than 0 (heap overflow report from Craig Young).
  • +
  • Properly initialze PES blocks (reference https://github.com/ImageMagick/ImageMagick/issues/213).
  • +
    2016-06-03 7.0.1-9 Cristy <quetzlzacatenango@image...>
    +
  • Release ImageMagick version 7.0.1-9, GIT revision 10847:339f803:20160602.
  • +
    2016-06-02 7.0.1-9 Cristy <quetzlzacatenango@image...>
    +
  • Fix small memory leak (patch provided by Андрей Черный).
  • +
  • Coder path traversal is not authorized (bug report provided by Masaaki Chida).
  • +
  • Turn off alpha channel for the compare difference image (reference http://www.imagemagick.org/discourse-server/viewtopic.html?f=3&t=29828).
  • +
    2016-05-31 7.0.1-8 Cristy <quetzlzacatenango@image...>
    +
  • Release ImageMagick version 7.0.1-8, GIT revision 18334:97775b5:20160531.
  • +
    2016-05-31 7.0.1-8 Cristy <quetzlzacatenango@image...>
    +
  • Support configure script --enable-pipes option to enable pipes (|) in filenames.
  • +
  • Support configure script --enable-indirect-reads option to enable indirect reads (@) in filenames.
  • +
    2016-05-30 7.0.1-7 Cristy <quetzlzacatenango@image...>
  • Release ImageMagick version 7.0.1-7, GIT revision 18321:5511ef5:20160530.
  • 2016-05-25 7.0.1-7 Cristy <quetzlzacatenango@image...>
  • Security improvements to TEXT coder broke it (reference https://www.imagemagick.org/discourse-server/viewtopic.html?f=3&t=29754).
  • @@ -131,4 +157,3 @@
    - \ No newline at end of file diff --git a/www/cipher.html b/www/cipher.html index 840e0335a..8a5aceca5 100644 --- a/www/cipher.html +++ b/www/cipher.html @@ -5,8 +5,10 @@ - ImageMagick: Encipher or Decipher an Image + + + @@ -19,11 +21,13 @@ - + + + @@ -134,4 +138,3 @@ Examples - \ No newline at end of file diff --git a/www/color-management.html b/www/color-management.html index 6db9b8b3d..65ff255f0 100644 --- a/www/color-management.html +++ b/www/color-management.html @@ -5,8 +5,10 @@ - ImageMagick: Color Management + + + @@ -19,11 +21,13 @@ - + + + @@ -144,4 +148,3 @@ convert myimage_channels_*.png -set colorspace HSL -combine -colorspace RGB -set
    - \ No newline at end of file diff --git a/www/color.html b/www/color.html index e4e6f2a25..6fe141387 100644 --- a/www/color.html +++ b/www/color.html @@ -5,8 +5,10 @@ - ImageMagick: Color Names + + + @@ -19,11 +21,13 @@ - + + + @@ -4945,4 +4949,4 @@ device-cmyk(0.11, 0.48, 0.83, 0.00)
    - \ No newline at end of file + \ No newline at end of file diff --git a/www/command-line-options.html b/www/command-line-options.html index 5bdf788e6..b3f8b829c 100644 --- a/www/command-line-options.html +++ b/www/command-line-options.html @@ -5,8 +5,10 @@ - ImageMagick: Command-line Options + + + @@ -19,11 +21,13 @@ - + + + @@ -2429,7 +2433,7 @@ a file redirection.

    0. Negative indexes are relative to the end of the sequence, for example, -1 represents the last image of the sequence. Specify a range of images with a dash (e.g. 0-4). Separate indexes with a comma (e.g. 0,2). Use -+delete to delete the last image in the current image sequence.

    ++delete to delete the last image in the current image sequence. Use -delete 0--1 to delete the entire image sequence.

    @@ -7965,4 +7969,4 @@ href="command-line-options.html#colors">-colors to reduce the number of colo
    - \ No newline at end of file + \ No newline at end of file diff --git a/www/command-line-processing.html b/www/command-line-processing.html index e6cd35dec..24be95295 100644 --- a/www/command-line-processing.html +++ b/www/command-line-processing.html @@ -5,8 +5,10 @@ - ImageMagick: Command-line Processing + + + @@ -19,11 +21,13 @@ - + + + @@ -393,7 +397,7 @@ an operator is applied to an image and forgotten. The image operators include:

    +‑annotate • ‑black‑threshold • ‑blur • ‑border • ‑charcoal • ‑chop • ‑clip • ‑clip‑path • ‑clip‑mask • ‑colors • ‑colorize • ‑colorspace • ‑compose • ‑contrast • ‑convolve • ‑crop • ‑cycle • ‑despeckle • ‑draw • ‑edge • ‑emboss • ‑enhance • ‑equalize • ‑evaluate • ‑extent • ‑flip • ‑flop • ‑floodfill • ‑frame • ‑gamma • ‑gaussian‑blur • ‑grayscale • ‑implode • ‑lat • ‑level • ‑map • ‑median • ‑modulate • ‑monochrome • ‑negate • ‑noise • ‑normalize • ‑opaque • ‑ordered‑dither • ‑paint • ‑posterize • ‑raise • ‑profile • ‑radial‑blur • ‑raise • ‑random‑threshold • ‑resample • ‑resize • ‑roll • ‑rotate • ‑sample • ‑scale • ‑sepia‑tone • ‑segment • ‑shade • ‑shadow • ‑sharpen • ‑shave • ‑shear • ‑sigmoidal‑contrast • ‑solarize • ‑splice • ‑spread • ‑strip • ‑swirl • ‑threshold • ‑transparent • ‑thumbnail • ‑tint • ‑transform • ‑trim • ‑unsharp • ‑version • ‑wave • ‑white‑point • ‑white‑threshold

    In this example, -negate negates the wand image but not the wizard:

    @@ -679,4 +683,4 @@ convert -define stream:buffer-size=0 logo: gif:- | display gif:- - \ No newline at end of file + \ No newline at end of file diff --git a/www/command-line-tools.html b/www/command-line-tools.html index 49e4452a5..f537c0ea3 100644 --- a/www/command-line-tools.html +++ b/www/command-line-tools.html @@ -5,8 +5,10 @@ - ImageMagick: Command-line Tools + + + @@ -19,11 +21,13 @@ - + + + @@ -94,4 +98,3 @@ - \ No newline at end of file diff --git a/www/compare.html b/www/compare.html index c568774aa..692ece35a 100644 --- a/www/compare.html +++ b/www/compare.html @@ -5,8 +5,10 @@ - ImageMagick: Command-line Tools: Compare + + + @@ -19,11 +21,13 @@ - + + + @@ -344,4 +348,4 @@ transparent, extract, background, or shape the alpha channel - \ No newline at end of file + \ No newline at end of file diff --git a/www/compose.html b/www/compose.html index 96ec7a6d2..f7a8f3726 100644 --- a/www/compose.html +++ b/www/compose.html @@ -5,8 +5,10 @@ - ImageMagick: Alpha Compositing + + + @@ -19,11 +21,13 @@ - + + + @@ -638,4 +642,3 @@ href="command-line-options.html#list">-list compose.

    - \ No newline at end of file diff --git a/www/composite.html b/www/composite.html index aa3384563..c70e0c6bc 100644 --- a/www/composite.html +++ b/www/composite.html @@ -5,8 +5,10 @@ - ImageMagick: Command-line Tools: Composite + + + @@ -19,11 +21,13 @@ - + + + @@ -520,4 +524,3 @@ transparent, extract, background, or shape the alpha channel - \ No newline at end of file diff --git a/www/conjure.html b/www/conjure.html index fd6386a27..f84fee1ce 100644 --- a/www/conjure.html +++ b/www/conjure.html @@ -5,8 +5,10 @@ - ImageMagick: Command-line Tools: Conjure + + + @@ -19,11 +21,13 @@ - + + + @@ -1132,4 +1136,3 @@ fill="color name", channel="All, Default, Alpha, Black, Blue, CMYK, Cyan, Gray, - \ No newline at end of file diff --git a/www/connected-components.html b/www/connected-components.html index 3206757c8..923cb3ff3 100644 --- a/www/connected-components.html +++ b/www/connected-components.html @@ -5,8 +5,10 @@ - ImageMagick: Connected Components Labeling + + + @@ -19,11 +21,13 @@ - + + + @@ -115,4 +119,4 @@ Objects (id: bounding-box centroid area mean-color): - \ No newline at end of file + \ No newline at end of file diff --git a/www/contact.html b/www/contact.html index 40b8b26c0..f63844620 100644 --- a/www/contact.html +++ b/www/contact.html @@ -5,8 +5,10 @@ - ImageMagick: Contact the Development Team + + + @@ -19,11 +21,13 @@ - + + + diff --git a/www/convert.html b/www/convert.html index a417b5821..9b8cda8f8 100644 --- a/www/convert.html +++ b/www/convert.html @@ -5,8 +5,10 @@ - ImageMagick: Command-line Tools: Convert + + + @@ -19,11 +21,13 @@ - + + + @@ -1310,4 +1314,4 @@ transparent, extract, background, or shape the alpha channel - \ No newline at end of file + \ No newline at end of file diff --git a/www/display.html b/www/display.html index 161612c5d..bd62917fb 100644 --- a/www/display.html +++ b/www/display.html @@ -5,8 +5,10 @@ - ImageMagick: Command-line Tools: Display + + + @@ -19,11 +21,13 @@ - + + + @@ -563,4 +567,3 @@ transparent, extract, background, or shape the alpha channel - \ No newline at end of file diff --git a/www/distribute-pixel-cache.html b/www/distribute-pixel-cache.html index 249d5159e..82b5ca0d1 100644 --- a/www/distribute-pixel-cache.html +++ b/www/distribute-pixel-cache.html @@ -5,8 +5,10 @@ - ImageMagick: Distributed Pixel Cache + + + @@ -19,11 +21,13 @@ - + + + @@ -83,4 +87,3 @@ convert -limit memory 1GiB -limit map 2GiB -limit disk 4GiB \ - \ No newline at end of file diff --git a/www/download.html b/www/download.html index a82d9f490..9fa88e58b 100644 --- a/www/download.html +++ b/www/download.html @@ -5,8 +5,10 @@ - ImageMagick: Downloads + + + @@ -19,11 +21,13 @@ - + + + @@ -53,7 +57,7 @@

    ImageMagick source and binary distributions are available from a variety of FTP and Web mirrors around the world listed below. ImageMagick stable and development source releases are also available from Git. Before you download, you may want to review recent changes to the ImageMagick distribution. The authoritative source code repository is http://git.imagemagick.org/repos/ImageMagick.

    -

    The latest release of ImageMagick is version 7.0.1-7.

    +

    The latest release of ImageMagick is version 7.0.2-0.

    Germany
    http://mirror.checkdomain.de/imagemagick/
    @@ -109,4 +113,3 @@
    - \ No newline at end of file diff --git a/www/escape.html b/www/escape.html index 346c27b47..64a9d01b7 100644 --- a/www/escape.html +++ b/www/escape.html @@ -5,8 +5,10 @@ - ImageMagick: Format and Print Image Properties + + + @@ -19,11 +21,13 @@ - + + + @@ -849,4 +853,3 @@ Post ObjectData Descriptor Record
    - \ No newline at end of file diff --git a/www/examples.html b/www/examples.html index e40c5a86a..520aa5fa8 100644 --- a/www/examples.html +++ b/www/examples.html @@ -5,8 +5,10 @@ - ImageMagick: Examples of ImageMagick Usage + + + @@ -19,11 +21,13 @@ - + + + @@ -74,4 +78,3 @@ - \ No newline at end of file diff --git a/www/exception.html b/www/exception.html index 8042fff85..007a34b66 100644 --- a/www/exception.html +++ b/www/exception.html @@ -5,8 +5,10 @@ - ImageMagick: Exceptions + + + @@ -19,11 +21,13 @@ - + + + @@ -263,4 +267,3 @@ - \ No newline at end of file diff --git a/www/export.html b/www/export.html index fa26887dd..0848ae508 100644 --- a/www/export.html +++ b/www/export.html @@ -5,8 +5,10 @@ - ImageMagick: Export Classification + + + @@ -19,11 +21,13 @@ - + + + @@ -74,4 +78,3 @@ - \ No newline at end of file diff --git a/www/formats.html b/www/formats.html index debd33067..ff82659f5 100644 --- a/www/formats.html +++ b/www/formats.html @@ -5,8 +5,10 @@ - ImageMagick: Formats + + + @@ -19,11 +21,13 @@ - + + + @@ -1926,4 +1930,3 @@ convert \( -size 15x15 canvas:black canvas:white -append \) \ - \ No newline at end of file diff --git a/www/fx.html b/www/fx.html index 0478690a9..99f957d0e 100644 --- a/www/fx.html +++ b/www/fx.html @@ -5,8 +5,10 @@ - ImageMagick: The Fx Special Effects Image Operator + + + @@ -19,11 +21,13 @@ - + + + @@ -414,4 +418,3 @@ convert rose: -duplicate 29 -virtual-pixel Gray -distort SRT '%[fx:360.0*t/n]' \ - \ No newline at end of file diff --git a/www/gradient.html b/www/gradient.html index 06a7a5e4e..4c478c54c 100644 --- a/www/gradient.html +++ b/www/gradient.html @@ -5,8 +5,10 @@ - ImageMagick: Image Gradients + + + @@ -19,11 +21,13 @@ - + + + @@ -235,4 +239,3 @@ convert -size 256x256 -define gradient:radii=128,64 -define gradient:angle=45 ra - \ No newline at end of file diff --git a/www/high-dynamic-range.html b/www/high-dynamic-range.html index 3f46ba416..55223eb88 100644 --- a/www/high-dynamic-range.html +++ b/www/high-dynamic-range.html @@ -5,8 +5,10 @@ - ImageMagick: High Dynamic-Range Images + + + @@ -19,11 +21,13 @@ - + + + @@ -101,4 +105,3 @@ Features: HDRI - \ No newline at end of file diff --git a/www/history.html b/www/history.html index 1ecea0d7f..57b4806c8 100644 --- a/www/history.html +++ b/www/history.html @@ -5,8 +5,10 @@ - ImageMagick: History + + + @@ -19,11 +21,13 @@ - + + + @@ -89,4 +93,3 @@ I swear by my life and my love of it that I will never live for the sake of anot - \ No newline at end of file diff --git a/www/identify.html b/www/identify.html index e47ba1794..95359a8ea 100644 --- a/www/identify.html +++ b/www/identify.html @@ -5,8 +5,10 @@ - ImageMagick: Command-line Tools: Identify + + + @@ -19,11 +21,13 @@ - + + + @@ -427,4 +431,4 @@ transparent, extract, background, or shape the alpha channel - \ No newline at end of file + \ No newline at end of file diff --git a/www/import.html b/www/import.html index b716dcc96..d61744870 100644 --- a/www/import.html +++ b/www/import.html @@ -5,8 +5,10 @@ - ImageMagick: Command-line Tools: Import + + + @@ -19,11 +21,13 @@ - + + + @@ -421,4 +425,3 @@ import -window root screen.ps - \ No newline at end of file diff --git a/www/index.html b/www/index.html index 5893100f5..f87c5ed33 100644 --- a/www/index.html +++ b/www/index.html @@ -5,8 +5,10 @@ - ImageMagick: Convert, Edit, Or Compose Bitmap Images + + + @@ -19,11 +21,13 @@ - + + + @@ -63,7 +67,7 @@ ImageMagickstable API and ABI. Before each ImageMagick release, we perform a comprehensive security assessment that includes memory error and thread data race detection to prevent security vulnerabilities.

    -

    The current release is ImageMagick 7.0.1-7. It runs on Linux, Windows, Mac Os X, iOS, Android OS, and others.

    +

    The current release is ImageMagick 7.0.2-0. It runs on Linux, Windows, Mac Os X, iOS, Android OS, and others.

    The authoritative ImageMagick web site is http://www.imagemagick.org. The authoritative source code repository is http://git.imagemagick.org/repos/ImageMagick. We maintain a source code mirror at GitLab and GitHub.

    @@ -209,7 +213,8 @@ ImageMagickNews

    Now that ImageMagick version 7 is released, we continue to maintain the legacy release of ImageMagick, version 6, at https://legacy.imagemagick.org.

    -

    ImageMagick best practices strongly encourages you to configure a policy that suits your local environment.

    + +

    ImageMagick best practices strongly encourages you to configure a security policy that suits your local environment.

    Community

    To join the ImageMagick community, try the discourse server. You can review questions or comments (with informed responses) posed by ImageMagick users or ask your own questions. If you want to contribute image processing algorithms, other enhancements, or bug fixes, open an issue.

    @@ -232,4 +237,4 @@ ImageMagick - ImageMagick: Install from Source + + + @@ -19,11 +21,13 @@ - + + + @@ -76,7 +80,7 @@ tar xvzf ImageMagick.tar.gz

    Next configure and compile ImageMagick:

    -
     cd ImageMagick-7.0.1
    ./configure
    make
    +
     cd ImageMagick-7.0.2
    ./configure
    make

    If ImageMagick configured and compiled without complaint, you are ready to install it on your system. Administrator privileges are required to install. To install, type

    @@ -117,16 +121,16 @@ make check
     unzip ImageMagick-windows.zip
     
    -

    Next, launch your Visual Studio IDE and choose Open->Project. Select the configure workspace from the ImageMagick-7.0.1/VisualMagick/configure folder and press Open. Choose Build->Build Solution +

    Next, launch your Visual Studio IDE and choose Open->Project. Select the configure workspace from the ImageMagick-7.0.2/VisualMagick/configure folder and press Open. Choose Build->Build Solution to compile the program and on completion run the program.

    [configure]

    -

    Press Next and click on the multi-threaded static build. If you are using the Visual Studio 6.0 IDE, make sure no check is next to the Generate Visual Studio 7 format option. Now press, on Next twice and finally Finish. The configuration utility just created a workspace required to build ImageMagick from source. Choose Open->Project and select the VisualStaticMT workspace from the ImageMagick-7.0.1/VisualMagick/ folder. Finally, choose Build->Build Solution to compile and build the ImageMagick distribution.

    +

    Press Next and click on the multi-threaded static build. If you are using the Visual Studio 6.0 IDE, make sure no check is next to the Generate Visual Studio 7 format option. Now press, on Next twice and finally Finish. The configuration utility just created a workspace required to build ImageMagick from source. Choose Open->Project and select the VisualStaticMT workspace from the ImageMagick-7.0.2/VisualMagick/ folder. Finally, choose Build->Build Solution to compile and build the ImageMagick distribution.

    To verify ImageMagick is working properly, launch a MS-DOS Command Prompt window and type

    -
     cd ImageMagick-7.0.1
    convert logo: image.jpg
    +
     cd ImageMagick-7.0.2
    convert logo: image.jpg

    For a more comprehensive test, run the ImageMagick validation suite:

    @@ -135,7 +139,7 @@ validate
     
     

    Congratulations, you have a working ImageMagick distribution under Windows and you are ready to use ImageMagick to convert, compose, or edit your images or perhaps you'll want to use one of the Application Program Interfaces for C, C++, Perl, and others.

    -

    The above instructions will satisfy a great number of ImageMagick users, but we suspect a few will have additional questions or problems to consider. For example, what does one do if ImageMagick fails to configure or compile? Or what if you want to install ImageMagick in a place other than the ImageMagick-7.0.1/VisualMagick/bin folder? Or perhaps you want to build and install the ImageMagickObject COM+ component. You will find the answer to these questions, and more, in Advanced Windows Source Installation.

    +

    The above instructions will satisfy a great number of ImageMagick users, but we suspect a few will have additional questions or problems to consider. For example, what does one do if ImageMagick fails to configure or compile? Or what if you want to install ImageMagick in a place other than the ImageMagick-7.0.2/VisualMagick/bin folder? Or perhaps you want to build and install the ImageMagickObject COM+ component. You will find the answer to these questions, and more, in Advanced Windows Source Installation.

    @@ -156,4 +160,4 @@ validate - \ No newline at end of file + \ No newline at end of file diff --git a/www/jp2.html b/www/jp2.html index c9b5a4f13..4901eb243 100644 --- a/www/jp2.html +++ b/www/jp2.html @@ -5,8 +5,10 @@ - ImageMagick: JP2 Encoding Options + + + @@ -19,11 +21,13 @@ - + + + @@ -158,4 +162,3 @@ convert wizard.png -resize 4096x2160! -depth 12 wizard.jp2 - \ No newline at end of file diff --git a/www/license.html b/www/license.html index bffda6839..7963ec36c 100644 --- a/www/license.html +++ b/www/license.html @@ -5,8 +5,10 @@ - ImageMagick: License + + + @@ -19,11 +21,13 @@ - + + + @@ -197,4 +201,3 @@ - \ No newline at end of file diff --git a/www/links.html b/www/links.html index 02bc686db..3945b9afa 100644 --- a/www/links.html +++ b/www/links.html @@ -5,8 +5,10 @@ - ImageMagick: Related Web Sites + + + @@ -19,11 +21,13 @@ - + + + @@ -157,4 +161,3 @@ - \ No newline at end of file diff --git a/www/magick++.html b/www/magick++.html index 077d07a96..e23b911bd 100644 --- a/www/magick++.html +++ b/www/magick++.html @@ -5,8 +5,10 @@ - ImageMagick: Magick++, C++ API for ImageMagick + + + @@ -19,11 +21,13 @@ - + + + @@ -181,4 +185,3 @@ int main(int argc,char **argv) - \ No newline at end of file diff --git a/www/magick-core.html b/www/magick-core.html index 1d9e44e7f..61cbfa4c9 100644 --- a/www/magick-core.html +++ b/www/magick-core.html @@ -5,8 +5,10 @@ - ImageMagick: MagickCore, Low-level C API for ImageMagick + + + @@ -19,11 +21,13 @@ - + + + @@ -331,4 +335,3 @@ int main(int argc,char **argv) - \ No newline at end of file diff --git a/www/magick-script.html b/www/magick-script.html index e3a63e5cb..f9c784a55 100644 --- a/www/magick-script.html +++ b/www/magick-script.html @@ -5,8 +5,10 @@ - ImageMagick: Command-line Tools: Magick-script + + + @@ -19,11 +21,13 @@ - + + + @@ -1276,4 +1280,3 @@ transparent, extract, background, or shape the alpha channel - \ No newline at end of file diff --git a/www/magick-vector-graphics.html b/www/magick-vector-graphics.html index 6b5b4f433..d21e356c2 100644 --- a/www/magick-vector-graphics.html +++ b/www/magick-vector-graphics.html @@ -5,8 +5,10 @@ - ImageMagick: Magick Vector Graphics + + + @@ -19,11 +21,13 @@ - + + + @@ -874,4 +878,3 @@ round
    - \ No newline at end of file diff --git a/www/magick-wand.html b/www/magick-wand.html index 64b924977..b9395f6ee 100644 --- a/www/magick-wand.html +++ b/www/magick-wand.html @@ -5,8 +5,10 @@ - ImageMagick: MagickWand, C API for ImageMagick + + + @@ -19,11 +21,13 @@ - + + + @@ -377,4 +381,3 @@ int main(int argc,char **argv) - \ No newline at end of file diff --git a/www/magick.html b/www/magick.html index c454e82b4..2c6d108bf 100644 --- a/www/magick.html +++ b/www/magick.html @@ -5,8 +5,10 @@ - ImageMagick: Command-line Tools: Magick + + + @@ -19,11 +21,13 @@ - + + + @@ -1318,4 +1322,3 @@ transparent, extract, background, or shape the alpha channel - \ No newline at end of file diff --git a/www/miff.html b/www/miff.html index 914578f6b..77f89a289 100644 --- a/www/miff.html +++ b/www/miff.html @@ -5,8 +5,10 @@ - ImageMagick: Magick Image File Format + + + @@ -19,11 +21,13 @@ - + + + @@ -239,4 +243,3 @@ or fewer colors in the image, each byte of image data contains an index value. I - \ No newline at end of file diff --git a/www/mogrify.html b/www/mogrify.html index 76939bedc..ca0ca6ff0 100644 --- a/www/mogrify.html +++ b/www/mogrify.html @@ -5,8 +5,10 @@ - ImageMagick: Command-line Tools: Mogrify + + + @@ -19,11 +21,13 @@ - + + + @@ -1286,4 +1290,3 @@ transparent, extract, background, or shape the alpha channel - \ No newline at end of file diff --git a/www/montage.html b/www/montage.html index 419eb7011..577b6c6d1 100644 --- a/www/montage.html +++ b/www/montage.html @@ -5,8 +5,10 @@ - ImageMagick: Command-line Tools: Montage + + + @@ -19,11 +21,13 @@ - + + + @@ -632,4 +636,3 @@ transparent, extract, background, or shape the alpha channel - \ No newline at end of file diff --git a/www/motion-picture.html b/www/motion-picture.html index b3ca7ca98..392963958 100644 --- a/www/motion-picture.html +++ b/www/motion-picture.html @@ -5,8 +5,10 @@ - ImageMagick: Motion Picture Digital Images + + + @@ -19,11 +21,13 @@ - + + + @@ -188,4 +192,3 @@ convert bluebells.dpx -define dpx:television.time.code=10:00:02:15 bluebells-001 - \ No newline at end of file diff --git a/www/opencl.html b/www/opencl.html index 8ca8cb148..fc6552027 100644 --- a/www/opencl.html +++ b/www/opencl.html @@ -5,8 +5,10 @@ - ImageMagick: Parallel Execution with OpenCL + + + @@ -19,11 +21,13 @@ - + + + @@ -116,4 +120,3 @@ InitImageMagickOpenCL(MAGICK_OPENCL_DEVICE_SELECT_USER, (void*)(myDevices+2), NU - \ No newline at end of file diff --git a/www/openmp.html b/www/openmp.html index d6a8b88c0..29ba7cde8 100644 --- a/www/openmp.html +++ b/www/openmp.html @@ -5,8 +5,10 @@ - ImageMagick: Parallel Execution with OpenMP + + + @@ -19,11 +21,13 @@ - + + + @@ -95,4 +99,3 @@ Performance[8]: 40i 4.831ips 0.872e 15.680u 0:02.070 - \ No newline at end of file diff --git a/www/perl-magick.html b/www/perl-magick.html index b787208c7..7746efebd 100644 --- a/www/perl-magick.html +++ b/www/perl-magick.html @@ -5,8 +5,10 @@ - ImageMagick: PerlMagick, Perl API for ImageMagick + + + @@ -19,11 +21,13 @@ - + + + @@ -81,7 +85,7 @@ tar xvzf ImageMagick.tar.gz

    Next configure and compile ImageMagick:

    -
     cd ImageMagick-7.0.1 ./configure -with-perl make
    +
     cd ImageMagick-7.0.2 ./configure -with-perl make

    If ImageMagick / PerlMagick configured and compiled without complaint, you are ready to install it on your system. Administrator privileges are required to install. To install, type

    @@ -2599,4 +2603,3 @@ Image::Magick->QuantumDepth
     
     
     
    -
    \ No newline at end of file
    diff --git a/www/porting.html b/www/porting.html
    index 632edcb75..682feaca9 100644
    --- a/www/porting.html
    +++ b/www/porting.html
    @@ -5,8 +5,10 @@
     
     
     
    -  
         ImageMagick: Porting to ImageMagick Version 7
    +  
    +  
    +  
       
       
       
    @@ -19,11 +21,13 @@
       
       
       
    -  
    +  
       
       
    +  
       
       
    +  
       
     
     
    @@ -652,4 +656,3 @@ example "+annotate", "+resize", "+clut", and "+draw" .

    - \ No newline at end of file diff --git a/www/quantize.html b/www/quantize.html index 4a0968e84..b74c1fc9d 100644 --- a/www/quantize.html +++ b/www/quantize.html @@ -5,8 +5,10 @@ - ImageMagick: Color Reduction Utilizing Adaptive Spatial Subdivision + + + @@ -19,11 +21,13 @@ - + + + @@ -196,4 +200,3 @@ while number of nodes with (n2 > 0) > required maximum number of colors - \ No newline at end of file diff --git a/www/resources.html b/www/resources.html index a58c1bb39..b3e36e96d 100644 --- a/www/resources.html +++ b/www/resources.html @@ -5,8 +5,10 @@ - ImageMagick: Resources + + + @@ -19,11 +21,13 @@ - + + + @@ -197,7 +201,7 @@ $USERPROFILE/.config/ImageMagick <client path>
    -

    Above, $PREFIX is the default install path, typically c:\\Program Files\\ImageMagick-7.0.1.

    +

    Above, $PREFIX is the default install path, typically c:\\Program Files\\ImageMagick-7.0.2.

    For an uninstalled Windows installation, the configuration load order is:

    @@ -217,25 +221,25 @@ $USERPROFILE/.config/ImageMagick

    An image coder (i.e. encoder / decoder) is responsible for registering, optionally classifying, optionally reading, optionally writing, and unregistering one image format (e.g. PNG, GIF, JPEG, etc.). ImageMagick searches for coders in the following order and it uses the first match found:

    -$MAGICK_HOME/lib/ImageMagick-7.0.1/modules-Q16/coders
    -<client path>/../lib/ImageMagick-7.0.1/modules-Q16/coders
    -$MAGICK_HOME/lib/ImageMagick-7.0.1/modules-Q16/coders
    -$MAGICK_HOME/share/ImageMagick-7.0.1/modules-Q16/coders
    +$MAGICK_HOME/lib/ImageMagick-7.0.2/modules-Q16/coders
    +<client path>/../lib/ImageMagick-7.0.2/modules-Q16/coders
    +$MAGICK_HOME/lib/ImageMagick-7.0.2/modules-Q16/coders
    +$MAGICK_HOME/share/ImageMagick-7.0.2/modules-Q16/coders
     $XDG_CACHE_HOME/ImageMagick
     $HOME/.config/ImageMagick
    -<client path>/lib/ImageMagick-7.0.1/modules-Q16/coders
    +<client path>/lib/ImageMagick-7.0.2/modules-Q16/coders
     

    Filters

    ImageMagick provides a convenient mechanism for adding your own custom image processing algorithms. ImageMagick searches for filters in the following order and it uses the first match found:

    -$MAGICK_HOME/lib/ImageMagick-7.0.1/modules-Q16/filters
    -<client path>/../lib/ImageMagick-7.0.1/modules-Q16/filters
    -$MAGICK_HOME/lib/ImageMagick-7.0.1/modules-Q16/filters
    -$MAGICK_HOME/share/ImageMagick-7.0.1/modules-Q16/filters
    +$MAGICK_HOME/lib/ImageMagick-7.0.2/modules-Q16/filters
    +<client path>/../lib/ImageMagick-7.0.2/modules-Q16/filters
    +$MAGICK_HOME/lib/ImageMagick-7.0.2/modules-Q16/filters
    +$MAGICK_HOME/share/ImageMagick-7.0.2/modules-Q16/filters
     $XDG_CACHE_HOME/ImageMagick
     $HOME/.config/ImageMagick
    -<client path>/lib/ImageMagick-7.0.1/modules-Q16/filters
    +<client path>/lib/ImageMagick-7.0.2/modules-Q16/filters
     

    Fonts

    @@ -244,8 +248,8 @@ $HOME/.config/ImageMagick
     $MAGICK_CONFIGURE_PATH
    -$MAGICK_HOME/etc/ImageMagick/-7.0.1
    -$MAGICK_HOME/share/ImageMagick-7.0.1
    +$MAGICK_HOME/etc/ImageMagick/-7.0.2
    +$MAGICK_HOME/share/ImageMagick-7.0.2
     $XDG_CACHE_HOME/ImageMagick
     $HOME/.config/ImageMagick
     <client path>/etc/ImageMagick
    @@ -377,4 +381,3 @@ $MAGICK_FONT_PATH
     
     
     
    -
    \ No newline at end of file
    diff --git a/www/search.html b/www/search.html
    index a8643224d..4cb3b447d 100644
    --- a/www/search.html
    +++ b/www/search.html
    @@ -5,8 +5,10 @@
     
     
     
    -  
         ImageMagick: Search
    +  
    +  
    +  
       
       
       
    @@ -19,11 +21,13 @@
       
       
       
    -  
    +  
       
       
    +  
       
       
    +  
       
     
     
    diff --git a/www/security-policy.html b/www/security-policy.html
    new file mode 100644
    index 000000000..28844021a
    --- /dev/null
    +++ b/www/security-policy.html
    @@ -0,0 +1,167 @@
    +
    +
    +
    +
    +
    +
    +
    +    ImageMagick: Security Policy
    +  
    +  
    +  
    +  
    +  
    +  
    +  
    +  
    +  
    +  
    +  
    +  
    +  
    +  
    +  
    +  
    +  
    +  
    +  
    +  
    +  
    +  
    +  
    +
    +
    +
    +
    +
    + + + +
    +
    +
    +
    +

    ImageMagick includes a security policy configuration file, policy.xml. It is useful for limiting the resources consumed by ImageMagick and can help prevent a denial-of-service or other exploits.

    + +

    As an example, suppose you download an image from the internet and unbeknownst to you its been crafted to generate a 20000 by 20000 pixel image. ImageMagick will attempt to allocate enough resources (memory, disk) and your system will likely deny the resource request and exit. However, its also possible that your computer might temporarily sluggish or unavailable or ImageMagick may abort. To prevent such a scenario, you can set limits in the policy.xml configuration file. You may ask why ImageMagick does not already include reasonable limits? Simply because what is reasonable in your environment, might not be reasonable to someone else. We, for example, have access to a host with 1TB of memory whereas you may be running ImageMagick on an iPhone. If you utilize ImageMagick from a public website, you may want to increase security by preventing usage of the MVG or HTTPS coders. Only you can decide what are reasonable limits taking in consideration your environment. We provide this policy with reasonable limits and encourage you to use as a template for your own policy:

    + +
    +<policymap>
    +  <policy domain="resource" name="temporary-path" value="/tmp"/>
    +  <policy domain="resource" name="memory" value="256MiB"/>
    +  <policy domain="resource" name="map" value="512MiB"/>
    +  <policy domain="resource" name="width" value="8KP"/>
    +  <policy domain="resource" name="height" value="8KP"/>
    +  <policy domain="resource" name="area" value="128MB"/>
    +  <policy domain="resource" name="disk" value="1GiB"/>
    +  <policy domain="resource" name="file" value="768"/>
    +  <policy domain="resource" name="thread" value="2"/>
    +  <policy domain="resource" name="throttle" value="0"/>
    +  <policy domain="resource" name="time" value="120"/>
    +  <policy domain="system" name="precision" value="6"/>
    +  <policy domain="cache" name="shared-secret" stealth="true" value="replace with your secret phrase"/>
    +  <policy domain="coder" rights="none" pattern="MVG" />
    +  <policy domain="delegate" rights="none" pattern="HTTPS" />  
    +  <policy domain="path" rights="none" pattern="@*"/>  
    +</policymap>
    +
    + +

    Since we process multiple simultaneous sessions, we do not want any one session consuming all the available memory.With this policy, large images are cached to disk. If the image is too large and exceeds the pixel cache disk limit, the program exits. In addition, we place a time limit to prevent any run-away processing tasks. If any one image has a width or height that exceeds 8192 pixels, an exception is thrown and processing stops. As of ImageMagick 7.0.1-8 and 6.9.4-6, you can prevent the use of any delegate or all delegates (set the pattern to "*"). Note, prior to these releases, use a domain of coder to prevent delegate usage (e.g. domain="coder" rights="none" pattern="HTTPS"). The policy also prevents indirect reads. If you want to, for example, read text from a file (e.g. caption:@myCaption.txt), you'll need to remove this policy.

    + +

    Here is what you can expect when you restrict the HTTPS coder, for example:

    + +
    +$ convert https://www.imagemagick.org/images/wizard.png wizard.jpg
    +convert: not authorized `HTTPS'
    +convert: unable to open file: No such file or directory
    +convert: no images defined `wizard.jpg'
    +
    + +

    You can verify your policy changes are in effect with this command:

    + +
    +-> identify -list policy
    +Path: ImageMagick/policy.xml
    +  Policy: Resource
    +    name: time
    +    value: 120
    +  Policy: Resource
    +    name: throttle
    +    value: 0
    +  Policy: Resource
    +    name: thread
    +    value: 2
    +  Policy: Resource
    +    name: file
    +    value: 768
    +  Policy: Resource
    +    name: disk
    +    value: 1GiB
    +  Policy: Resource
    +    name: map
    +    value: 512MiB
    +  Policy: Resource
    +    name: memory
    +    value: 256MiB
    +  Policy: Resource
    +    name: area
    +    value: 128MB
    +  Policy: Resource
    +    name: height
    +    value: 8KP
    +  Policy: Resource
    +    name: width
    +    value: 8KP
    +  Policy: Resource
    +    name: temporary-path
    +    value: /tmp
    +  Policy: System
    +    name: precision
    +    value: 6
    +  Policy: Cache
    +    name: shared-secret
    +    value: My voice is my passport.  Verify me.
    +  Policy: Path
    +    rights: None 
    +    pattern: @*
    +
    +Path: [built-in]
    +  Policy: Undefined
    +    rights: None 
    +
    + +

    For additional details about resource limits and the policy configuration file, read Resources and Architecture.

    +
    + +
    + + + +
    + + diff --git a/www/sitemap.html b/www/sitemap.html index 5fa9201b8..45e5cb601 100644 --- a/www/sitemap.html +++ b/www/sitemap.html @@ -5,8 +5,10 @@ - ImageMagick: Site Map + + + @@ -19,11 +21,13 @@ - + + + @@ -229,4 +233,3 @@ - \ No newline at end of file diff --git a/www/sponsors.html b/www/sponsors.html index 604f8324e..39cc17c69 100644 --- a/www/sponsors.html +++ b/www/sponsors.html @@ -40,7 +40,7 @@ Options Resources Develop - Search + Search Community diff --git a/www/stream.html b/www/stream.html index 315c2033e..ded525718 100644 --- a/www/stream.html +++ b/www/stream.html @@ -5,8 +5,10 @@ - ImageMagick: Command-line Tools: Stream + + + @@ -19,11 +21,13 @@ - + + + @@ -266,4 +270,3 @@ stream -map i -storage-type double 'image.tif[100x100+30+40]' gray.raw - \ No newline at end of file diff --git a/www/subversion.html b/www/subversion.html index e7d52ba50..67319ff02 100644 --- a/www/subversion.html +++ b/www/subversion.html @@ -5,8 +5,10 @@ - ImageMagick: Subversion + + + @@ -19,11 +21,13 @@ - + + + @@ -57,7 +61,7 @@

    To retrieve, or check out ImageMagick stable, use this command:

    -
     svn co https://subversion.imagemagick.org/subversion/ImageMagick/branches/ImageMagick-7.0.1 ImageMagick-7.0.1
    +
     svn co https://subversion.imagemagick.org/subversion/ImageMagick/branches/ImageMagick-7.0.2 ImageMagick-7.0.2

    To retrieve, or check out ImageMagick development, use this command:

    @@ -90,4 +94,3 @@ svn update
     
     
     
    -
    \ No newline at end of file
    diff --git a/www/support.html b/www/support.html
    index d11f78c2c..3fa4eb025 100644
    --- a/www/support.html
    +++ b/www/support.html
    @@ -5,8 +5,10 @@
     
     
     
    -  
         ImageMagick: Support ImageMagick Development
    +  
    +  
    +  
       
       
       
    @@ -19,11 +21,13 @@
       
       
       
    -  
    +  
       
       
    +  
       
       
    +  
       
     
     
    @@ -61,9 +65,9 @@
     
     
    [Network Redux] We manage everything so you don't have to

    -
    [Knovotech] The world's most most advanced nutrition & health database

    +
    [AMD] Enabling today. Inspiring tomorrow.

    [TransloadIt] The world's most versatile file uploading and processing service

    -
    +
    [Nutrition Report]The world's most most advanced nutrition & health database

    Contribute a Bug Fix or Enhancement

    @@ -150,4 +154,3 @@ USA - \ No newline at end of file diff --git a/www/webp.html b/www/webp.html index 84f6c21b3..228738a23 100644 --- a/www/webp.html +++ b/www/webp.html @@ -5,8 +5,10 @@ - ImageMagick: WebP Encoding Options + + + @@ -19,11 +21,13 @@ - + + + @@ -176,4 +180,3 @@ convert wizard.png -quality 50 -define webp:lossless=true wizard.webp - \ No newline at end of file