From e9a32c3a7f2e79afe8d244eeda396b66473ebb75 Mon Sep 17 00:00:00 2001 From: cristy Date: Thu, 7 Apr 2011 01:11:05 +0000 Subject: [PATCH] --- ImageMagick.spec | 2 +- config/configure.xml | 4 +- index.html | 4 +- libtool | 2 +- magick/version.h | 6 +- utilities/convert.1 | 6 +- utilities/mogrify.1 | 6 +- version.sh | 2 +- www/ImageMagickObject.html | 2 +- www/advanced-unix-installation.html | 8 +- www/advanced-windows-installation.html | 4 +- www/animate.html | 2 +- www/api.html | 2 +- www/api/animate.html | 2 +- www/api/annotate.html | 2 +- www/api/attribute.html | 2 +- www/api/blob.html | 2 +- www/api/cache-view.html | 2 +- www/api/cache.html | 2 +- www/api/cipher.html | 2 +- www/api/colormap.html | 2 +- www/api/composite.html | 2 +- www/api/constitute.html | 2 +- www/api/decorate.html | 2 +- www/api/deprecate.html | 2 +- www/api/display.html | 2 +- www/api/distort.html | 2 +- www/api/draw.html | 2 +- www/api/drawing-wand.html | 2 +- www/api/effect.html | 2 +- www/api/enhance.html | 2 +- www/api/exception.html | 2 +- www/api/feature.html | 2 +- www/api/fx.html | 2 +- www/api/histogram.html | 2 +- www/api/image-view.html | 2 +- www/api/image.html | 2 +- www/api/layer.html | 2 +- www/api/list.html | 2 +- www/api/magick-image.html | 2 +- www/api/magick-property.html | 2 +- www/api/magick-wand.html | 2 +- www/api/magick.html | 2 +- www/api/memory.html | 2 +- www/api/module.html | 2 +- www/api/mogrify.html | 2 +- www/api/monitor.html | 2 +- www/api/montage.html | 2 +- www/api/morphology.html | 45 +-- www/api/paint.html | 2 +- www/api/pixel-iterator.html | 2 +- www/api/pixel-wand.html | 2 +- www/api/profile.html | 2 +- www/api/property.html | 2 +- www/api/quantize.html | 2 +- www/api/resize.html | 2 +- www/api/resource.html | 2 +- www/api/segment.html | 2 +- www/api/shear.html | 2 +- www/api/signature.html | 2 +- www/api/statistic.html | 2 +- www/api/transform.html | 2 +- www/api/version.html | 2 +- www/api/wand-view.html | 2 +- www/architecture.html | 12 +- www/binary-releases.html | 54 +-- www/changelog.html | 18 +- www/cipher.html | 2 +- www/color.html | 2 +- www/command-line-options.html | 523 +++++++++++-------------- www/command-line-processing.html | 2 +- www/command-line-tools.html | 2 +- www/compare.html | 2 +- www/compose.html | 2 +- www/conjure.html | 2 +- www/convert.html | 2 +- www/display.html | 2 +- www/download.html | 4 +- www/escape.html | 2 +- www/examples.html | 2 +- www/exception.html | 2 +- www/export.html | 2 +- www/formats.html | 4 +- www/fx.html | 9 +- www/high-dynamic-range.html | 2 +- www/identify.html | 4 +- www/import.html | 2 +- www/index.html | 4 +- www/jp2.html | 2 +- www/license.html | 2 +- www/links.html | 2 +- www/magick++.html | 2 +- www/magick-core.html | 2 +- www/magick-vector-graphics.html | 2 +- www/magick-wand.html | 2 +- www/mogrify.html | 2 +- www/montage.html | 2 +- www/motion-picture.html | 2 +- www/perl-magick.html | 2 +- www/resources.html | 24 +- www/search.html | 2 +- www/sponsors.html | 3 +- www/stream.html | 2 +- www/subversion.html | 2 +- www/t-shirt.html | 2 +- 105 files changed, 432 insertions(+), 482 deletions(-) diff --git a/ImageMagick.spec b/ImageMagick.spec index 9f1bdaab3..79ea9d17e 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,5 +1,5 @@ %global VERSION 6.6.9 -%global Patchlevel 4 +%global Patchlevel 5 Name: ImageMagick Version: %{VERSION} diff --git a/config/configure.xml b/config/configure.xml index a3aae96ff..7274f9552 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -9,9 +9,9 @@ - + - + diff --git a/index.html b/index.html index 8de8387eb..97d69e1f7 100644 --- a/index.html +++ b/index.html @@ -184,7 +184,7 @@ Druckerei @@ -209,7 +209,7 @@

The ImageMagick development process ensures a stable API and ABI. Before each ImageMagick release, we perform a comprehensive security assessment that includes memory and thread error detection to prevent security vulnerabilities.

-

The current release is ImageMagick 6.6.9-3.

+

The current release is ImageMagick 6.6.9-4.

diff --git a/libtool b/libtool index eb757815b..e74ce33df 100755 --- a/libtool +++ b/libtool @@ -1,7 +1,7 @@ #! /bin/sh # libtool - Provide generalized library-building support services. -# Generated automatically by config.status (ImageMagick) 6.6.9-4 +# Generated automatically by config.status (ImageMagick) 6.6.9-5 # Libtool was configured on host magick.imagemagick.org: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # diff --git a/magick/version.h b/magick/version.h index a78313f0f..11fa9de7a 100644 --- a/magick/version.h +++ b/magick/version.h @@ -31,11 +31,11 @@ extern "C" { #define MagickLibVersion 0x669 #define MagickLibVersionText "6.6.9" #define MagickLibVersionNumber 4,0,1 -#define MagickLibAddendum "-4" +#define MagickLibAddendum "-5" #define MagickLibInterface 4 #define MagickLibMinInterface 4 -#define MagickReleaseDate "2011-04-01" -#define MagickChangeDate "20110401" +#define MagickReleaseDate "2011-04-06" +#define MagickChangeDate "20110403" #define MagickAuthoritativeURL "http://www.imagemagick.org" #if defined(MAGICKCORE_OPENMP_SUPPORT) #define MagickOpenMPFeature "OpenMP " diff --git a/utilities/convert.1 b/utilities/convert.1 index 7fb8be8ec..892521417 100644 --- a/utilities/convert.1 +++ b/utilities/convert.1 @@ -156,8 +156,8 @@ Image Operators: \-level value adjust the level of image contrast \-linear-stretch geometry improve contrast by `stretching with saturation' the intensity range - \-median radius apply a median filter to the image - \-mode radius make each pixel the 'predominate color' of the neighborhood + \-median geometry apply a median filter to the image + \-mode geometry make each pixel the 'predominate color' of the neighborhood \-modulate value vary the brightness, saturation, and hue \-monochrome transform image to black and white \-morphology method kernel @@ -165,7 +165,7 @@ Image Operators: \-motion-blur geometry simulate motion blur \-negate replace each pixel with its complementary color - \-noise radius add or reduce noise in an image + \-noise geometry add or reduce noise in an image \-normalize transform image to span the full range of colors \-opaque color change this color to the fill color \-ordered-dither NxN diff --git a/utilities/mogrify.1 b/utilities/mogrify.1 index ae7b27f0d..a55674be6 100644 --- a/utilities/mogrify.1 +++ b/utilities/mogrify.1 @@ -158,14 +158,14 @@ Image Operators: \-level value adjust the level of image contrast \-linear-stretch geometry improve contrast by `stretching with saturation' the intensity range - \-median radius apply a median filter to the image - \-mode radius make each pixel the 'predominate color' of the neighborhood + \-median geometry apply a median filter to the image + \-mode geometry make each pixel the 'predominate color' of the neighborhood \-modulate value vary the brightness, saturation, and hue \-monochrome transform image to black and white \-motion-blur geometry simulate motion blur \-negate replace each pixel with its complementary color - \-noise radius add or reduce noise in an image + \-noise geometry add or reduce noise in an image \-normalize transform image to span the full range of colors \-opaque color change this color to the fill color \-ordered-dither NxN diff --git a/version.sh b/version.sh index c4730bcb6..c48505773 100644 --- a/version.sh +++ b/version.sh @@ -12,7 +12,7 @@ PACKAGE_NAME='ImageMagick' # PACKAGE_NAME (e.g. "1.0.0"). PACKAGE_VERSION='6.6.9' PACKAGE_LIB_VERSION="0x669" -PACKAGE_RELEASE="4" +PACKAGE_RELEASE="5" PACKAGE_LIB_VERSION_NUMBER="6,6,9,${PACKAGE_RELEASE}" PACKAGE_RELEASE_DATE=`date +%F` PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION" diff --git a/www/ImageMagickObject.html b/www/ImageMagickObject.html index 83b514f66..8cccef275 100644 --- a/www/ImageMagickObject.html +++ b/www/ImageMagickObject.html @@ -185,7 +185,7 @@ Druckerei diff --git a/www/advanced-unix-installation.html b/www/advanced-unix-installation.html index bd125c027..798e5b14a 100644 --- a/www/advanced-unix-installation.html +++ b/www/advanced-unix-installation.html @@ -184,7 +184,7 @@ Druckerei @@ -221,7 +221,7 @@

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:

