From: Cristy Date: Tue, 28 Mar 2017 09:59:57 +0000 (-0400) Subject: ... X-Git-Tag: 7.0.5-5~83 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f41bcd129562336451b7b862b129b13f55ec5572;p=imagemagick ... --- diff --git a/coders/pcx.c b/coders/pcx.c index f280df5bc..ed12378d2 100644 --- a/coders/pcx.c +++ b/coders/pcx.c @@ -337,10 +337,8 @@ static Image *ReadPCXImage(const ImageInfo *image_info,ExceptionInfo *exception) image->rows=(size_t) MagickAbsoluteValue((ssize_t) pcx_info.bottom- pcx_info.top)+1UL; if ((image->columns == 0) || (image->rows == 0) || - ((pcx_info.bits_per_pixel != 1) && - (pcx_info.bits_per_pixel != 2) && - (pcx_info.bits_per_pixel != 4) && - (pcx_info.bits_per_pixel != 8))) + ((pcx_info.bits_per_pixel != 1) && (pcx_info.bits_per_pixel != 2) && + (pcx_info.bits_per_pixel != 4) && (pcx_info.bits_per_pixel != 8))) ThrowReaderException(CorruptImageError,"ImproperImageHeader"); image->depth=pcx_info.bits_per_pixel; image->units=PixelsPerInchResolution; @@ -352,6 +350,8 @@ static Image *ReadPCXImage(const ImageInfo *image_info,ExceptionInfo *exception) ThrowReaderException(CorruptImageError,"ImproperImageHeader"); pcx_info.reserved=(unsigned char) ReadBlobByte(image); pcx_info.planes=(unsigned char) ReadBlobByte(image); + if (pcx_info.planes == 0) + ThrowReaderException(CorruptImageError,"ImproperImageHeader"); if ((pcx_info.bits_per_pixel*pcx_info.planes) >= 64) ThrowReaderException(CorruptImageError,"ImproperImageHeader"); one=1; @@ -389,7 +389,7 @@ static Image *ReadPCXImage(const ImageInfo *image_info,ExceptionInfo *exception) if (HeapOverflowSanityCheck(image->rows, (size_t) pcx_info.bytes_per_line) != MagickFalse) ThrowReaderException(CorruptImageError,"ImproperImageHeader"); pcx_packets=(size_t) image->rows*pcx_info.bytes_per_line; - if (HeapOverflowSanityCheck(pcx_packets, (size_t)pcx_info.planes) != MagickFalse) + if (HeapOverflowSanityCheck(pcx_packets, (size_t) pcx_info.planes) != MagickFalse) ThrowReaderException(CorruptImageError,"ImproperImageHeader"); pcx_packets=(size_t) pcx_packets*pcx_info.planes; if ((size_t) (pcx_info.bits_per_pixel*pcx_info.planes*image->columns) > diff --git a/www/ImageMagickObject.html b/www/ImageMagickObject.html index 4e110f5d5..a528aa646 100644 --- a/www/ImageMagickObject.html +++ b/www/ImageMagickObject.html @@ -130,4 +130,4 @@ regsvr32 /u /s ImageMagickObject.dll - \ No newline at end of file + \ No newline at end of file diff --git a/www/Magick++/Color.html b/www/Magick++/Color.html index 1e0047aa0..4a38b9f9a 100644 --- a/www/Magick++/Color.html +++ b/www/Magick++/Color.html @@ -14,9 +14,9 @@ The base type used to represent color samples in ImageMagick is the Quantum type. Pixels are represented by a structure of Quantum values. For example, an RGB pixel contains red, green, and blue quantums, while an RGBA pixel contains red, green, blue, and opacity quantums. The maximum value that a Quantum can attain is specified by a constant value represented by the MaxRGB define, which is itself determined by the number of bits in a Quantum. The QuantumDepth build option determines the number of bits in a Quantum. -

PixelPacket

+

Quantum

-PixelPacket is the internal representation of a pixel in ImageMagick. ImageMagick may be compiled to support 32, 64, or 128 bit pixels of type PixelPacket. This is controlled by the value of the QuantumDepth define. The default is 32 bit pixels (QuantumDepth=8), which provides the best performance and the least resource consumption. If additional color precision or range is desired, then ImageMagick may be compiled with QuantumDepth=16 or QuantumDepth=32. The following table shows the relationship between QuantumDepth, the type of Quantum, and the overall PixelPacket size. +Quantum is the internal representation of a pixel in ImageMagick. ImageMagick may be compiled to support 32, 64, or 128 bit pixels of type Quantum. This is controlled by the value of the QuantumDepth define. The default is 32 bit pixels (QuantumDepth=8), which provides the best performance and the least resource consumption. If additional color precision or range is desired, then ImageMagick may be compiled with QuantumDepth=16 or QuantumDepth=32. The following table shows the relationship between QuantumDepth, the type of Quantum, and the overall Quantum size.

Effect Of QuantumDepth Values

@@ -29,7 +29,7 @@ PixelPacket is the internal representation of a pixel in ImageMagick. ImageMagic +

Quantum Size

@@ -53,7 +53,7 @@ PixelPacket is the internal representation of a pixel in ImageMagick. ImageMagic

128 bits

Quantum Typedef

-

PixelPacket Size

8

Color Class

-

The Color base class is not intended to be used directly. Normally a user will construct a derived class or inherit from this class. Color arguments are must be scaled to fit the Quantum size. The Color class contains a pointer to a PixelPacket, which may be allocated by the Color class, or may refer to an existing pixel in an image.

+

The Color base class is not intended to be used directly. Normally a user will construct a derived class or inherit from this class. Color arguments are must be scaled to fit the Quantum size. The Color class contains a pointer to a Quantum, which may be allocated by the Color class, or may refer to an existing pixel in an image.

An alternate way to construct the class is via an SVG-compatible color specification string (e.g. Color("red") or Color ("#FF0000")). Since the class may be constructed from a string, convenient strings may be passed in place of an explicit Color object in methods which accept a reference to Color. Color may also be converted to a std::string for convenience in user interfaces, and for saving settings to a text file.

class Color @@ -107,14 +107,14 @@ class Color // Return SVG color specification string /* virtual */ operator std::string() const; - // Return ImageMagick PixelPacket - operator PixelPacket() const; + // Return ImageMagick Quantum + operator Quantum() const; - // Construct color via ImageMagick PixelPacket - Color ( const PixelPacket &color_ ); + // Construct color via ImageMagick Quantum + Color ( const Quantum &color_ ); - // Set color via ImageMagick PixelPacket - const Color& operator= ( PixelPacket &color_ ); + // Set color via ImageMagick Quantum + const Color& operator= ( Quantum &color_ ); };

Color Derived Classes

diff --git a/www/Magick++/Documentation.html b/www/Magick++/Documentation.html index 8feb532f5..4076cf00c 100644 --- a/www/Magick++/Documentation.html +++ b/www/Magick++/Documentation.html @@ -4,7 +4,7 @@ Magick++ API Documentation - +

diff --git a/www/Magick++/Image++.html b/www/Magick++/Image++.html index 32e8acc0b..e3f02eaf4 100644 --- a/www/Magick++/Image++.html +++ b/www/Magick++/Image++.html @@ -4,7 +4,7 @@ Magick++ API: Working with Images - +
@@ -2947,7 +2947,7 @@ or to capture image from

Low-Level Image Pixel Access

-Image pixels (of type PixelPacket ) +Image pixels (of type Quantum ) may be accessed directly via the Image Pixel Cache .  The image pixel cache is a rectangular window into the actual image pixels (which may be in memory, memory-mapped from a disk file, or entirely on @@ -2993,11 +2993,11 @@ image.modifyImage(); image.type(TrueColorType); // Request pixel region with size 60x40, and top origin at 20x30 ssize_t columns = 60; -PixelPacket *pixel_cache = image.getPixels(20,30,columns,40); +Quantum *pixel_cache = image.getPixels(20,30,columns,40); // Set pixel at column 5, and row 10 in the pixel cache to red. ssize_t column = 5; ssize_t row = 10; -PixelPacket *pixel = pixel_cache+row*columns+column; +Quantum *pixel = pixel_cache+row*columns+column; *pixel = Color("red"); // Save changes to underlying image . image.syncPixels(); @@ -3026,7 +3026,7 @@ image.write("horse.png");
getConstPixels
- const PixelPacket + const Quantum * const ssize_t x_, const ssize_t y_, const size_t columns_, const size_t rows_ @@ -3081,7 +3081,7 @@ images, the indexes are used to contain the alpha channel.
getPixels
- PixelPacket * + Quantum * const ssize_t x_, const ssize_t y_, const size_t columns_, const size_t rows_ Transfers pixels from the image to the pixel @@ -3096,7 +3096,7 @@ user.
setPixels
- PixelPacket * + Quantum * const ssize_t x_, const ssize_t y_, const size_t columns_, const size_t rows_ Allocates a pixel cache region to store image diff --git a/www/Magick++/PixelPacket.html b/www/Magick++/PixelPacket.html index 2ee56af91..ca738ef87 100644 --- a/www/Magick++/PixelPacket.html +++ b/www/Magick++/PixelPacket.html @@ -4,7 +4,7 @@ Magick++ API: PixelPacket - +
@@ -57,11 +57,11 @@

Interpretation

-

RGBColorspace

+

RGBColorspace

-

RGBColorspace + matte

+

RGBColorspace + matte

-

CMYKColorspace

+

CMYKColorspace

red

diff --git a/www/Magick++/Pixels.html b/www/Magick++/Pixels.html index aa689716e..3b38b60c2 100644 --- a/www/Magick++/Pixels.html +++ b/www/Magick++/Pixels.html @@ -10,7 +10,7 @@

Magick::Pixels

The Pixels class provides efficient access to raw image -pixels. Image pixels (of type PixelPacket) +pixels. Image pixels (of type Quantum) may be accessed directly via the Image Pixel Cache. The image pixel cache is a rectangular window (a view) into the actual image pixels (which may be in memory, memory-mapped from a disk file, or @@ -33,7 +33,7 @@ method should be invoked to reduce the reference count on the underlying image to one. If this is not done, then it is possible for a previous generation of the image to be modified due to the use of reference counting when copying or constructing an Image.

-

The PixelPacket* returned by the set and get +

The Quantum* returned by the set and get methods, and the IndexPacket* returned by the indexes method point to pixel data managed by the Pixels class. The Pixels class is responsible for releasing resources associated with the pixel @@ -61,7 +61,7 @@ right (minus lines and text):

// Set all pixels in region anchored at 38x36, with size 160x230 to green. size_t columns = 196; size_t rows = 162; Color green("green"); - PixelPacket *pixels = view.get(38,36,columns,rows); + Quantum *pixels = view.get(38,36,columns,rows); for ( ssize_t row = 0; row < rows ; ++row ) for ( ssize_t column = 0; column < columns ; ++column ) *pixels++=green; @@ -108,7 +108,7 @@ methods:

get

-

PixelPacket*

+

Quantum*

const ssize_t x_, const ssize_t y_, const size_t @@ -127,7 +127,7 @@ the pixel cache as defined by the specified rectangular region.

getConst

-

const PixelPacket*

+

const Quantum*

const ssize_t x_, const ssize_t y_, const size_t @@ -143,7 +143,7 @@ the pixel cache as defined by the specified rectangular region.

set

-

PixelPacket*

+

Quantum*

const ssize_t x_, const ssize_t y_, const size_t diff --git a/www/advanced-unix-installation.html b/www/advanced-unix-installation.html index b06b42482..5cb34b454 100644 --- a/www/advanced-unix-installation.html +++ b/www/advanced-unix-installation.html @@ -78,7 +78,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.5-0 ./configure
+
 cd ImageMagick-7.0.5-4 ./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:

@@ -534,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.5-0.tar.gz cd ImageMagick-7.0.5-0

Configure ImageMagick:

+
 tar xvzf ImageMagick-7.0.5-4.tar.gz cd ImageMagick-7.0.5-4

Configure ImageMagick:

 ./configure --prefix=/opt --with-quantum-depth=16 \
   --disable-dependency-tracking --with-x=yes \
@@ -566,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.5-?.tar.bz2
cd ImageMagick-7.0.5-0
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.5-?.tar.bz2
cd ImageMagick-7.0.5-4
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

@@ -636,4 +636,4 @@ identify -list format
- \ No newline at end of file + \ No newline at end of file diff --git a/www/advanced-windows-installation.html b/www/advanced-windows-installation.html index a3de7bf16..c177f7c18 100644 --- a/www/advanced-windows-installation.html +++ b/www/advanced-windows-installation.html @@ -331,7 +331,7 @@ dmake release
  1. Double-click on - VisualMagick/bin/ImageMagick-7.0.5-0-Q16-windows-dll.exe + VisualMagick/bin/ImageMagick-7.0.5-4-Q16-windows-dll.exe to launch the ImageMagick binary distribution.
  2. Complete the installer screens to install ImageMagick on your system.
@@ -401,4 +401,4 @@ _MAGICKMOD_
- \ No newline at end of file + \ No newline at end of file diff --git a/www/animate.html b/www/animate.html index 75310ac4a..6d2e9940c 100644 --- a/www/animate.html +++ b/www/animate.html @@ -532,4 +532,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/api/Image++.html b/www/api/Image++.html index 516c96ec8..5628a3c31 100644 --- a/www/api/Image++.html +++ b/www/api/Image++.html @@ -608,7 +608,7 @@ matte differ from the current image.
composite
- const Image + const Image &compositeImage_, ssize_t xOffset_, ssize_t yOffset_, CompositeOperator compose_ = InCompositeOp @@ -617,7 +617,7 @@ offset specified by xOffset_, yOffset_ using the composition algorithm specified by compose_. - const Image + const Image &compositeImage_, const Geometry &offset_, CompositeOperator compose_ = InCompositeOp @@ -626,7 +626,7 @@ offset specified by offset_ using the composition algorithm specified by compose_ . - const Image + const Image &compositeImage_, GravityType gravity_, CompositeOperator compose_ = InCompositeOp @@ -2989,7 +2989,7 @@ or to capture image from

Low-Level Image Pixel Access

-Image pixels (of type PixelPacket ) +Image pixels (of type PixelPacket ) may be accessed directly via the Image Pixel Cache . The image pixel cache is a rectangular window into the actual image pixels (which may be in memory, memory-mapped from a disk file, or entirely on @@ -3069,7 +3069,7 @@ image.write("horse.png");
getConstPixels
- const PixelPacket + const PixelPacket * const ssize_t x_, const ssize_t y_, const size_t columns_, const size_t rows_ @@ -3124,7 +3124,7 @@ images, the indexes are used to contain the alpha channel.
getPixels
- PixelPacket * + PixelPacket * const ssize_t x_, const ssize_t y_, const size_t columns_, const size_t rows_ Transfers pixels from the image to the pixel @@ -3139,7 +3139,7 @@ user.
setPixels
- PixelPacket * + PixelPacket * const ssize_t x_, const ssize_t y_, const size_t columns_, const size_t rows_ Allocates a pixel cache region to store image diff --git a/www/api/magick++-classes.html b/www/api/magick++-classes.html index 45d1e0d17..2b803618e 100644 --- a/www/api/magick++-classes.html +++ b/www/api/magick++-classes.html @@ -92,7 +92,7 @@ Geometry Geometry specification. -Image +Image Image frame. This is the primary object in Magick++. Montage @@ -107,7 +107,7 @@ containers of image frames. TypeMetric Container for font type metrics (use with -Image::fontTypeMetrics). +Image::fontTypeMetrics). diff --git a/www/architecture.html b/www/architecture.html index 19e6449ef..7b1863ad5 100644 --- a/www/architecture.html +++ b/www/architecture.html @@ -135,7 +135,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 -version
Version: ImageMagick 7.0.5-0 2017-02-18 Q16 https://www.imagemagick.org
+
 identify -version
Version: ImageMagick 7.0.5-4 2017-03-18 Q16 https://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

@@ -1423,4 +1423,4 @@ ModuleExport size_t analyzeImage(Image **images,const int argc,const char **argv
- \ No newline at end of file + \ No newline at end of file diff --git a/www/changelog.html b/www/changelog.html index 6f2d70c4d..112cbef7c 100644 --- a/www/changelog.html +++ b/www/changelog.html @@ -56,7 +56,26 @@
-
2017-02-20 7.0.5-0 Cristy <quetzlzacatenango@image...>
+
2017-03-24 7.0.5-4 Cristy <quetzlzacatenango@image...>
+
  • Release ImageMagick version 7.0.5-4, GIT revision 19754:350fff3:20170324.
  • +
    2017-03-21 7.0.5-4 Cristy <quetzlzacatenango@image...>
    +
  • Respect -loop option for animate -window (reference https://www.imagemagick.org/discourse-server/viewtopic.html?f=3&t=31619).
  • +
    2017-03-17 7.0.5-3 Cristy <quetzlzacatenango@image...>
    +
  • Release ImageMagick version 7.0.5-3, GIT revision 19741:070c3fb:20170317.
  • +
    2017-03-14 7.0.5-3 Cristy <quetzlzacatenango@image...>
    +
  • Support namespaces for the security policy.
  • +
  • Support the -authenticate option for PDF (reference Counting objects: 7, done.g/discourse-server/viewtopic.html?f=3&t=31530).
  • +
    2017-03-11 7.0.5-2 Cristy <quetzlzacatenango@image...>
    +
  • Release ImageMagick version 7.0.5-2, GIT revision 19696:da91a7c:20170311.
  • +
    2017-03-06 7.0.5-2 Cristy <quetzlzacatenango@image...>
    +
  • Respect throttle policy (reference https://github.com/ImageMagick/ImageMagick/issues/393).
  • +
  • Return proper minima / maxima (reference https://www.imagemagick.org/discourse-server/viewtopic.html?f=3&t=31377).
  • +
    2017-03-03 7.0.5-1 Cristy <quetzlzacatenango@image...>
    +
  • Release ImageMagick version 7.0.5-1, GIT revision 19662:b7f455a:20170303.
  • +
    2017-02-21 7.0.5-1 Cristy <quetzlzacatenango@image...>
    +
  • Fix Spurious memory allocation message (reference https://www.imagemagick.org/discourse-server/viewtopic.html?f=3&t=31438).
  • +
  • Identical images should return inf for PSNR (reference https://www.imagemagick.org/discourse-server/viewtopic.html?f=3&t=31487).
  • +
    2017-02-20 7.0.5-0 Cristy <quetzlzacatenango@image...>
  • Release ImageMagick version 7.0.5-0, GIT revision 19616:505fea9:20170220.
  • 2017-02-20 7.0.5-0 Cristy <quetzlzacatenango@image...>
  • Fix transient bug with -separate option (reference https://github.com/ImageMagick/ImageMagick/issues/385).
  • @@ -356,4 +375,4 @@
    - \ No newline at end of file + \ No newline at end of file diff --git a/www/cipher.html b/www/cipher.html index 8d11bb699..bff28c529 100644 --- a/www/cipher.html +++ b/www/cipher.html @@ -140,4 +140,4 @@ Examples - \ No newline at end of file + \ No newline at end of file diff --git a/www/color-management.html b/www/color-management.html index 5d0e8bbd6..a8357f99c 100644 --- a/www/color-management.html +++ b/www/color-management.html @@ -150,4 +150,4 @@ convert myimage_channels_*.png -set colorspace HSL -combine -colorspace RGB -set
    - \ No newline at end of file + \ No newline at end of file diff --git a/www/color.html b/www/color.html index cfbbb30b8..9c95c0c75 100644 --- a/www/color.html +++ b/www/color.html @@ -4951,4 +4951,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 d68a0d8f7..c51ff66b0 100644 --- a/www/command-line-options.html +++ b/www/command-line-options.html @@ -1924,6 +1924,11 @@ available:

    neato). + + exr:color-type=value + Specifies the color type for the EXR format: RGB, RGBA, YC, YCA, Y, YA, R, G, B, A). + + filter:option=value Set a filter option for use with
    -resize. @@ -1953,6 +1958,16 @@ available:

    (requires a 256x256 input image). + + identify:locate=minimum|maximum + Locates the coordinates of one or more image minimum or maximum + + + + identify:limit=number + Locates the coordinates for the number of minima or maxima specified + + jp2:layer-number=value Sets the maximum number of quality layers to decode. Same for JPT, JC2, @@ -2120,6 +2135,16 @@ available:

    + + pdf:stop-on-error=true + + + + + pdf:pdf:page-direction=right-to-left + + + phash:colorspaces=colorspace,colorspace,... the perceptual hash defaults to the sRGB and HCLp colorspaces. When @@ -2409,8 +2434,8 @@ available:

    - tiff:exif-properties=false - Skips reading the EXIF properties. + tiff:exif-properties=true + Enables reading the EXIF properties. @@ -2448,6 +2473,21 @@ available:

    type:hinting=off + + + txt:compliance=css + + + + + x:screen=true + Obtains the image from the root window + + + + x:silent=true + Turns off the beep when importing an image +

    For example, to create a postscript file that will render only the black @@ -8054,4 +8094,4 @@ but with strict boolean masking.

    - \ 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 8d61a0284..44316f14b 100644 --- a/www/command-line-processing.html +++ b/www/command-line-processing.html @@ -688,4 +688,4 @@ magick -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 1eafd1cd9..2bff4a32b 100644 --- a/www/command-line-tools.html +++ b/www/command-line-tools.html @@ -107,4 +107,4 @@ magick convert logo: logo.jpg - \ No newline at end of file + \ No newline at end of file diff --git a/www/compare.html b/www/compare.html index fa11f1624..7265d1508 100644 --- a/www/compare.html +++ b/www/compare.html @@ -365,4 +365,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 925feceaf..86068e5bb 100644 --- a/www/compose.html +++ b/www/compose.html @@ -644,3 +644,4 @@ href="https://www.imagemagick.org/script/command-line-options.html#list">-list c + \ No newline at end of file diff --git a/www/composite.html b/www/composite.html index b73715887..ac5c8e7df 100644 --- a/www/composite.html +++ b/www/composite.html @@ -526,4 +526,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/conjure.html b/www/conjure.html index 15fd21dc5..87f149dcf 100644 --- a/www/conjure.html +++ b/www/conjure.html @@ -1138,4 +1138,4 @@ fill="color name", channel="All, Default, Alpha, Black, Blue, CMYK, Cyan, Gray, - \ No newline at end of file + \ No newline at end of file diff --git a/www/connected-components.html b/www/connected-components.html index 67c22c6d1..262c33a7a 100644 --- a/www/connected-components.html +++ b/www/connected-components.html @@ -121,4 +121,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/convert.html b/www/convert.html index ab925644c..55b65644e 100644 --- a/www/convert.html +++ b/www/convert.html @@ -1322,4 +1322,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/develop.html b/www/develop.html index d6262a6e7..936255c66 100644 --- a/www/develop.html +++ b/www/develop.html @@ -185,4 +185,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/www/display.html b/www/display.html index b21e98669..006b22ff0 100644 --- a/www/display.html +++ b/www/display.html @@ -569,4 +569,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/distribute-pixel-cache.html b/www/distribute-pixel-cache.html index a72131223..6be185565 100644 --- a/www/distribute-pixel-cache.html +++ b/www/distribute-pixel-cache.html @@ -89,4 +89,4 @@ convert -limit memory 1GiB -limit map 2GiB -limit disk 4GiB \ - \ No newline at end of file + \ No newline at end of file diff --git a/www/download.html b/www/download.html index f144a15ab..55af15b94 100644 --- a/www/download.html +++ b/www/download.html @@ -76,16 +76,16 @@ - ImageMagick-7.0.5-0.x86_64.rpm - download - download + ImageMagick-7.0.5-4.x86_64.rpm + download + download Redhat / CentOS 7.1 x86_64 RPM - ImageMagick-libs-7.0.5-0.x86_64.rpm - download - download + ImageMagick-libs-7.0.5-4.x86_64.rpm + download + download Redhat / CentOS 7.1 x86_64 RPM @@ -122,8 +122,8 @@

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

    -
     rpm -Uvh ImageMagick-7.0.5-0.x86_64.rpm

    You'll need the libraries as well:

    -
     rpm -Uvh ImageMagick-libs-7.0.5-0.x86_64.rpm
    +
     rpm -Uvh ImageMagick-7.0.5-4.x86_64.rpm

    You'll need the libraries as well:

    +
     rpm -Uvh ImageMagick-libs-7.0.5-4.x86_64.rpm

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

    @@ -258,7 +258,7 @@ display logo.gif
     
     ./imagemagick_compile.sh VERSION
     
    -

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

    +

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

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

      @@ -307,9 +307,9 @@ display logo.gif - ImageMagick-7.0.5-0-Q16-x64-dll.exe - download - download + ImageMagick-7.0.5-4-Q16-x64-dll.exe + download + download Win64 dynamic at 16 bits-per-pixel component @@ -327,93 +327,93 @@ display logo.gif - ImageMagick-7.0.5-0-Q16-x64-static.exe - download - download + ImageMagick-7.0.5-4-Q16-x64-static.exe + download + download Win64 static at 16 bits-per-pixel component - ImageMagick-7.0.5-0-Q8-x64-dll.exe - download - download + ImageMagick-7.0.5-4-Q8-x64-dll.exe + download + download Win64 dynamic at 8 bits-per-pixel component - ImageMagick-7.0.5-0-Q8-x64-static.exe - download - download + ImageMagick-7.0.5-4-Q8-x64-static.exe + download + download Win64 static at 8 bits-per-pixel component - ImageMagick-7.0.5-0-Q16-HDRI-x64-dll.exe - download - download + ImageMagick-7.0.5-4-Q16-HDRI-x64-dll.exe + download + download Win64 dynamic at 16 bits-per-pixel component with high dynamic-range imaging enabled - ImageMagick-7.0.5-0-Q16-HDRI-x64-static.exe - download - download + ImageMagick-7.0.5-4-Q16-HDRI-x64-static.exe + download + download Win64 static at 16 bits-per-pixel component with high dynamic-range imaging enabled - ImageMagick-7.0.5-0-Q16-x86-dll.exe - download - download + ImageMagick-7.0.5-4-Q16-x86-dll.exe + download + download Win32 dynamic at 16 bits-per-pixel component - ImageMagick-7.0.5-0-Q16-x86-static.exe - download - download + ImageMagick-7.0.5-4-Q16-x86-static.exe + download + download Win32 static at 16 bits-per-pixel component - ImageMagick-7.0.5-0-Q8-x86-dll.exe - download - download + ImageMagick-7.0.5-4-Q8-x86-dll.exe + download + download Win32 dynamic at 8 bits-per-pixel component - ImageMagick-7.0.5-0-Q8-x86-static.exe - download - download + ImageMagick-7.0.5-4-Q8-x86-static.exe + download + download Win32 static at 8 bits-per-pixel component - ImageMagick-7.0.5-0-Q16-HDRI-x86-dll.exe - download - download + ImageMagick-7.0.5-4-Q16-HDRI-x86-dll.exe + download + download Win32 dynamic at 16 bits-per-pixel component with high dynamic-range imaging enabled - ImageMagick-7.0.5-0-Q16-HDRI-x86-static.exe - download - download + ImageMagick-7.0.5-4-Q16-HDRI-x86-static.exe + download + download Win32 static at 16 bits-per-pixel component with high dynamic-range imaging enabled - ImageMagick-7.0.5-0-portable-Q16-x86.zip - download - download + ImageMagick-7.0.5-4-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.5-0-portable-Q16-x64.zip - download - download + ImageMagick-7.0.5-4-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). @@ -425,7 +425,7 @@ display logo.gif
       magick logo: logo.gif
       magick identify logo.gif
      -magick display logo.gif
      +magick logo.gif win:
       

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

      @@ -464,4 +464,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/escape.html b/www/escape.html index fdc6d59d9..5753c6b5d 100644 --- a/www/escape.html +++ b/www/escape.html @@ -887,4 +887,4 @@ Post ObjectData Descriptor Record - \ No newline at end of file + \ No newline at end of file diff --git a/www/examples.html b/www/examples.html index 759a788f2..46b80f0bf 100644 --- a/www/examples.html +++ b/www/examples.html @@ -80,4 +80,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/www/exception.html b/www/exception.html index d7a8458d7..1c0a7ae11 100644 --- a/www/exception.html +++ b/www/exception.html @@ -269,4 +269,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/www/export.html b/www/export.html index 528e1ab50..ad09d5188 100644 --- a/www/export.html +++ b/www/export.html @@ -80,4 +80,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/www/formats.html b/www/formats.html index ea5589f57..70ac81c66 100644 --- a/www/formats.html +++ b/www/formats.html @@ -724,7 +724,7 @@ convert \( -size 15x15 canvas:black canvas:white -append \) \ PCD RW Photo CD - The maximum resolution written is 768x512 pixels since larger images require huffman compression (which is not supported). + The maximum resolution written is 768x512 pixels since larger images require huffman compression (which is not supported). Use -bordercolor to specify the border color (e.g. -bordercolor black). @@ -1967,4 +1967,4 @@ convert \( -size 15x15 canvas:black canvas:white -append \) \ - \ No newline at end of file + \ No newline at end of file diff --git a/www/fx.html b/www/fx.html index b29012653..b3e847483 100644 --- a/www/fx.html +++ b/www/fx.html @@ -420,4 +420,4 @@ convert rose: -duplicate 29 -virtual-pixel Gray -distort SRT '%[fx:360.0*t/n]' \ - \ No newline at end of file + \ No newline at end of file diff --git a/www/gradient.html b/www/gradient.html index 4fce08ebd..c6cfb1051 100644 --- a/www/gradient.html +++ b/www/gradient.html @@ -241,4 +241,4 @@ convert -size 256x256 -define gradient:radii=128,64 -define gradient:angle=45 ra - \ No newline at end of file + \ No newline at end of file diff --git a/www/high-dynamic-range.html b/www/high-dynamic-range.html index 863acc07c..14c488fb8 100644 --- a/www/high-dynamic-range.html +++ b/www/high-dynamic-range.html @@ -107,4 +107,4 @@ Features: HDRI - \ No newline at end of file + \ No newline at end of file diff --git a/www/history.html b/www/history.html index ee5df5df7..e415a7304 100644 --- a/www/history.html +++ b/www/history.html @@ -97,4 +97,4 @@ 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 + \ No newline at end of file diff --git a/www/identify.html b/www/identify.html index 9c1b1cc32..4dd5d6d4e 100644 --- a/www/identify.html +++ b/www/identify.html @@ -429,4 +429,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 a6f08fb3c..5d2f138b4 100644 --- a/www/import.html +++ b/www/import.html @@ -427,4 +427,4 @@ import -window root screen.ps - \ No newline at end of file + \ No newline at end of file diff --git a/www/index.html b/www/index.html index e52a13dba..93d1c814c 100644 --- a/www/index.html +++ b/www/index.html @@ -66,9 +66,9 @@ Use ImageMagicklicense.

      -

      The ImageMagick development process ensures a stable 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 ImageMagick development process ensures a stable 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.5-0. It runs on Linux, Windows, Mac Os X, iOS, Android OS, and others.

      +

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

      The authoritative ImageMagick web site is https://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.

      @@ -239,4 +239,4 @@ Use ImageMagick

      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.5-0.

      +

      The latest release of ImageMagick is version 7.0.5-4.

      Germany
      http://mirror.checkdomain.de/imagemagick/
      @@ -115,4 +115,4 @@
      - \ No newline at end of file + \ No newline at end of file diff --git a/www/mogrify.html b/www/mogrify.html index 961034538..b4b55059e 100644 --- a/www/mogrify.html +++ b/www/mogrify.html @@ -1297,4 +1297,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/montage.html b/www/montage.html index cb33b0e99..16691698b 100644 --- a/www/montage.html +++ b/www/montage.html @@ -638,4 +638,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/motion-picture.html b/www/motion-picture.html index 3eb0e7d1d..4b1619cc4 100644 --- a/www/motion-picture.html +++ b/www/motion-picture.html @@ -194,4 +194,4 @@ convert bluebells.dpx -define dpx:television.time.code=10:00:02:15 bluebells-001 - \ No newline at end of file + \ No newline at end of file diff --git a/www/opencl.html b/www/opencl.html index a23ffafea..f31dd0f8f 100644 --- a/www/opencl.html +++ b/www/opencl.html @@ -122,4 +122,4 @@ InitImageMagickOpenCL(MAGICK_OPENCL_DEVICE_SELECT_USER, (void*)(myDevices+2), NU - \ No newline at end of file + \ No newline at end of file diff --git a/www/openmp.html b/www/openmp.html index 29fa510d9..18179e5f3 100644 --- a/www/openmp.html +++ b/www/openmp.html @@ -101,4 +101,4 @@ Performance[8]: 40i 4.831ips 0.872e 15.680u 0:02.070 - \ No newline at end of file + \ No newline at end of file diff --git a/www/perl-magick.html b/www/perl-magick.html index 337e4c64f..e4a5fd738 100644 --- a/www/perl-magick.html +++ b/www/perl-magick.html @@ -2611,4 +2611,4 @@ Image::Magick->QuantumDepth - \ No newline at end of file + \ No newline at end of file diff --git a/www/porting.html b/www/porting.html index 3dded98ee..432d63615 100644 --- a/www/porting.html +++ b/www/porting.html @@ -664,4 +664,4 @@ example "+annotate", "+resize", "+clut", and "+draw" .

      - \ No newline at end of file + \ No newline at end of file diff --git a/www/quantize.html b/www/quantize.html index 911bb5951..6d1a2a895 100644 --- a/www/quantize.html +++ b/www/quantize.html @@ -202,3 +202,4 @@ 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 5028509e5..a3f6f1214 100644 --- a/www/resources.html +++ b/www/resources.html @@ -128,7 +128,7 @@ file or data stream. By default any coder, delegate, filter, or file path is permitted. Use a policy to deny access to, for example, the MPEG video delegate, or permit reading images from a file system but deny writing to that same file system. Or use the resource policy to set resource limits. Policies are useful for multi-user servers that want to limit the overall impact ImageMagick has on the system. For example, to limit the maximum image size in memory to 100MB:
      -<policy domain="resource" name="area" value="100MB"/>
      +<policy domain="resource" name="area" value="100KP"/>
       
      Any image larger than this area limit is cached to disk rather than memory. @@ -144,7 +144,7 @@ To limit the elapsed time of any ImageMagick command to 5 minutes, use this poli
       <policy domain="resource" name="time" value="300"/>
       
      -Define arguments for the memory, map, area, and disk resources with SI prefixes (.e.g 100MB). In addition, resource policies are maximums for each instance of ImageMagick (e.g. policy memory limit 1GB, the -limit 2GB option exceeds policy maximum so memory limit is 1GB). +Define arguments for the memory, map, and disk resources with SI prefixes (.e.g 100MB). In addition, resource policies are maximums for each instance of ImageMagick (e.g. policy memory limit 1GB, the -limit 2GB option exceeds policy maximum so memory limit is 1GB).
      quantization-table.xml
      Custom JPEG quantization tables. Activate with -define:q-table=quantization-table.xml.
      @@ -383,4 +383,4 @@ $MAGICK_FONT_PATH - \ No newline at end of file + \ No newline at end of file diff --git a/www/security-policy.html b/www/security-policy.html index 12722205f..cb89b9cf1 100644 --- a/www/security-policy.html +++ b/www/security-policy.html @@ -71,7 +71,7 @@ <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="area" value="16KP"/> <policy domain="resource" name="disk" value="1GiB"/> <policy domain="resource" name="file" value="768"/> <policy domain="resource" name="thread" value="2"/> @@ -104,9 +104,9 @@ convert: no images defined `wizard.jpg' <policy domain="coder" rights="read|write" pattern="{GIF,JPEG,PNG,WEBP}" />
    -

    As of ImageMagick 7.0.4-10, you can allocate the pixel cache with anonymous memory mapping rather than from heap. As a consequence, the pixels are initialized to zero. You can also shred any temporary files for increased security. The value is the number of times to shred a temporary file. For example,

    +

    As of ImageMagick 7.0.5-4, you can allocate the pixel cache with anonymous memory mapping rather than from heap. As a consequence, the pixels are initialized to zero. You can also shred any temporary files for increased security. The value is the number of times to shred a temporary file. For example,

    -  <policy domain="system" name="pixel-cache-memory" value="anonymous"/>
    +  <policy domain="cache" name="memory-map" value="anonymous"/>
       <policy domain="system" name="shred" value="1"/>
     
    @@ -138,7 +138,7 @@ Path: ImageMagick/policy.xml value: 256MiB Policy: Resource name: area - value: 128MB + value: 16KP Policy: Resource name: height value: 8KP @@ -196,4 +196,4 @@ Path: [built-in] - \ No newline at end of file + \ No newline at end of file diff --git a/www/sitemap.html b/www/sitemap.html index f46e39cdb..69def9535 100644 --- a/www/sitemap.html +++ b/www/sitemap.html @@ -235,4 +235,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/www/stream.html b/www/stream.html index d9df78f23..1e862628b 100644 --- a/www/stream.html +++ b/www/stream.html @@ -272,4 +272,4 @@ stream -map i -storage-type double 'image.tif[100x100+30+40]' gray.raw - \ No newline at end of file + \ No newline at end of file diff --git a/www/subversion.html b/www/subversion.html index 3353c6f95..3f91b7a95 100644 --- a/www/subversion.html +++ b/www/subversion.html @@ -96,4 +96,4 @@ svn update - \ No newline at end of file + \ No newline at end of file diff --git a/www/support.html b/www/support.html index 53eefb28c..9e167798a 100644 --- a/www/support.html +++ b/www/support.html @@ -155,4 +155,4 @@ USA - \ No newline at end of file + \ No newline at end of file diff --git a/www/webp.html b/www/webp.html index 16ae0511c..724ce2be0 100644 --- a/www/webp.html +++ b/www/webp.html @@ -182,4 +182,4 @@ convert wizard.png -quality 50 -define webp:lossless=true wizard.webp - \ No newline at end of file + \ No newline at end of file