-

$magick> cd ImageMagick-6.6.9-3 $magick> ./configure

+

$magick> cd ImageMagick-6.6.9-4 $magick> ./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:

@@ -573,7 +573,7 @@ Options used to compile and link:

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

Unpack and change into the top-level ImageMagick directory:

-

$magick> tar xvfz ImageMagick-6.6.9-3.tar.gz $magick> cd ImageMagick-6.6.9-3

Configure ImageMagick:

+

$magick> tar xvfz ImageMagick-6.6.9-4.tar.gz $magick> cd ImageMagick-6.6.9-4

Configure ImageMagick:

$magick> ./configure --prefix=/opt --with-quantum-depth=16 \
--disable-dependency-tracking --with-x=yes \
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib/ \
@@ -593,7 +593,7 @@ Options used to compile and link:

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,

-

$magick> tar jxvf ImageMagick-6.6.9-?.tar.bz2 $magick> cd ImageMagick-6.6.9-3 $magick> export CPPFLAGS="-Ic:/Progra~1/GnuWin32/include" $magick> export LDFLAGS="-Lc:/Progra~1/GnuWin32/lib" $magick> ./configure --without-perl $magick> make $magick> sudo make install

+

$magick> tar jxvf ImageMagick-6.6.9-?.tar.bz2 $magick> cd ImageMagick-6.6.9-4 $magick> export CPPFLAGS="-Ic:/Progra~1/GnuWin32/include" $magick> export LDFLAGS="-Lc:/Progra~1/GnuWin32/lib" $magick> ./configure --without-perl $magick> make $magick> sudo make install

Dealing with Unexpected Problems

diff --git a/www/advanced-windows-installation.html b/www/advanced-windows-installation.html index 3bc726996..8d0dded7f 100644 --- a/www/advanced-windows-installation.html +++ b/www/advanced-windows-installation.html @@ -184,7 +184,7 @@ Druckerei
@@ -473,7 +473,7 @@
  1. Double-click on - VisualMagick/bin/ImageMagick-6.6.9-3-Q16-windows-dll.exe + VisualMagick/bin/ImageMagick-6.6.9-4-Q16-windows-dll.exe to launch the ImageMagick binary distribution.
  2. Complete the installer screens to install ImageMagick on your system.
diff --git a/www/animate.html b/www/animate.html index e7a75de02..bf8835879 100644 --- a/www/animate.html +++ b/www/animate.html @@ -185,7 +185,7 @@ Druckerei diff --git a/www/api.html b/www/api.html index 25271e6d5..97c5e2224 100644 --- a/www/api.html +++ b/www/api.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/animate.html b/www/api/animate.html index 168951b6c..2ae5e7ed9 100644 --- a/www/api/animate.html +++ b/www/api/animate.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/annotate.html b/www/api/annotate.html index b359171fc..6cc66f055 100644 --- a/www/api/annotate.html +++ b/www/api/annotate.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/attribute.html b/www/api/attribute.html index a5c2ea8bd..97b62929c 100644 --- a/www/api/attribute.html +++ b/www/api/attribute.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/blob.html b/www/api/blob.html index 0fb55d6fb..98b5c8aae 100644 --- a/www/api/blob.html +++ b/www/api/blob.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/cache-view.html b/www/api/cache-view.html index 0f261700f..a8b58405b 100644 --- a/www/api/cache-view.html +++ b/www/api/cache-view.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/cache.html b/www/api/cache.html index d08d35b39..54a5787a3 100644 --- a/www/api/cache.html +++ b/www/api/cache.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/cipher.html b/www/api/cipher.html index e98b08c25..e9dd0a593 100644 --- a/www/api/cipher.html +++ b/www/api/cipher.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/colormap.html b/www/api/colormap.html index aa86c233e..8227d5769 100644 --- a/www/api/colormap.html +++ b/www/api/colormap.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/composite.html b/www/api/composite.html index 66a8b68a0..8100f7aea 100644 --- a/www/api/composite.html +++ b/www/api/composite.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/constitute.html b/www/api/constitute.html index f6c492cb9..20d477575 100644 --- a/www/api/constitute.html +++ b/www/api/constitute.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/decorate.html b/www/api/decorate.html index bbd874299..51371bb82 100644 --- a/www/api/decorate.html +++ b/www/api/decorate.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/deprecate.html b/www/api/deprecate.html index 4b8f4a80f..4428460c3 100644 --- a/www/api/deprecate.html +++ b/www/api/deprecate.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/display.html b/www/api/display.html index f8a50b7e1..0c7d7a640 100644 --- a/www/api/display.html +++ b/www/api/display.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/distort.html b/www/api/distort.html index d2dcad4d0..2a651cb93 100644 --- a/www/api/distort.html +++ b/www/api/distort.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/draw.html b/www/api/draw.html index 3ba55e3fd..0695fb12b 100644 --- a/www/api/draw.html +++ b/www/api/draw.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/drawing-wand.html b/www/api/drawing-wand.html index 5b0125dee..32b2d87de 100644 --- a/www/api/drawing-wand.html +++ b/www/api/drawing-wand.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/effect.html b/www/api/effect.html index 111105c33..884f0a77c 100644 --- a/www/api/effect.html +++ b/www/api/effect.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/enhance.html b/www/api/enhance.html index c022af86a..5e81ad47c 100644 --- a/www/api/enhance.html +++ b/www/api/enhance.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/exception.html b/www/api/exception.html index 3f884eb41..5f2ce1a3b 100644 --- a/www/api/exception.html +++ b/www/api/exception.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/feature.html b/www/api/feature.html index e102ec508..ec1976fdc 100644 --- a/www/api/feature.html +++ b/www/api/feature.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/fx.html b/www/api/fx.html index 2e0415afc..8b93aaa47 100644 --- a/www/api/fx.html +++ b/www/api/fx.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/histogram.html b/www/api/histogram.html index 931d40902..a8af0f5e2 100644 --- a/www/api/histogram.html +++ b/www/api/histogram.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/image-view.html b/www/api/image-view.html index 23f6b43fa..a5a739186 100644 --- a/www/api/image-view.html +++ b/www/api/image-view.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/image.html b/www/api/image.html index 50f7aab6e..0000a0696 100644 --- a/www/api/image.html +++ b/www/api/image.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/layer.html b/www/api/layer.html index b60bcac55..a508e27cc 100644 --- a/www/api/layer.html +++ b/www/api/layer.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/list.html b/www/api/list.html index 59b26c71d..f05d7810e 100644 --- a/www/api/list.html +++ b/www/api/list.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/magick-image.html b/www/api/magick-image.html index c8e775b73..eb4e3e82d 100644 --- a/www/api/magick-image.html +++ b/www/api/magick-image.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/magick-property.html b/www/api/magick-property.html index df72391e8..ed7cc09a9 100644 --- a/www/api/magick-property.html +++ b/www/api/magick-property.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/magick-wand.html b/www/api/magick-wand.html index b260631bd..14b577e0d 100644 --- a/www/api/magick-wand.html +++ b/www/api/magick-wand.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/magick.html b/www/api/magick.html index 187db02bb..0b50c638b 100644 --- a/www/api/magick.html +++ b/www/api/magick.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/memory.html b/www/api/memory.html index 2480bcfb2..e126c1610 100644 --- a/www/api/memory.html +++ b/www/api/memory.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/module.html b/www/api/module.html index 77115b87b..e4590b131 100644 --- a/www/api/module.html +++ b/www/api/module.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/mogrify.html b/www/api/mogrify.html index 61c853ba1..8edb4c700 100644 --- a/www/api/mogrify.html +++ b/www/api/mogrify.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/monitor.html b/www/api/monitor.html index a779303c9..e3da8382f 100644 --- a/www/api/monitor.html +++ b/www/api/monitor.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/montage.html b/www/api/montage.html index 59d434474..95082dd70 100644 --- a/www/api/montage.html +++ b/www/api/montage.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/morphology.html b/www/api/morphology.html index 9349cf59e..d62f37443 100644 --- a/www/api/morphology.html +++ b/www/api/morphology.html @@ -184,7 +184,7 @@ Druckerei @@ -271,7 +271,7 @@

Convolution Kernels

-

Unity the No-Op kernel, also requivelent to Gaussian of sigma zero. Basically a 3x3 kernel of a 1 surrounded by zeros.

+

Unity The a No-Op or Scaling single element kernel.

Gaussian:{radius},{sigma} Generate a two-dimentional gaussian kernel, as used by -gaussian. The sigma for the curve is required. The resulting kernel is normalized,

@@ -307,12 +307,6 @@

Sobel:{angle} Sobel 'Edge' convolution kernel (3x3) | -1, 0, 1 | | -2, 0,-2 | | -1, 0, 1 |

-

Sobel:{type},{angle} Type 0: default un-nomalized version shown above.

- -

Type 1: As default but pre-normalized | 1, 0, -1 | | 2, 0, -2 | / 4 | 1, 0, -1 |

- -

Type 2: Diagonal version with same normalization as 1 | 1, 0, -1 | | 2, 0, -2 | / 4 | 1, 0, -1 |

-

Roberts:{angle} Roberts convolution kernel (3x3) | 0, 0, 0 | | -1, 1, 0 | | 0, 0, 0 |

Prewitt:{angle} Prewitt Edge convolution kernel (3x3) | -1, 0, 1 | | -1, 0, 1 | | -1, 0, 1 |

@@ -371,15 +365,15 @@

Square:[{radius}[,{scale}]] Generate a square shaped kernel of size radius*2+1, and defaulting to a 3x3 (radius 1).

-

Note that using a larger radius for the "Square" or the "Diamond" is also equivelent to iterating the basic morphological method that many times. However iterating with the smaller radius is actually faster than using a larger kernel radius.

+

Octagon:[{radius}[,{scale}]] Generate octagonal shaped kernel of given radius and constant scale. Default radius is 3 producing a 7x7 kernel. A radius of 1 will result in "Diamond" kernel.

-

Rectangle:{geometry} Simply generate a rectangle of 1's with the size given. You can also specify the location of the 'control point', otherwise the closest pixel to the center of the rectangle is selected.

+

Disk:[{radius}[,{scale}]] Generate a binary disk, thresholded at the radius given, the radius may be a float-point value. Final Kernel size is floor(radius)*2+1 square. A radius of 5.3 is the default.

-

Properly centered and odd sized rectangles work the best.

+

NOTE: That a low radii Disk kernels produce the same results as many of the previously defined kernels, but differ greatly at larger radii. Here is a table of equivalences... "Disk:1" => "Diamond", "Octagon:1", or "Cross:1" "Disk:1.5" => "Square" "Disk:2" => "Diamond:2" "Disk:2.5" => "Octagon" "Disk:2.9" => "Square:2" "Disk:3.5" => "Octagon:3" "Disk:4.5" => "Octagon:4" "Disk:5.4" => "Octagon:5" "Disk:6.4" => "Octagon:6" All other Disk shapes are unique to this kernel, but because a "Disk" is more circular when using a larger radius, using a larger radius is preferred over iterating the morphological operation.

-

Disk:[{radius}[,{scale}]] Generate a binary disk of the radius given, radius may be a float. Kernel size will be ceil(radius)*2+1 square. NOTE: Here are some disk shapes of specific interest "Disk:1" => "diamond" or "cross:1" "Disk:1.5" => "square" "Disk:2" => "diamond:2" "Disk:2.5" => a general disk shape of radius 2 "Disk:2.9" => "square:2" "Disk:3.5" => default - octagonal/disk shape of radius 3 "Disk:4.2" => roughly octagonal shape of radius 4 "Disk:4.3" => a general disk shape of radius 4 After this all the kernel shape becomes more and more circular.

+

Rectangle:{geometry} Simply generate a rectangle of 1's with the size given. You can also specify the location of the 'control point', otherwise the closest pixel to the center of the rectangle is selected.

-

Because a "disk" is more circular when using a larger radius, using a larger radius is preferred over iterating the morphological operation.

+

Properly centered and odd sized rectangles work the best.

Symbol Dilation Kernels

@@ -395,7 +389,7 @@

Hit and Miss Kernels

-

Peak:radius1,radius2 Find any peak larger than the pixels the fall between the two radii. The default ring of pixels is as per "Ring". Edges Find flat orthogonal edges of a binary shape Corners Find 90 degree corners of a binary shape LineEnds:type Find end points of lines (for pruning a skeletion) Two types of lines ends (default to both) can be searched for Type 0: All line ends Type 1: single kernel for 4-conneected line ends Type 2: single kernel for simple line ends LineJunctions Find three line junctions (within a skeletion) Type 0: all line junctions Type 1: Y Junction kernel Type 2: Diagonal T Junction kernel Type 3: Orthogonal T Junction kernel Type 4: Diagonal X Junction kernel Type 5: Orthogonal + Junction kernel Ridges:type Find single pixel ridges or thin lines Type 1: Fine single pixel thick lines and ridges Type 2: Find two pixel thick lines and ridges ConvexHull Octagonal thicken kernel, to generate convex hulls of 45 degrees Skeleton:type Traditional skeleton generating kernels. Type 1: Tradional Skeleton kernel (4 connected skeleton) Type 2: HIPR2 Skeleton kernel (8 connected skeleton) Type 3: Experimental Variation to try to present left-right symmetry Type 4: Experimental Variation to preserve left-right symmetry

+

Peak:radius1,radius2 Find any peak larger than the pixels the fall between the two radii. The default ring of pixels is as per "Ring". Edges Find flat orthogonal edges of a binary shape Corners Find 90 degree corners of a binary shape Diagonals:type A special kernel to thin the 'outside' of diagonals LineEnds:type Find end points of lines (for pruning a skeletion) Two types of lines ends (default to both) can be searched for Type 0: All line ends Type 1: single kernel for 4-conneected line ends Type 2: single kernel for simple line ends LineJunctions Find three line junctions (within a skeletion) Type 0: all line junctions Type 1: Y Junction kernel Type 2: Diagonal T Junction kernel Type 3: Orthogonal T Junction kernel Type 4: Diagonal X Junction kernel Type 5: Orthogonal + Junction kernel Ridges:type Find single pixel ridges or thin lines Type 1: Fine single pixel thick lines and ridges Type 2: Find two pixel thick lines and ridges ConvexHull Octagonal Thickening Kernel, to generate convex hulls of 45 degrees Skeleton:type Traditional skeleton generating kernels. Type 1: Tradional Skeleton kernel (4 connected skeleton) Type 2: HIPR2 Skeleton kernel (8 connected skeleton) Type 3: Thinning skeleton based on a ressearch paper by Dan S. Bloomberg (Default Type) ThinSE:type A huge variety of Thinning Kernels designed to preserve conectivity. many other kernel sets use these kernels as source definitions. Type numbers are 41-49, 81-89, 481, and 482 which are based on the super and sub notations used in the source research paper.

Distance Measuring Kernels

@@ -403,15 +397,19 @@

See the 'Distance' Morphological Method, for information of how it is applied.

-

Chebyshev:[{radius}][x{scale}[!]] Chebyshev Distance (also known as Tchebychev Distance) is a value of one to any neighbour, orthogonal or diagonal. One why of thinking of it is the number of squares a 'King' or 'Queen' in chess needs to traverse reach any other position on a chess board. It results in a 'square' like distance function, but one where diagonals are closer than expected.

+

Chebyshev:[{radius}][x{scale}[!]] Chebyshev Distance (also known as Tchebychev or Chessboard distance) is a value of one to any neighbour, orthogonal or diagonal. One why of thinking of it is the number of squares a 'King' or 'Queen' in chess needs to traverse reach any other position on a chess board. It results in a 'square' like distance function, but one where diagonals are given a value that is closer than expected.

+ +

Manhattan:[{radius}][x{scale}[!]] Manhattan Distance (also known as Rectilinear, City Block, or the Taxi Cab distance metric), it is the distance needed when you can only travel in horizontal or vertical directions only. It is the distance a 'Rook' in chess would have to travel, and results in a diamond like distances, where diagonals are further than expected.

+ +

Octagonal:[{radius}][x{scale}[!]] An interleving of Manhatten and Chebyshev metrics producing an increasing octagonally shaped distance. Distances matches those of the "Octagon" shaped kernel of the same radius. The minimum radius and default is 2, producing a 5x5 kernel.

-

Manhattan:[{radius}][x{scale}[!]] Manhattan Distance (also known as Rectilinear Distance, or the Taxi Cab metric), is the distance needed when you can only travel in orthogonal (horizontal or vertical) only. It is the distance a 'Rook' in chess would travel. It results in a diamond like distances, where diagonals are further than expected.

+

Euclidean:[{radius}][x{scale}[!]] Euclidean distance is the 'direct' or 'as the crow flys' distance. However by default the kernel size only has a radius of 1, which limits the distance to 'Knight' like moves, with only orthogonal and diagonal measurements being correct. As such for the default kernel you will get octagonal like distance function.

-

Euclidean:[{radius}][x{scale}[!]] Euclidean Distance is the 'direct' or 'as the crow flys distance. However by default the kernel size only has a radius of 1, which limits the distance to 'Knight' like moves, with only orthogonal and diagonal measurements being correct. As such for the default kernel you will get octagonal like distance function, which is reasonally accurate.

+

However using a larger radius such as "Euclidean:4" you will get a much smoother distance gradient from the edge of the shape. Especially if the image is pre-processed to include any anti-aliasing pixels. Of course a larger kernel is slower to use, and not always needed.

-

However if you use a larger radius such as "Euclidean:4" you will get a much smoother distance gradient from the edge of the shape. Of course a larger kernel is slower to use, and generally not needed.

+

The first three Distance Measuring Kernels will only generate distances of exact multiples of {scale} in binary images. As such you can use a scale of 1 without loosing any information. However you also need some scaling when handling non-binary anti-aliased shapes.

-

To allow the use of fractional distances that you get with diagonals the actual distance is scaled by a fixed value which the user can provide. This is not actually nessary for either ""Chebyshev" or "Manhattan" distance kernels, but is done for all three distance kernels. If no scale is provided it is set to a value of 100, allowing for a maximum distance measurement of 655 pixels using a Q16 version of IM, from any edge. However for small images this can result in quite a dark gradient.

+

The "Euclidean" Distance Kernel however does generate a non-integer fractional results, and as such scaling is vital even for binary shapes.

CloneKernelInfo

@@ -463,9 +461,9 @@ 
   Image *MorphologyApply(const Image *image,MorphologyMethod method,
-    const ssize_t iterations,const KernelInfo *kernel,
-    const CompositeMethod compose, const double bias,
-    ExceptionInfo *exception)
+    const ChannelType channel, const ssize_t iterations,
+    const KernelInfo *kernel, const CompositeMethod compose,
+    const double bias, ExceptionInfo *exception)

A description of each parameter follows:

@@ -476,6 +474,9 @@
method

the morphology method to be applied.

+
channel
+

the channels to which the operations are applied The channel 'sync' flag determines if 'alpha weighting' is applied for convolution style operations.

+
iterations

apply the operation this many times (or no change). A value of -1 means loop until no change found. How this is applied may depend on the morphology method. Typically this is a value of 1.

diff --git a/www/api/paint.html b/www/api/paint.html index 03bfb4bd8..7d6371a72 100644 --- a/www/api/paint.html +++ b/www/api/paint.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/pixel-iterator.html b/www/api/pixel-iterator.html index 10d82ed12..eac4f795b 100644 --- a/www/api/pixel-iterator.html +++ b/www/api/pixel-iterator.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/pixel-wand.html b/www/api/pixel-wand.html index d4281c31e..e126579f5 100644 --- a/www/api/pixel-wand.html +++ b/www/api/pixel-wand.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/profile.html b/www/api/profile.html index 58d1bd491..d8aa8101b 100644 --- a/www/api/profile.html +++ b/www/api/profile.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/property.html b/www/api/property.html index 374eb6c1b..f77e56a1e 100644 --- a/www/api/property.html +++ b/www/api/property.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/quantize.html b/www/api/quantize.html index 19d8fbbc8..6c6fc4b39 100644 --- a/www/api/quantize.html +++ b/www/api/quantize.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/resize.html b/www/api/resize.html index 3f26b08f6..6ccadb3ab 100644 --- a/www/api/resize.html +++ b/www/api/resize.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/resource.html b/www/api/resource.html index 288b4331a..c1230137e 100644 --- a/www/api/resource.html +++ b/www/api/resource.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/segment.html b/www/api/segment.html index 108a4360c..17667dc20 100644 --- a/www/api/segment.html +++ b/www/api/segment.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/shear.html b/www/api/shear.html index ca525d046..d3b09f631 100644 --- a/www/api/shear.html +++ b/www/api/shear.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/signature.html b/www/api/signature.html index ae2cf119b..fefd21c86 100644 --- a/www/api/signature.html +++ b/www/api/signature.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/statistic.html b/www/api/statistic.html index 79658bc19..80d510ff9 100644 --- a/www/api/statistic.html +++ b/www/api/statistic.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/transform.html b/www/api/transform.html index 9c947c6cb..6e1dae140 100644 --- a/www/api/transform.html +++ b/www/api/transform.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/version.html b/www/api/version.html index f5853964e..074c6c286 100644 --- a/www/api/version.html +++ b/www/api/version.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/wand-view.html b/www/api/wand-view.html index 418275d9c..c96e46f41 100644 --- a/www/api/wand-view.html +++ b/www/api/wand-view.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/architecture.html b/www/architecture.html index 101c39c57..fc20680bc 100644 --- a/www/architecture.html +++ b/www/architecture.html @@ -184,7 +184,7 @@ Druckerei @@ -288,7 +288,7 @@

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 a 4 channel 8-bit RGBA 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:

-

$magick> identify -versionVersion: ImageMagick 6.6.9-3 2011-04-01 Q16 http://www.imagemagick.org

+

$magick> identify -versionVersion: ImageMagick 6.6.9-4 2011-04-01 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 RGBA 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.

@@ -443,8 +443,8 @@ File Area Memory Map Disk Thread Time *view_1, *view_2; - view_1=OpenCacheView(source); - view_2=OpenCacheView(source); + view_1=AcquireCacheView(source); + view_2=AcquireCacheView(source); for (y=0; y < (ssize_t) source->rows; y++) { u=GetCacheViewVirtualPixels(view_1,0,y,source->columns,1,exception); @@ -457,8 +457,8 @@ File Area Memory Map Disk Thread Time /* do something with u & v here */ } } - view_1=CloseCacheView(view_1); - view_2=CloseCacheView(view_2); + view_2=DestroyCacheView(view_2); + view_1=DestroyCacheView(view_1); if (y < (ssize_t) source->rows) { /* an exception was thrown */ } diff --git a/www/binary-releases.html b/www/binary-releases.html index 679d08f8d..0e4c0a5c5 100644 --- a/www/binary-releases.html +++ b/www/binary-releases.html @@ -219,16 +219,16 @@ - ImageMagick-6.6.9-3.i386.rpm - download - download + ImageMagick-6.6.9-4.i386.rpm + download + download CentOS 5.4 i386 RPM - ImageMagick-6.6.9-3.x86_64.rpm - download - download + ImageMagick-6.6.9-4.x86_64.rpm + download + download CentOS 5.4 x86_64 RPM @@ -265,7 +265,7 @@

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

-

$magick> rpm -Uvh ImageMagick-6.6.9-3.i386.rpm

+

$magick> rpm -Uvh ImageMagick-6.6.9-4.i386.rpm

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

$magick> cd $HOME

@@ -365,7 +365,7 @@ 
 	./imagemagick_compile.sh VERSION
-

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

+

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

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

    @@ -404,7 +404,7 @@

    The amount of memory can be an important factor, especially if you intend to work on large images. A minimum of 512 MB of RAM is recommended, but the more RAM the better. Although ImageMagick runs well on a single core computer, it automagically runs in parallel on multi-core systems reducing run times considerably.

    The Windows version of ImageMagick is self-installing. Simply click on the appropriate version below and it will launch itself and ask you a few installation questions. Versions with Q8 in the name are 8 bits-per-pixel component (e.g. 8-bit red, 8-bit green, etc.), whereas, Q16 in the filename are 16 bits-per-pixel component. A Q16 version permits you to read or write 16-bit images without losing precision but requires twice as much resources as the Q8 version. Versions with dll in the filename include ImageMagick libraries as dynamic link libraries. If you are not sure which version is appropriate, choose -ImageMagick-6.6.9-3-Q16-windows-dll.exe.

    +ImageMagick-6.6.9-4-Q16-windows-dll.exe.

    @@ -416,44 +416,44 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + diff --git a/www/changelog.html b/www/changelog.html index 2c6fa7bd2..199464b14 100644 --- a/www/changelog.html +++ b/www/changelog.html @@ -184,7 +184,7 @@ Druckerei @@ -197,7 +197,21 @@

    ImageMagick Changelog

    -
    2011-04-01 6.6.9-3 Cristy <quetzlzacatenango@image...>
    +
    2011-04-03 6.6.9-4 Anthony Thyssen <A.Thyssen@griffith...>
    +
    Add of Octagon shape and Octagonal distance kernels for Morphology
    +
    Fix minor Morphology kernel compose bug (cleanup after Src/Dst swap)
    +
    Fix segmentation fault after error in a morphology 'named' kernel
    +
    Added a range of kernels used for specialised thinning purposes as defined in a research paper by Dan S. Bloomberg.
    +
    Added Dan Bloomberd best thinning skeletion, "Skeleton:3"
    +
    Removed origin pixel from many Hit-and-Miss kernels allowing kernels to not only be used for thinning, but also thickening.
    +
    Renamed "ThinDiagonals" kernel to just "Diagonals"
    +
    Distance uses a fast two pass algorithm, and no longer needs 'iteration'
    +
    2011-04-02 6.6.9-4 Glenn Randers-Pehrson <glennrp@image...>
    +
    Make the PNG encoder use depth==8 when incoming image->depth < 8 (the encoder later reduces the depth if it can), to avoid writing an incorrect image.
    +
    Remove any bogus colormap received by the PNG encoder with an image that is not PseudoClass (reference http://www.imagemagick.org/discourse-server/viewtopic.html?f=3&t=18475).
    +
    2011-04-02 6.6.9-3 Cristy <quetzlzacatenango@image...>
    +
    Added -statistic Gradient
    +
    2011-04-01 6.6.9-3 Cristy <quetzlzacatenango@image...>
    New version 6.6.9-3.
    2011-04-01 6.6.9-3 Cristy <quetzlzacatenango@image...>
    Set the caption height correctly for missing row geometry (reference http://www.imagemagick.org/discourse-server/viewtopic.html?f=3&t=18447).
    diff --git a/www/cipher.html b/www/cipher.html index bfac9f40c..535c4b7cc 100644 --- a/www/cipher.html +++ b/www/cipher.html @@ -185,7 +185,7 @@ Druckerei
    diff --git a/www/color.html b/www/color.html index 0ca7b49e0..e243664ac 100644 --- a/www/color.html +++ b/www/color.html @@ -185,7 +185,7 @@ Druckerei diff --git a/www/command-line-options.html b/www/command-line-options.html index cb630ac3e..6b6ed8595 100644 --- a/www/command-line-options.html +++ b/www/command-line-options.html @@ -188,7 +188,7 @@ Druckerei @@ -279,7 +279,7 @@ save to multiple files, if any of the following conditions exist...

    -affine sx,rx,ry,sy[,tx,ty] + class="arg">tx,ty]

    ImageMagick-6.6.9-3-Q16-windows-dll.exedownloaddownloadImageMagick-6.6.9-4-Q16-windows-dll.exedownloaddownload Win32 dynamic at 16 bits-per-pixel
    ImageMagick-6.6.9-3-Q16-windows-static.exedownloaddownloadImageMagick-6.6.9-4-Q16-windows-static.exedownloaddownload Win32 static at 16 bits-per-pixel
    ImageMagick-6.6.9-3-Q8-windows-dll.exedownloaddownloadImageMagick-6.6.9-4-Q8-windows-dll.exedownloaddownload Win32 dynamic at 8 bits-per-pixel
    ImageMagick-6.6.9-3-Q8-windows-static.exedownloaddownloadImageMagick-6.6.9-4-Q8-windows-static.exedownloaddownload Win32 static at 8 bits-per-pixel
    ImageMagick-6.6.9-3-Q16-windows-x64-dll.exedownloaddownloadImageMagick-6.6.9-4-Q16-windows-x64-dll.exedownloaddownload Win64 dynamic at 16 bits-per-pixel
    ImageMagick-6.6.9-3-Q16-windows-x64-static.exedownloaddownloadImageMagick-6.6.9-4-Q16-windows-x64-static.exedownloaddownload Win64 static at 16 bits-per-pixel
    Set the drawing transformation matrix for combined rotating and scaling.
    @@ -1247,13 +1247,13 @@ CMYKA images) and offsets are normalized (divide Flash offset by 255).

    As an example, to add contrast to an image with offsets, try this command:

    -convert kittens.jpg -color-matrix \
-  " 1.5 0.0 0.0 0.0, 0.0, -0.157 \
-    0.0 1.5 0.0 0.0, 0.0, -0.157 \
-    0.0 0.0 1.5 0.0, 0.0, -0.157 \
-    0.0 0.0 0.0 1.0, 0.0,  0.0 \
-    0.0 0.0 0.0 0.0, 1.0,  0.0 \
-    0.0 0.0 0.0 0.0, 0.0,  1.0" kittens.png
+   convert kittens.jpg -color-matrix \
+     " 1.5 0.0 0.0 0.0, 0.0, -0.157 \
+       0.0 1.5 0.0 0.0, 0.0, -0.157 \
+       0.0 0.0 1.5 0.0, 0.0, -0.157 \
+       0.0 0.0 0.0 1.0, 0.0,  0.0 \
+       0.0 0.0 0.0 0.0, 1.0,  0.0 \
+       0.0 0.0 0.0 0.0, 0.0,  1.0" kittens.png

    -colorspace value

    @@ -1264,28 +1264,12 @@ convert kittens.jpg -color-matrix \

    Choices are:

    -  CMY
-  CMYK
-  Gray
-  HSB
-  HSL
-  HWB
-  Lab
-  Log
-  OHTA
-  Rec601Luma
-  Rec601YCbCr
-  Rec709Luma
-  Rec709YCbCr
-  RGB
-  sRGB
-  Transparent
-  XYZ
-  YCbCr
-  YCC
-  YIQ
-  YPbPr
-  YUV
+   CMY          CMYK         Gray         HSB
+   HSL          HWB          Lab          Log
+   OHTA         Rec601Luma   Rec601YCbCr  Rec709Luma
+   Rec709YCbCr  RGB          sRGB         Transparent
+   XYZ          YCbCr        YCC          YIQ
+   YPbPr        YUV

    To print a complete list of colorspaces, use -list colorspace.

    @@ -1773,7 +1757,7 @@ available:

    can achieve this with a single define:

    -    -define png:include-chunk=none,gAMA
+   -define png:include-chunk=none,gAMA

    The critical PNG chunks IHDR, PLTE, @@ -1790,7 +1774,7 @@ available:

    following for PNG output:

    -    -define png:include-chunk=none,gama
+   -define png:include-chunk=none,gama

    The default behavior is to include all known PNG ancillary chunks @@ -1987,10 +1971,10 @@ animation is to be overlaid onto the display.

    Here are the valid methods:

    -Undefined   0  No disposal specified (equivalent to 'none').
-None        1  Do not dispose, just overlay next frame image.
-Background  2  Clear the frame area with the background color.
-Previous    3  Clear to the image prior to this frames overlay.
+   Undefined   0  No disposal specified (equivalent to 'none').
+   None        1  Do not dispose, just overlay next frame image.
+   Background  2  Clear the frame area with the background color.
+   Previous    3  Clear to the image prior to this frames overlay.

    You can also use the numbers given above, which is what the GIF format @@ -2485,18 +2469,18 @@ href="#monochrome">-monochrome, -remap, and - rotate degrees - translate dx,dy - scale sx,sy - skewX degrees - skewY degrees + rotate degrees + translate dx,dy + scale sx,sy + skewX degrees + skewY degrees

    The pixel operation primitives:

    -   color           x0,y0 method
-   matte           x0,y0 method
+   color  x0,y0 method
+   matte  x0,y0 method

    The shape primitives are drawn in the color specified by the preceding -fill setting. For unfilled shapes, use -fill none. You can optionally control the stroke (the "outline" of a shape) with the -stroke and -strokewidth settings.

    @@ -3161,10 +3145,10 @@ affected by the -gravity option.

    Here, parameters is a comma-separated list of numerical values. The number of values varies depending on which function is selected. Choose the function from:

    -  Polynomial
-  Sinusoid
-  Arcsin
-  Arctan
+   Polynomial
+   Sinusoid
+   Arcsin
+   Arctan

    To print a complete list of -function operators, use -list function. Descriptions follow.

    @@ -3548,13 +3532,13 @@ image histogram, and others.

    Choose from:

    -  none
-  line
-  plane
-  partition
-  JPEG
-  GIF
-  PNG
+   none
+   line
+   plane
+   partition
+   JPEG
+   GIF
+   PNG

    This option is used to specify the type of interlacing scheme for raw image formats such as RGB or YUV.

    @@ -3586,14 +3570,14 @@ the pixels surrounding that point. That is how to determine the color of a point that falls between two, or even four different colored pixels. 

    -  integer:           The color of the top-left pixel (floor function)
-  nearest-neighbor:  The nearest pixel to the lookup point (rounded function)
-  average:           The average color of the surrounding four pixels
-  bilinear           A double linear interpolation of pixels (the default)
-  mesh               Divide area into two flat triangular interpolations
-  bicubic            Fitted bicubic-spines of surrounding 16 pixels
-  spline             Direct spline curves (colors are blurred)
-  filter             Use resize -filter settings
+   integer           The color of the top-left pixel (floor function)
+   nearest-neighbor  The nearest pixel to the lookup point (rounded function)
+   average           The average color of the surrounding four pixels
+   bilinear          A double linear interpolation of pixels (the default)
+   mesh              Divide area into two flat triangular interpolations
+   bicubic           Fitted bicubic-spines of surrounding 16 pixels
+   spline            Direct spline curves (colors are blurred)
+   filter            Use resize -filter settings

    This most important for distortion operators such as

    Use -list resource to list the current limits. For example, our system shows these limits:

    $magick> identify -list resource

    -File         Area       Memory          Map         Disk   Thread         Time
-------------------------------------------------------------------------------
- 768     12.404GB    8.6642GiB    23.104GiB  18.446744EB        8    unlimited
+  File         Area       Memory          Map         Disk   Thread         Time
+  ------------------------------------------------------------------------------
+   768     12.404GB    8.6642GiB    23.104GiB  18.446744EB        8    unlimited

    Requests for pixel storage to keep intermediate images are satisfied by one of three resource categories: in-memory pool, memory-mapped files pool, and disk pool (in that order) depending on the ‑limit settings and whether the system honors a resource request. If the total size of allocated pixel storage in the given pool reaches the corresponding limit, the request is passed to the next pool. Additionally, requests that exceed the area limit automagically are allocated on disk.

    @@ -4099,72 +4083,23 @@ normalization of mathematical images.

    Print a list of supported arguments for various options or settings. Choose from these list types:
    -  Align
-  Alpha
-  Boolean
-  Channel
-  Class
-  ClipPath
-  Coder
-  Color
-  Colorspace
-  Command
-  Compose
-  Compress
-  Configure
-  DataType
-  Debug
-  Decoration
-  Delegate
-  Direction
-  Dispose
-  Distort
-  Dither
-  Endian
-  Evaluate
-  FillRule
-  Filter
-  Font
-  Format
-  Function
-  Gravity
-  ImageList
-  Intent
-  Interlace
-  Interpolate
-  Kernel
-  Layers
-  LineCap
-  LineJoin
-  List
-  Locale
-  LogEvent
-  Log
-  Magic
-  Method
-  Metric
-  Mime
-  Mode
-  Morphology
-  Module
-  Noise
-  Orientation
-  Policy
-  PolicyDomain
-  PolicyRights
-  Preview
-  Primitive
-  QuantumFormat
-  Resource
-  SparseColor
-  Storage
-  Stretch
-  Style
-  Threshold
-  Type
-  Units
-  Validate
-  VirtualPixel
+   Align          Alpha          Boolean        Channel
+   Class          ClipPath       Coder          Color
+   Colorspace     Command        Compose        Compress
+   Configure      DataType       Debug          Decoration
+   Delegate       Direction      Dispose        Distort
+   Dither         Endian         Evaluate       FillRule
+   Filter         Font           Format         Function
+   Gravity        ImageList      Intent         Interlace
+   Interpolate    Kernel         Layers         LineCap
+   LineJoin       List           Locale         LogEvent
+   Log            Magic          Method         Metric
+   Mime           Mode           Morphology     Module
+   Noise          Orientation    Policy         PolicyDomain
+   PolicyRights   Preview        Primitive      QuantumFormat
+   Resource       SparseColor    Storage        Stretch
+   Style          Threshold      Type           Units
+   Validate       VirtualPixel

    These lists vary depending on your version of ImageMagick. Use "-list @@ -4185,18 +4120,18 @@ href="#debug">-debug option is active.

    characters:

    -   %d   domain
-   %e   event
-   %f   function
-   %l   line
-   %m   module
-   %p   process ID
-   %r   real CPU time
-   %t   wall clock time
-   %u   user CPU time
-   %%   percent sign
-   \n   newline
-   \r   carriage return
+   %d  domain
+   %e  event
+   %f  function
+   %l  line
+   %m  module
+   %p  process ID
+   %r  real CPU time
+   %t  wall clock time
+   %u  user CPU time
+   %%  percent sign
+   \n  newline
+   \r  carriage return

    For example:

    @@ -4236,12 +4171,12 @@ times.

    Choose from these Standard Colormap types:

    -  best
-  default
-  gray
-  red
-  green
-  blue
+   best
+   default
+   gray
+   red
+   green
+   blue

    The X server must support the Standard @@ -4260,17 +4195,17 @@ class="arg">xstdcmap(1) for one way of creating Standard Colormaps.

    Here are the valid components of a map:

    -  r        red pixel component
-  g        green pixel component
-  b        blue pixel component
-  a        alpha pixel component (0 is transparent)
-  o        opacity pixel component (0 is opaque)
-  i        grayscale intensity pixel component
-  c        cyan pixel component
-  m        magenta pixel component
-  y        yellow pixel component
-  k        black pixel component
-  p        pad component (always 0)
+   r  red pixel component
+   g  green pixel component
+   b  blue pixel component
+   a  alpha pixel component (0 is transparent)
+   o  opacity pixel component (0 is opaque)
+   i  grayscale intensity pixel component
+   c  cyan pixel component
+   m  magenta pixel component
+   y  yellow pixel component
+   k  black pixel component
+   p  pad component (always 0)

    You can specify as many of these components as needed in any order (e.g. @@ -4304,7 +4239,7 @@ style="background-color: #bdbdbd;">this shade of gray.

    return the maximum intensity of an image sequence.
    -

    -median radius

    +

    -median geometry

    apply a median filter to the image.
    @@ -4318,15 +4253,15 @@ style="background-color: #bdbdbd;">this shade of gray.

    Choose from:

    - AE      absolute error count, number of different pixels (-fuzz effected)
- FUZZ    mean color distance
- MAE     mean absolute error (normalized), average channel error distance
- MEPP    mean error per pixel (normalized mean error, normalized peak error)
- MSE     mean error squared, average of the channel error squared
- NCC     normalized cross correlation
- PAE     peak absolute (normalize peak absolute)
- PSNR    peak signal to noise ratio
- RMSE    root mean squared (normalized root mean squared)
+  AE     absolute error count, number of different pixels (-fuzz effected)
+  FUZZ   mean color distance
+  MAE    mean absolute error (normalized), average channel error distance
+  MEPP   mean error per pixel (normalized mean error, normalized peak error)
+  MSE    mean error squared, average of the channel error squared
+  NCC    normalized cross correlation
+  PAE    peak absolute (normalize peak absolute)
+  PSNR   peak signal to noise ratio
+  RMSE   root mean squared (normalized root mean squared)

    Control the 'AE', or absolute count of pixels that are different, @@ -4352,7 +4287,7 @@ metrics option.

    -

    -mode value

    +

    -mode geometry

    make each pixel the 'predominate color' of the neighborhood.[convert, mogrify]
    @@ -4485,7 +4420,7 @@ pixels which are outside the image proper are blurred into the final result.

    The red, green, and blue intensities of an image are negated. White becomes black, yellow becomes blue, etc. Use +negate to only negate the grayscale pixels of the image.

    -

    -noise radius
    +

    -noise geometry
    +noise type

    @@ -4498,13 +4433,13 @@ pixels which are outside the image proper are blurred into the final result.

    Use +noise followed by a noise type to add noise to an image. Choose from these noise types:

    -Gaussian
-Impulse
-Laplacian
-Multiplicative
-Poisson
-Random
-Uniform
+   Gaussian
+   Impulse
+   Laplacian
+   Multiplicative
+   Poisson
+   Random
+   Uniform

    To print a complete list of noises, use the -list noise option.

    @@ -4552,25 +4487,25 @@ given number of levels per color channel . You can choose from these standard threshold maps:

    -threshold        1x1          Threshold 1x1 (non-dither)
-checks           2x1          Checkerboard 2x1 (dither)
-o2x2             2x2          Ordered 2x2 (dispersed)
-o3x3             3x3          Ordered 3x3 (dispersed)
-o4x4             4x4          Ordered 4x4 (dispersed)
-o8x8             8x8          Ordered 8x8 (dispersed)
-h4x4a            4x1          Halftone 4x4 (angled)
-h6x6a            6x1          Halftone 6x6 (angled)
-h8x8a            8x1          Halftone 8x8 (angled)
-h4x4o                         Halftone 4x4 (orthogonal)
-h6x6o                         Halftone 6x6 (orthogonal)
-h8x8o                         Halftone 8x8 (orthogonal)
-h16x16o                       Halftone 16x16 (orthogonal)
-c5x5b            c5x5         Circles 5x5 (black)
-c5x5w                         Circles 5x5 (white)
-c6x6b            c6x6         Circles 6x6 (black)
-c6x6w                         Circles 6x6 (white)
-c7x7b            c7x7         Circles 7x7 (black)
-c7x7w                         Circles 7x7 (white)
+   threshold   1x1   Threshold 1x1 (non-dither)
+   checks      2x1   Checkerboard 2x1 (dither)
+   o2x2        2x2   Ordered 2x2 (dispersed)
+   o3x3        3x3   Ordered 3x3 (dispersed)
+   o4x4        4x4   Ordered 4x4 (dispersed)
+   o8x8        8x8   Ordered 8x8 (dispersed)
+   h4x4a       4x1   Halftone 4x4 (angled)
+   h6x6a       6x1   Halftone 6x6 (angled)
+   h8x8a       8x1   Halftone 8x8 (angled)
+   h4x4o             Halftone 4x4 (orthogonal)
+   h6x6o             Halftone 6x6 (orthogonal)
+   h8x8o             Halftone 8x8 (orthogonal)
+   h16x16o           Halftone 16x16 (orthogonal)
+   c5x5b       c5x5  Circles 5x5 (black)
+   c5x5w             Circles 5x5 (white)
+   c6x6b       c6x6  Circles 6x6 (black)
+   c6x6w             Circles 6x6 (white)
+   c7x7b       c7x7  Circles 7x7 (black)
+   c7x7w             Circles 7x7 (white)

    The threshold generated a simple 50% threshold of the image. @@ -4633,15 +4568,15 @@ href="#channel">-channel to enable alpha channel handling.

    Choose from these orientations:

    -  bottom-left
-  bottom-right
-  left-bottom
-  left-top
-  right-bottom
-  right-top
-  top-left
-  top-right
-  undefined
+   bottom-left
+   bottom-right
+   left-bottom
+   left-top
+   right-bottom
+   right-top
+   top-left
+   top-right
+   undefined

    To print a complete list of orientations, use the -list @@ -4795,35 +4730,14 @@ orientation option.

    Use this option to affect the preview operation of an image (e.g. convert file.png -preview Gamma Preview:gamma.png). Choose from these previews:

    -  Rotate
-  Shear
-  Roll
-  Hue
-  Saturation
-  Brightness
-  Gamma
-  Spiff
-  Dull
-  Grayscale
-  Quantize
-  Despeckle
-  ReduceNoise
-  Add Noise
-  Sharpen
-  Blur
-  Threshold
-  EdgeDetect
-  Spread
-  Shade
-  Raise
-  Segment
-  Solarize
-  Swirl
-  Implode
-  Wave
-  OilPaint
-  CharcoalDrawing
-  JPEG
+   Rotate           Shear            Roll             Hue
+   Saturation       Brightness       Gamma            Spiff
+   Dull             Grayscale        Quantize         Despeckle
+   ReduceNoise      Add Noise        Sharpen          Blur
+   Threshold        EdgeDetect       Spread           Shade
+   Raise            Segment          Solarize         Swirl
+   Implode          Wave             OilPaint         CharcoalDrawing
+   JPEG

    To print a complete list of previews, use the -list preview option.

    @@ -4905,11 +4819,11 @@ subsequent profiles from overwriting the preceding ones, e.g.,

    If filter-type is 4 or less, the specified filter-type is used for all scanlines:

    -  0: none
-  1: sub
-  2: up
-  3: average
-  4: Paeth
+   0: none
+   1: sub
+   2: up
+   3: average
+   4: Paeth

    If filter-type is 5, adaptive filtering is used when quality is greater than 50 and the image does not have a color map, otherwise no filtering is used.

    @@ -5402,11 +5316,11 @@ id="shared-memory">-shared-memory

    For Photo CD images, choose from these sizes:

    -  192x128
-  384x256
-  768x512
-  1536x1024
-  3072x2048
+   192x128
+   384x256
+   768x512
+   1536x1024
+   3072x2048
    @@ -5527,12 +5441,13 @@ default value.

    Choose from these statistic types:

    -  Maximum
-  Minimum
-  Mean
-  Median
-  Mode
-  Nonpeak
+   Gradient   maximum difference in area
+   Maximum    maximum value per channel in neighborhood
+   Minimum    minimum value per channel in neighborhood
+   Mean       average value per channel in neighborhood
+   Median     median value per channel in neighborhood
+   Mode       mode (most frequent) value per channel in neighborhood
+   Nonpeak    value just before or after the median value per channel in neighborhood
    @@ -5558,13 +5473,13 @@ default value.

    pixel storage type. Here are the valid types:
    -  char        store pixels as unsigned characters
-  double      store pixels as doubles
-  float       store pixels as floats
-  integer     store pixels as integers
-  long        store pixels as longs
-  quantum     store pixels in the native depth of your ImageMagick distribution
-  short       store pixels as unsigned shorts
+   char     unsigned characters
+   double   doubles
+   float    floats
+   integer  integers
+   long     longs
+   quantum  pixels in the native depth of your ImageMagick distribution
+   short    unsigned shorts

    Float and double types are normalized from 0.0 to 1.0 otherwise the pixels @@ -5579,16 +5494,16 @@ values range from 0 to the maximum value the storage type can support.

    This setting suggests a type of stretch that ImageMagick should try to apply to the currently selected font family. Select fontStretch from the following.

    -        Any
-        Condensed
-        Expanded
-        ExtraCondensed
-        ExtraExpanded
-        Normal
-        SemiCondensed
-        SemiExpanded
-        UltraCondensed
-        UltraExpanded
+   Any
+   Condensed
+   Expanded
+   ExtraCondensed
+   ExtraExpanded
+   Normal
+   SemiCondensed
+   SemiExpanded
+   UltraCondensed
+   UltraExpanded

    To print a complete list of stretch types, use -list stretch.

    @@ -5630,10 +5545,10 @@ the currently selected font family. Select fontStyle from the following.

    -        Any
-        Italic
-        Normal
-        Oblique
+   Any
+   Italic
+   Normal
+   Oblique

    For other settings that affect fonts, see the options -font, -family, -stretch, and -weight.

    @@ -5973,13 +5888,13 @@ single pixel transparent 'missed' image is returned, in the same way as when a

    The parameters are:

    -  radius:    The radius of the Gaussian, in pixels,  not counting the center
-             pixel (default 0).
-  sigma:     The standard deviation of the Gaussian, in pixels (default 1.0).
-  amount:    The fraction of the difference between the original and the blur
-             image that is added back into the original (default 1.0).
-  threshold: The threshold, as a fraction of QuantumRange, needed to apply the
-             difference amount (default 0.05).
+   radius     The radius of the Gaussian, in pixels,  not counting the center
+              pixel (default 0).
+   sigma      The standard deviation of the Gaussian, in pixels (default 1.0).
+   amount     The fraction of the difference between the original and the blur
+              image that is added back into the original (default 1.0).
+   threshold  The threshold, as a fraction of QuantumRange, needed to apply the
+              difference amount (default 0.05).
    @@ -6025,21 +5940,21 @@ image, but could also be set to a specify background color.

    Choose from these methods:

    -  background:           the area surrounding the image is the background color
-  black:                the area surrounding the image is black
-  checker-tile:         alternate squares with image and background color
-  dither:               non-random 32x32 dithered pattern
-  edge:                 extend the edge pixel toward infinity
-  gray:                 the area surrounding the image is gray
-  horizontal-tile:      horizontally tile the image, background color above/below
-  horizontal-tile-edge: horizontally tile the image and replicate the side edge pixels
-  mirror:               mirror tile the image
-  random:               choose a random pixel from the image
-  tile:                 tile the image (default)
-  transparent:          the area surrounding the image is transparent blackness
-  vertical-tile:        vertically tile the image, sides are background color
-  vertical-tile-edge:   vertically tile the image and replicate the side edge pixels
-  white:                the area surrounding the image is white
+   background            the area surrounding the image is the background color
+   black                 the area surrounding the image is black
+   checker-tile          alternate squares with image and background color
+   dither                non-random 32x32 dithered pattern
+   edge                  extend the edge pixel toward infinity
+   gray                  the area surrounding the image is gray
+   horizontal-tile       horizontally tile the image, background color above/below
+   horizontal-tile-edge  horizontally tile the image and replicate the side edge pixels
+   mirror                mirror tile the image
+   random                choose a random pixel from the image
+   tile                  tile the image (default)
+   transparent           the area surrounding the image is transparent blackness
+   vertical-tile         vertically tile the image, sides are background color
+   vertical-tile-edge    vertically tile the image and replicate the side edge pixels
+   white                 the area surrounding the image is white

    The default value is "edge".

    @@ -6062,14 +5977,14 @@ href="#blur">-blur, and -sharpen.

    Choose from these visual classes:

    -  StaticGray
-  GrayScale
-  StaticColor
-  PseudoColor
-  TrueColor
-  DirectColor
-  default
-  visual id
+   StaticGray
+   GrayScale
+   StaticColor
+   PseudoColor
+   TrueColor
+   DirectColor
+   default
+   visual id

    The X server must support the visual you choose, otherwise an error occurs. If a visual is not specified, the visual class that can display the most simultaneous colors on the default screen is chosen.

    diff --git a/www/command-line-processing.html b/www/command-line-processing.html index b6c43f3ff..47de7bf35 100644 --- a/www/command-line-processing.html +++ b/www/command-line-processing.html @@ -184,7 +184,7 @@ Druckerei
    diff --git a/www/command-line-tools.html b/www/command-line-tools.html index 92ccdc715..c6bdb227f 100644 --- a/www/command-line-tools.html +++ b/www/command-line-tools.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/compare.html b/www/compare.html index 592af40ed..fbcd792fe 100644 --- a/www/compare.html +++ b/www/compare.html @@ -185,7 +185,7 @@ Druckerei diff --git a/www/compose.html b/www/compose.html index 36f639ace..a02d72543 100644 --- a/www/compose.html +++ b/www/compose.html @@ -185,7 +185,7 @@ Druckerei diff --git a/www/conjure.html b/www/conjure.html index 773c067d7..5566d1086 100644 --- a/www/conjure.html +++ b/www/conjure.html @@ -185,7 +185,7 @@ Druckerei diff --git a/www/convert.html b/www/convert.html index 951acda99..fe2676576 100644 --- a/www/convert.html +++ b/www/convert.html @@ -185,7 +185,7 @@ Druckerei diff --git a/www/display.html b/www/display.html index d8c0f6dac..6f848fd8c 100644 --- a/www/display.html +++ b/www/display.html @@ -185,7 +185,7 @@ Druckerei diff --git a/www/download.html b/www/download.html index 8f7c20eb9..0a64abcd4 100644 --- a/www/download.html +++ b/www/download.html @@ -184,7 +184,7 @@ Druckerei @@ -199,7 +199,7 @@

    Download 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 Subversion. Before you download, you may want to review recent changes to the ImageMagick distribution.

    -

    The latest release of ImageMagick is version 6.6.9-3.

    +

    The latest release of ImageMagick is version 6.6.9-4.

    Australia
    ftp://mirror.aarnet.edu.au/pub/imagemagick/
    diff --git a/www/escape.html b/www/escape.html index c8b69d6b7..fd034c4c6 100644 --- a/www/escape.html +++ b/www/escape.html @@ -185,7 +185,7 @@ Druckerei
    diff --git a/www/examples.html b/www/examples.html index c81a81a74..e71ce24bf 100644 --- a/www/examples.html +++ b/www/examples.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/exception.html b/www/exception.html index fe8390c15..d3f69ed88 100644 --- a/www/exception.html +++ b/www/exception.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/export.html b/www/export.html index 679f5358c..a4044dd39 100644 --- a/www/export.html +++ b/www/export.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/formats.html b/www/formats.html index f87d0bd28..85c593265 100644 --- a/www/formats.html +++ b/www/formats.html @@ -185,7 +185,7 @@ Druckerei @@ -1424,7 +1424,7 @@ convert \( -size 15x15 xc:black xc:white -append \) \ WIZARD R - ImageMagick Wizard, 640x480 + ImageMagick Wizard, 480x640 Logo diff --git a/www/fx.html b/www/fx.html index c673dda48..66987cd25 100644 --- a/www/fx.html +++ b/www/fx.html @@ -185,7 +185,7 @@ Druckerei @@ -248,6 +248,13 @@

    radial-gradient

    + +

    This FX expression adds random noise to an image:

    + +

    $magick> convert photo.jpg -fx 'iso=32; rone=rand(); rtwo=rand(); \
    + myn=sqrt(-2*ln(rone))*cos(2*Pi*rtwo); myntwo=sqrt(-2*ln(rtwo))* \
    + cos(2*Pi*rone); pnoise=sqrt(p)*myn*sqrt(iso)* \
    + channel(4.28,3.86,6.68,0)/255; max(0,p+pnoise)' noisy.png

    See Using FX, The Special Effects Image Operator for more examples.

    The next section discusses the Fx expression language.

    diff --git a/www/high-dynamic-range.html b/www/high-dynamic-range.html index 4216f7ddb..47900145f 100644 --- a/www/high-dynamic-range.html +++ b/www/high-dynamic-range.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/identify.html b/www/identify.html index 6d62f5fc6..4287a11d4 100644 --- a/www/identify.html +++ b/www/identify.html @@ -184,7 +184,7 @@ Druckerei @@ -267,7 +267,7 @@ Tainted: False
    Filesize: 3.97266kb
    Number pixels: 3.14453kb
    - Version: ImageMagick 6.6.9-3 2011-04-01 Q16 http://www.imagemagick.org

    + Version: ImageMagick 6.6.9-4 2011-04-01 Q16 http://www.imagemagick.org

    To get the print size in inches of an image at 72 DPI, use:

    $magick> identify -format "%[fx:w/72] by %[fx:h/72] inches" document.png8.5 x 11 inches

    diff --git a/www/import.html b/www/import.html index 3ec554b9b..aef44891b 100644 --- a/www/import.html +++ b/www/import.html @@ -185,7 +185,7 @@ Druckerei diff --git a/www/index.html b/www/index.html index 5ef97e236..74ab81ac6 100644 --- a/www/index.html +++ b/www/index.html @@ -184,7 +184,7 @@ Druckerei @@ -209,7 +209,7 @@

    The ImageMagick development process ensures a stable API and ABI. Before each ImageMagick release, we perform a comprehensive security assessment that includes memory and thread error detection to prevent security vulnerabilities.

    -

    The current release is ImageMagick 6.6.9-3.

    +

    The current release is ImageMagick 6.6.9-4.

    diff --git a/www/jp2.html b/www/jp2.html index dd7ba3d8c..b34aa3590 100644 --- a/www/jp2.html +++ b/www/jp2.html @@ -185,7 +185,7 @@ Druckerei diff --git a/www/license.html b/www/license.html index a20f5a824..1788a7d72 100644 --- a/www/license.html +++ b/www/license.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/links.html b/www/links.html index fdd93a6c7..dd3bbb5a1 100644 --- a/www/links.html +++ b/www/links.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/magick++.html b/www/magick++.html index 6870e6152..ea931a54f 100644 --- a/www/magick++.html +++ b/www/magick++.html @@ -185,7 +185,7 @@ Druckerei diff --git a/www/magick-core.html b/www/magick-core.html index 82dc8c0d2..5dac3a8e0 100644 --- a/www/magick-core.html +++ b/www/magick-core.html @@ -185,7 +185,7 @@ Druckerei diff --git a/www/magick-vector-graphics.html b/www/magick-vector-graphics.html index 8523d0645..054389d50 100644 --- a/www/magick-vector-graphics.html +++ b/www/magick-vector-graphics.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/magick-wand.html b/www/magick-wand.html index 96bb21470..c8d91f039 100644 --- a/www/magick-wand.html +++ b/www/magick-wand.html @@ -185,7 +185,7 @@ Druckerei diff --git a/www/mogrify.html b/www/mogrify.html index 752851156..2567e0672 100644 --- a/www/mogrify.html +++ b/www/mogrify.html @@ -185,7 +185,7 @@ Druckerei diff --git a/www/montage.html b/www/montage.html index f7872736b..d383b2ee3 100644 --- a/www/montage.html +++ b/www/montage.html @@ -185,7 +185,7 @@ Druckerei diff --git a/www/motion-picture.html b/www/motion-picture.html index 067892514..a9a06b562 100644 --- a/www/motion-picture.html +++ b/www/motion-picture.html @@ -185,7 +185,7 @@ Druckerei diff --git a/www/perl-magick.html b/www/perl-magick.html index e63b80018..b25f55ecf 100644 --- a/www/perl-magick.html +++ b/www/perl-magick.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/resources.html b/www/resources.html index 5e1c55935..b9da52670 100644 --- a/www/resources.html +++ b/www/resources.html @@ -184,7 +184,7 @@ Druckerei @@ -307,7 +307,7 @@ file or data stream.

       $MAGICK_CONFIGURE_PATH
   $PREFIX/etc/ImageMagick
-  $PREFIX/share/ImageMagick-6.6.9
+  $PREFIX/share/ImageMagick-6.6.9 
   $HOME/.magick/
   <client path>/etc/ImageMagick/
    @@ -319,8 +319,9 @@ file or data stream.

       $MAGICK_CONFIGURE_PATH
   $MAGICK_HOME/etc/ImageMagick
-  $MAGICK_HOME/share/ImageMagick-6.6.9
-  $PREFIX/share/ImageMagick-6.6.9  $HOME/.magick/
+  $MAGICK_HOME/share/ImageMagick-6.6.9 
+  $PREFIX/share/ImageMagick-6.6.9 
+  $HOME/.magick/
   <client path>/etc/ImageMagick/
   <current directory>
    @@ -354,11 +355,11 @@ file or data stream.

    Modules

    -

    ImageMagick's image format support is usually provided in the form of loadable modules. It searches for loadable modules in the following order and it uses the first match found:

    +

    Coders

    +

    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-6.6.9/modules-Q16/coders/
-  $HOME/.magick/
   <client path>/../lib/ImageMagick-6.6.9/modules-Q16/coders/
   $MAGICK_HOME/lib/ImageMagick-6.6.9/modules-Q16/coders
   $MAGICK_HOME/share/ImageMagick-6.6.9/modules-Q16/coders
@@ -366,6 +367,17 @@ file or data stream.
    
   <client path>/lib/ImageMagick-6.6.9/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-6.6.9/modules-Q16/filters/
+  <client path>/../lib/ImageMagick-6.6.9/modules-Q16/filters/
+  $MAGICK_HOME/lib/ImageMagick-6.6.9/modules-Q16/filters
+  $MAGICK_HOME/share/ImageMagick-6.6.9/modules-Q16/filters
+  $HOME/.magick/
+  <client path>/lib/ImageMagick-6.6.9/modules-Q16/filters
+
    +

    Fonts

    diff --git a/www/search.html b/www/search.html index 3804e12e3..3d4f90ea4 100644 --- a/www/search.html +++ b/www/search.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/sponsors.html b/www/sponsors.html index 9238f778d..7427c7bb4 100644 --- a/www/sponsors.html +++ b/www/sponsors.html @@ -184,7 +184,7 @@ Druckerei @@ -208,6 +208,7 @@
    alaTest.com
    +
    Autoteile Online Shop
    Best Web Hosting
    Custom T-Shirts
    Druckerei
    diff --git a/www/stream.html b/www/stream.html index e1b5dba8e..c2b9dc0fa 100644 --- a/www/stream.html +++ b/www/stream.html @@ -185,7 +185,7 @@ Druckerei diff --git a/www/subversion.html b/www/subversion.html index 3cabba9e3..0b4a5bd33 100644 --- a/www/subversion.html +++ b/www/subversion.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/t-shirt.html b/www/t-shirt.html index 1e2480769..0d5e020b2 100644 --- a/www/t-shirt.html +++ b/www/t-shirt.html @@ -184,7 +184,7 @@ Druckerei -- 2.40.0