From bc9539a4e2fbc362babf3d5871fb53c431d9943b Mon Sep 17 00:00:00 2001 From: cristy Date: Mon, 16 Aug 2010 18:06:20 +0000 Subject: [PATCH] --- ImageMagick.spec | 2 +- config/configure.xml | 4 +- index.html | 2 +- libtool | 2 +- magick/version.h | 6 +- version.sh | 2 +- www/ImageMagickObject.html | 2 +- www/advanced-unix-installation.html | 8 +- www/advanced-windows-installation.html | 2 +- www/animate.html | 2 +- www/api.html | 42 +- 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 | 3 +- www/api/cipher.html | 2 +- www/api/colormap.html | 2 +- www/api/compare.html | 2 +- www/api/composite.html | 2 +- www/api/constitute.html | 2 +- www/api/decorate.html | 2 +- www/api/deprecate.html | 2 +- www/api/distort.html | 2 +- www/api/drawing-wand.html | 2 +- www/api/effect.html | 5 +- www/api/image-view.html | 2 +- www/api/image.html | 2 +- www/api/list.html | 2 +- www/api/magick-deprecate.html | 2 +- www/api/magick-property.html | 3 + www/api/magick-wand.html | 3 - www/api/magick.html | 2 +- www/api/monitor.html | 2 +- www/api/montage.html | 3 - 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/registry.html | 2 +- www/api/resize.html | 9 +- www/api/resource.html | 2 +- www/api/segment.html | 2 +- www/api/shear.html | 2 +- www/api/signature.html | 3 + www/api/statistic.html | 2 +- www/api/stream.html | 2 +- www/api/transform.html | 2 +- www/api/version.html | 2 +- www/api/wand-view.html | 2 +- www/architecture.html | 2 +- www/binary-releases.html | 52 +- www/changelog.html | 6 +- www/cipher.html | 2 +- www/command-line-options.html | 599 +++----------------- www/command-line-processing.html | 2 +- www/command-line-tools.html | 4 +- www/compose.html | 723 +++++++++++++++++++++++++ www/contact.html | 2 +- www/convert.html | 2 +- www/download.html | 2 +- www/examples.html | 4 +- www/exception.html | 2 +- www/formats.html | 2 +- www/fx.html | 2 +- www/high-dynamic-range.html | 2 +- www/history.html | 4 +- www/identify.html | 4 +- www/import.html | 2 +- www/index.html | 2 +- www/license.html | 2 +- www/magick-core.html | 2 +- www/magick-vector-graphics.html | 2 +- www/magick-wand.html | 2 +- www/miff.html | 2 +- www/mirrors.html | 6 +- www/mogrify.html | 2 +- www/montage.html | 2 +- www/motion-picture.html | 2 +- www/quantize.html | 2 +- www/resources.html | 3 + www/sitemap.html | 50 +- www/sponsors.html | 2 +- www/subversion.html | 2 +- www/t-shirt.html | 2 +- 86 files changed, 968 insertions(+), 704 deletions(-) diff --git a/ImageMagick.spec b/ImageMagick.spec index 67c0df863..fb41aa807 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,5 +1,5 @@ %global VERSION 6.6.3 -%global Patchlevel 7 +%global Patchlevel 8 Name: ImageMagick Version: %{VERSION} diff --git a/config/configure.xml b/config/configure.xml index b901aec62..df9c4e6f8 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -8,8 +8,8 @@ - - + + diff --git a/index.html b/index.html index ad32b0d00..3c3a367c1 100644 --- a/index.html +++ b/index.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/libtool b/libtool index 85212d22e..6abb28e6e 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.3-7 +# Generated automatically by config.status (ImageMagick) 6.6.3-8 # 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 e8de77e62..a29b13d8f 100644 --- a/magick/version.h +++ b/magick/version.h @@ -30,11 +30,11 @@ extern "C" { #define MagickLibVersion 0x663 #define MagickLibVersionText "6.6.3" #define MagickLibVersionNumber 4,0,0 -#define MagickLibAddendum "-7" +#define MagickLibAddendum "-8" #define MagickLibInterface 4 #define MagickLibMinInterface 4 -#define MagickReleaseDate "2010-08-14" -#define MagickChangeDate "20100813" +#define MagickReleaseDate "2010-08-16" +#define MagickChangeDate "20100815" #define MagickAuthoritativeURL "http://www.imagemagick.org" #define MagickFeatures "OpenMP " #define MagickHomeURL "file:///usr/local/share/doc/ImageMagick-6.6.3/index.html" diff --git a/version.sh b/version.sh index d9a84e0b2..56c1d6cf4 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.3' PACKAGE_LIB_VERSION="0x663" -PACKAGE_RELEASE="7" +PACKAGE_RELEASE="8" PACKAGE_LIB_VERSION_NUMBER="6,6,3,${PACKAGE_RELEASE}" PACKAGE_RELEASE_DATE=`date +%F` PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION" diff --git a/www/ImageMagickObject.html b/www/ImageMagickObject.html index ad2afff7e..60fa22191 100644 --- a/www/ImageMagickObject.html +++ b/www/ImageMagickObject.html @@ -146,7 +146,7 @@ Druckerei Online diff --git a/www/advanced-unix-installation.html b/www/advanced-unix-installation.html index 293498ac7..0dec335e2 100644 --- a/www/advanced-unix-installation.html +++ b/www/advanced-unix-installation.html @@ -145,7 +145,7 @@ Druckerei Online @@ -191,7 +191,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.3-6 $magick> ./configure

+

$magick> cd ImageMagick-6.6.3-7 $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:

@@ -543,7 +543,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.3-6.tar.gz $magick> cd ImageMagick-6.6.3-6

Configure ImageMagick:

+

$magick> tar xvfz ImageMagick-6.6.3-7.tar.gz $magick> cd ImageMagick-6.6.3-7

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/ \
@@ -563,7 +563,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.3-?.tar.bz2 $magick> cd ImageMagick-6.6.3-6 $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.3-?.tar.bz2 $magick> cd ImageMagick-6.6.3-7 $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 003aa9c57..1c6269cbb 100644 --- a/www/advanced-windows-installation.html +++ b/www/advanced-windows-installation.html @@ -443,7 +443,7 @@
  1. Double-click on - VisualMagick/bin/ImageMagick-6.6.3-6-Q16-windows-dll.exe + VisualMagick/bin/ImageMagick-6.6.3-7-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 86e62bb2d..fa1eb13ba 100644 --- a/www/animate.html +++ b/www/animate.html @@ -146,7 +146,7 @@ Druckerei Online
diff --git a/www/api.html b/www/api.html index 00cb3ad62..2dcc6e05f 100644 --- a/www/api.html +++ b/www/api.html @@ -145,7 +145,7 @@ Druckerei Online @@ -175,7 +175,7 @@

Ada

-

G2F implements an Ada 95 binding to a subset of the low-level MagickCore library.

+

G2F implements an Ada 95 binding to a subset of the low-level MagickCore library.

C

@@ -187,7 +187,7 @@

Ch

-

ChMagick is a Ch binding to the MagickCore and MagickWand API. Ch is an embeddable C/C++ interpreter for cross-platform scripting.

+

ChMagick is a Ch binding to the MagickCore and MagickWand API. Ch is an embeddable C/C++ interpreter for cross-platform scripting.

COM+

@@ -199,31 +199,31 @@

C++

-

Magick++ provides an object-oriented C++ interface to ImageMagick. See A Gentle Introduction to Magick++ for an introductory tutorial to Magick++. We include the source if you want to correct, enhance, or expand the tutorial.

+

Magick++ provides an object-oriented C++ interface to ImageMagick. See A Gentle Introduction to Magick++ for an introductory tutorial to Magick++. We include the source if you want to correct, enhance, or expand the tutorial.

Java

-

JMagick provides an object-oriented Java interface to ImageMagick. Im4java is a pure-java interface to the ImageMagick command-line.

+

JMagick provides an object-oriented Java interface to ImageMagick. Im4java is a pure-java interface to the ImageMagick command-line.

LabVIEW

-

LVOOP ImageMagick is an object-oriented LabVIEW interface to ImageMagick.

+

LVOOP ImageMagick is an object-oriented LabVIEW interface to ImageMagick.

Lisp

-

CL-Magick provides a Common Lisp interface to the ImageMagick library.

+

CL-Magick provides a Common Lisp interface to the ImageMagick library.

Neko

-

NMagick is a port of the ImageMagick library to the haXe and Neko platforms. It provides image manipulation capabilities to both web and desktop applications using Neko.

+

NMagick is a port of the ImageMagick library to the haXe and Neko platforms. It provides image manipulation capabilities to both web and desktop applications using Neko.

.NET

@@ -237,7 +237,7 @@

Pascal

-

PascalMagick a Pascal binding for the MagickWand API and also the low-level MagickCore library. It works with Free Pascal / Lazarus and Delphi.

+

PascalMagick a Pascal binding for the MagickWand API and also the low-level MagickCore library. It works with Free Pascal / Lazarus and Delphi.

Perl

@@ -249,50 +249,50 @@

PHP

-

MagickWand for PHP a native PHP-extension to the ImageMagick MagickWand API.

+

MagickWand for PHP a native PHP-extension to the ImageMagick MagickWand API.

-

IMagick is a native PHP extension to create and modify images using the ImageMagick API. Documentation for the extension is available here.

+

IMagick is a native PHP extension to create and modify images using the ImageMagick API. Documentation for the extension is available here.

-

phMagick is a wrapper class for ImageMagick, wrapping the most common web image manipulation actions in easy to use functions, but allowing full access to ImageMagick's power by issuing system calls to it's command-line programs.

+

phMagick is a wrapper class for ImageMagick, wrapping the most common web image manipulation actions in easy to use functions, but allowing full access to ImageMagick's power by issuing system calls to it's command-line programs.

Python

-

PythonMagickWand is an object-oriented Python interface to MagickWand based on ctypes.

+

PythonMagickWand is an object-oriented Python interface to MagickWand based on ctypes.

-

PythonMagick is an object-oriented Python interface to ImageMagick.

+

PythonMagick is an object-oriented Python interface to ImageMagick.

REALbasic

-

The MBS Realbasic ImageMagick is a plugin that utilizes the power of ImageMagick from within the RealBasic environment.

+

The MBS Realbasic ImageMagick is a plugin that utilizes the power of ImageMagick from within the RealBasic environment.

Ruby

-

RMagick is an interface between the Ruby programming language and the MagickCore image processing libraries. Get started with RMagick by perusing the documentation.

+

RMagick is an interface between the Ruby programming language and the MagickCore image processing libraries. Get started with RMagick by perusing the documentation.

-

MagickWand for Ruby is an interface between the Ruby programming language and the MagickWand image processing libraries. Get started with MagickWand for PHP by perusing the documentation.

+

MagickWand for Ruby is an interface between the Ruby programming language and the MagickWand image processing libraries. Get started with MagickWand for PHP by perusing the documentation.

-

MiniMagick is a Ruby wrapper for ImageMagick command line. MiniMagick gives you convenient access to all the command line options ImageMagick supports.

+

MiniMagick is a Ruby wrapper for ImageMagick command line. MiniMagick gives you convenient access to all the command line options ImageMagick supports.

-

QuickMagick is a gem for easily accessing ImageMagick command line tools from Ruby programs.

+

QuickMagick is a gem for easily accessing ImageMagick command line tools from Ruby programs.

Tcl/Tk

-

TclMagick a native Tcl-extension to the ImageMagick MagickWand API.

+

TclMagick a native Tcl-extension to the ImageMagick MagickWand API.

XML RPC

-

RemoteMagick is an XML-RPC web service that creates image thumbnails.

+

RemoteMagick is an XML-RPC web service that creates image thumbnails.

diff --git a/www/api/animate.html b/www/api/animate.html index bd4d1160e..d0a93779c 100644 --- a/www/api/animate.html +++ b/www/api/animate.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/annotate.html b/www/api/annotate.html index 1d03d56e4..212cdfc41 100644 --- a/www/api/annotate.html +++ b/www/api/annotate.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/attribute.html b/www/api/attribute.html index acf714c1c..d8b509f5b 100644 --- a/www/api/attribute.html +++ b/www/api/attribute.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/blob.html b/www/api/blob.html index 502117147..a75ab02ad 100644 --- a/www/api/blob.html +++ b/www/api/blob.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/cache-view.html b/www/api/cache-view.html index a47676347..0eab958f7 100644 --- a/www/api/cache-view.html +++ b/www/api/cache-view.html @@ -414,8 +414,7 @@ _8c.html" target="source" name="GetCacheViewVirtualPixels">GetCacheViewVirtualPi 
   const PixelPacket *GetCacheViewVirtualPixels(
     const CacheView *cache_view,const ssize_t x,const ssize_t y,
-    const size_t columns,const size_t rows,
-    ExceptionInfo *exception)
+    const size_t columns,const size_t rows,ExceptionInfo *exception)

A description of each parameter follows:

diff --git a/www/api/cipher.html b/www/api/cipher.html index bc9cfa9a9..001d42796 100644 --- a/www/api/cipher.html +++ b/www/api/cipher.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/colormap.html b/www/api/colormap.html index 44452265d..0ed752422 100644 --- a/www/api/colormap.html +++ b/www/api/colormap.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/compare.html b/www/api/compare.html index 4d31b5c89..a61ba72f9 100644 --- a/www/api/compare.html +++ b/www/api/compare.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/composite.html b/www/api/composite.html index c6017d9cf..18eab339e 100644 --- a/www/api/composite.html +++ b/www/api/composite.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/constitute.html b/www/api/constitute.html index a1d50bc7f..adfa74307 100644 --- a/www/api/constitute.html +++ b/www/api/constitute.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/decorate.html b/www/api/decorate.html index 9d903f085..81cab3b41 100644 --- a/www/api/decorate.html +++ b/www/api/decorate.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/deprecate.html b/www/api/deprecate.html index 74b16e8d4..dbf917069 100644 --- a/www/api/deprecate.html +++ b/www/api/deprecate.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/distort.html b/www/api/distort.html index dabd735eb..9cc187b3b 100644 --- a/www/api/distort.html +++ b/www/api/distort.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/drawing-wand.html b/www/api/drawing-wand.html index 4b6c9fd79..7296bded0 100644 --- a/www/api/drawing-wand.html +++ b/www/api/drawing-wand.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/effect.html b/www/api/effect.html index a1f2ec76e..1d164e1ae 100644 --- a/www/api/effect.html +++ b/www/api/effect.html @@ -145,7 +145,7 @@ Druckerei Online @@ -284,8 +284,7 @@ _8c.html" target="source" name="ConvolveImage">ConvolveImage Image *ConvolveImage(const Image *image,const size_t order, const double *kernel,ExceptionInfo *exception) Image *ConvolveImageChannel(const Image *image,const ChannelType channel, - const size_t order,const double *kernel, - ExceptionInfo *exception) + const size_t order,const double *kernel,ExceptionInfo *exception)

A description of each parameter follows:

diff --git a/www/api/image-view.html b/www/api/image-view.html index 22ca6f7fb..f1a18d517 100644 --- a/www/api/image-view.html +++ b/www/api/image-view.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/image.html b/www/api/image.html index d9db7bb97..909cdce97 100644 --- a/www/api/image.html +++ b/www/api/image.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/list.html b/www/api/list.html index 13f9204fb..adb4891d9 100644 --- a/www/api/list.html +++ b/www/api/list.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/magick-deprecate.html b/www/api/magick-deprecate.html index 043f01d48..5a7e85f64 100644 --- a/www/api/magick-deprecate.html +++ b/www/api/magick-deprecate.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/magick-property.html b/www/api/magick-property.html index edbf3c5a7..79bb01caf 100644 --- a/www/api/magick-property.html +++ b/www/api/magick-property.html @@ -144,6 +144,9 @@ + diff --git a/www/api/magick-wand.html b/www/api/magick-wand.html index 44b559305..d5b91b710 100644 --- a/www/api/magick-wand.html +++ b/www/api/magick-wand.html @@ -144,9 +144,6 @@ - diff --git a/www/api/magick.html b/www/api/magick.html index d64f37595..0dcde319b 100644 --- a/www/api/magick.html +++ b/www/api/magick.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/monitor.html b/www/api/monitor.html index f78ba5932..5084cfd31 100644 --- a/www/api/monitor.html +++ b/www/api/monitor.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/montage.html b/www/api/montage.html index 27c69e01c..0b78e2d94 100644 --- a/www/api/montage.html +++ b/www/api/montage.html @@ -144,9 +144,6 @@ - diff --git a/www/api/pixel-iterator.html b/www/api/pixel-iterator.html index eec573501..b0e12448e 100644 --- a/www/api/pixel-iterator.html +++ b/www/api/pixel-iterator.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/pixel-wand.html b/www/api/pixel-wand.html index 110c12318..54e0601db 100644 --- a/www/api/pixel-wand.html +++ b/www/api/pixel-wand.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/profile.html b/www/api/profile.html index f74c56ef7..7a5755803 100644 --- a/www/api/profile.html +++ b/www/api/profile.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/property.html b/www/api/property.html index 748016d6b..84466d967 100644 --- a/www/api/property.html +++ b/www/api/property.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/quantize.html b/www/api/quantize.html index 485774aab..410c9d8ba 100644 --- a/www/api/quantize.html +++ b/www/api/quantize.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/registry.html b/www/api/registry.html index 37abfaf7c..80cd7d919 100644 --- a/www/api/registry.html +++ b/www/api/registry.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/resize.html b/www/api/resize.html index 5f9f788d0..fdd343b22 100644 --- a/www/api/resize.html +++ b/www/api/resize.html @@ -145,7 +145,7 @@ Druckerei Online @@ -178,9 +178,8 @@ _8c.html" target="source" name="AdaptiveResizeImage">AdaptiveResizeImageThe format of the AdaptiveResizeImage method is:

-  Image *AdaptiveResizeImage(const Image *image,
-    const size_t columns,const size_t rows,
-    ExceptionInfo *exception)
+  Image *AdaptiveResizeImage(const Image *image,const size_t columns,
+    const size_t rows,ExceptionInfo *exception)

A description of each parameter follows:

@@ -340,7 +339,7 @@ _8c.html" target="source" name="ResizeImage">ResizeImage

    Image filter to use.

blur
-

    the blur factor where > 1 is blurry, < 1 is sharp. Typically set this to 1.0.

+

    the blur factor where > 1 is blurry, < 1 is sharp. Typically set this to 1.0.

exception

    return any errors or warnings in this structure.

diff --git a/www/api/resource.html b/www/api/resource.html index 743d969ae..bcf9f1e7c 100644 --- a/www/api/resource.html +++ b/www/api/resource.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/segment.html b/www/api/segment.html index e35d32b2f..f405e27ae 100644 --- a/www/api/segment.html +++ b/www/api/segment.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/shear.html b/www/api/shear.html index 4ceaa4bbc..18c36d120 100644 --- a/www/api/shear.html +++ b/www/api/shear.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/signature.html b/www/api/signature.html index f0ebfbcb2..97d81e3fa 100644 --- a/www/api/signature.html +++ b/www/api/signature.html @@ -144,6 +144,9 @@ + diff --git a/www/api/statistic.html b/www/api/statistic.html index 87a423258..c1bb03d50 100644 --- a/www/api/statistic.html +++ b/www/api/statistic.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/stream.html b/www/api/stream.html index 06ea124ef..415cf48ae 100644 --- a/www/api/stream.html +++ b/www/api/stream.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/transform.html b/www/api/transform.html index 63b549613..a5f4e2075 100644 --- a/www/api/transform.html +++ b/www/api/transform.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/version.html b/www/api/version.html index f27e8bb57..fac876686 100644 --- a/www/api/version.html +++ b/www/api/version.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/wand-view.html b/www/api/wand-view.html index 7cc316bcc..fdcd0a27e 100644 --- a/www/api/wand-view.html +++ b/www/api/wand-view.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/architecture.html b/www/architecture.html index d6e20ac0e..01f06bfd6 100644 --- a/www/architecture.html +++ b/www/architecture.html @@ -254,7 +254,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.3-6 2010-08-08 Q16 http://www.imagemagick.org

+

$magick> identify -versionVersion: ImageMagick 6.6.3-7 2010-08-08 Q16 http://www.imagemagick.org

As you can see, the convenience of the pixel cache sometimes comes with a trade-off in storage (e.g. storing a 1-bit monochrome image as 16-bit 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.

diff --git a/www/binary-releases.html b/www/binary-releases.html index a5357030a..d94e962d7 100644 --- a/www/binary-releases.html +++ b/www/binary-releases.html @@ -189,16 +189,16 @@ - ImageMagick-6.6.3-6.i386.rpm - download - download + ImageMagick-6.6.3-7.i386.rpm + download + download CentOS 5.4 i386 RPM - ImageMagick-6.6.3-6.x86_64.rpm - download - download + ImageMagick-6.6.3-7.x86_64.rpm + download + download CentOS 5.4 x86_64 RPM @@ -228,7 +228,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.3-6.i386.rpm

+

$magick> rpm -Uvh ImageMagick-6.6.3-7.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

@@ -310,7 +310,7 @@

ImageMagick runs on all recent Windows releases except Windows 95 / 98. We recommend its use on an NT-based version of Windows (NT4, 2000, 2003, XP, or Vista). Starting with ImageMagick 5.5.7, older versions such as Windows 95 / 98 are not supported anymore. The amount of memory can be an important factor, especially if you intend to work on large images. A minimum of 256 MB of RAM is recommended, but the more RAM the better. Although ImageMagick runs fine on a single core computer, it automagically runs in parallel on dual and quad-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.3-6-Q16-windows-dll.exe.

+ImageMagick-6.6.3-7-Q16-windows-dll.exe.

@@ -322,44 +322,44 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + diff --git a/www/changelog.html b/www/changelog.html index a7ebb6e3f..e58d587bb 100644 --- a/www/changelog.html +++ b/www/changelog.html @@ -145,7 +145,7 @@ Druckerei Online @@ -167,7 +167,9 @@
-
    2010-08-13 6.6.3-6 Cristy <quetzlzacatenango@image...>
    +
      2010-08-15 6.6.3-6 Cristy <quetzlzacatenango@image...>
      +
    • Throw exception if image size differs for the compare program but the -subimage-search option is not specified.

      • +
      2010-08-13 6.6.3-6 Cristy <quetzlzacatenango@image...>
    • The AdobeRgb.tif TIFF image no longer faults under Windows (reference http://www.imagemagick.org/discourse-server/viewtopic.html?f=3&t=16838).
    • Add -subimage-search option to the compare utility.

      • 2010-08-12 6.6.3-5 Cristy <quetzlzacatenango@image...>
      diff --git a/www/cipher.html b/www/cipher.html index 06178efd9..e85023952 100644 --- a/www/cipher.html +++ b/www/cipher.html @@ -146,7 +146,7 @@ Druckerei Online
diff --git a/www/command-line-options.html b/www/command-line-options.html index 55083f549..5a747be52 100644 --- a/www/command-line-options.html +++ b/www/command-line-options.html @@ -149,7 +149,7 @@ Druckerei Online @@ -685,11 +685,22 @@ pixels which are outside the image proper are blurred into the final result.
ImageMagick-6.6.3-6-Q16-windows-dll.exedownloaddownloadImageMagick-6.6.3-7-Q16-windows-dll.exedownloaddownload Win32 dynamic at 16 bits-per-pixel
ImageMagick-6.6.3-6-Q16-windows-static.exedownloaddownloadImageMagick-6.6.3-7-Q16-windows-static.exedownloaddownload Win32 static at 16 bits-per-pixel
ImageMagick-6.6.3-6-Q16-windows-x64-dll.exedownloaddownloadImageMagick-6.6.3-7-Q16-windows-x64-dll.exedownloaddownload x64 dynamic at 16 bits-per-pixel
ImageMagick-6.6.3-6-Q16-windows-x64-static.exedownloaddownloadImageMagick-6.6.3-7-Q16-windows-x64-static.exedownloaddownload x64 static at 16 bits-per-pixel
ImageMagick-6.6.3-6-Q8-windows-dll.exedownloaddownloadImageMagick-6.6.3-7-Q8-windows-dll.exedownloaddownload Win32 dynamic at 8 bits-per-pixel
ImageMagick-6.6.3-6-Q8-windows-static.exedownloaddownloadImageMagick-6.6.3-7-Q8-windows-static.exedownloaddownload Win32 static at 8 bits-per-pixel
Surround the image with a border of color.
-

Set the width and height using the size portion of the gravity argument. See Image Geometry for complete details about the geometry argument. Offsets are ignored.

+

Set the width and height using the size portion of the +gravity argument. See Image Geometry for complete details about the geometry argument. Offsets are +ignored.

-

Set the border color by preceding with the -bordercolor setting.

+

Set the border color by preceding with the -bordercolor setting.

-

See also the -frame option, which has more functionality.

+

The -border operation is affected by the current -compose setting and assumes that this is using the default +'Over' composition method. It generates a image of the appropriate +size colors by the current -bordercolor before +overlaying the original image in the center of this net image. This means that +with the default compose method of 'Over' any transparent parts may +be replaced by the current -bordercolor setting.

+

See also the -frame option, which has more +functionality.

-bordercolor color

@@ -1210,7 +1221,12 @@ convert kittens.jpg -color-matrix \

This option places comments in a non-pixel portion of the image file. For a comment to be visibly written on the image itself, use the -annotate or -draw options.

-

Use this option to assign a specific comment to the image, when writing to an image format that supports comments. You can include the image filename, type, width, height, or other image attribute by embedding special format characters listed under the -format option. The comment is not drawn on the image, but is embedded in the image datastream via "Comment" tag or similar mechanism.

+

Use this option to assign a specific comment to the image, when writing to +an image format that supports comments. You can include the image filename, +type, width, height, or other image attribute by embedding special format +characters listed in the Format and Print Image +Properties. The comment is not drawn on the image, but is embedded in the +image datastream via "Comment" tag or similar mechanism.

For example,

@@ -1218,7 +1234,8 @@ convert kittens.jpg -color-matrix \ -comment "%m:%f %wx%h"

-

produces an image comment of MIFF:bird.miff 512x480 for an image titled bird.miff and whose width is 512 and height is 480.

+

produces an image comment of MIFF:bird.miff 512x480 for an image +titled bird.miff and whose width is 512 and height is 480.

If the first character of string is @, the image comment is read from a file titled by the remaining characters in the string. Comments in a file are literal; no embedded formatting characters are recognized.

@@ -1228,534 +1245,29 @@ convert kittens.jpg -color-matrix \
Set the type of image composition.
-

The description of composition uses abstract terminology in order to allow -the description to be more precise, while avoiding constant values which are -specific to a particular build configuration. Each image pixel is represented -by red, green, and blue levels (which are equal for a gray pixel). The -build-dependent value QuantumRange is the maximum integral -value which may be stored, per pixel, in the red, green, or blue channels of -the image. Each image pixel may also optionally (if the image matte channel is -enabled) have an associated level of opacity, ranging from opaque to -transparent, which may be used to determine the influence of the pixel -color when compositing the pixel with another image pixel. If the image matte -channel is disabled, then all pixels in the image are treated as opaque. The -color of an opaque pixel is fully visible while the color of a transparent -pixel color is entirely absent (pixel color is ignored).

- -

By definition, raster images have a rectangular shape. All image rows are of -equal length, as are all image columns. By treating the alpha channel as a -visual "mask" the rectangular image may be given a "shape" by treating the -alpha channel as a cookie-cutter for the image. This is done by setting the -pixels within the shape to be opaque, with pixels outside the shape set as -transparent. Pixels on the boundary of the shape may be between opaque and -transparent in order to provide antialiasing (visually smooth edges). The -description of the composition operators use this concept of image "shape" in -order to make the description of the operators easier to understand. While it -is convenient to describe the operators in terms of "shapes" they are by no -means limited to mask-style operations since they are based on continuous -floating-point mathematics rather than simple boolean operations.

- -

The following alpha blending (Duff-Porter) compose methods are available:

+

See Alpha Compositing for +a detailed discussion of alpha compositing.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
MethodDescription
clearBoth the color and the alpha of the destination are - cleared. Neither the source nor the destination are used (except for - destinations size and other meta-data which is always preserved.
srcThe source is copied to the destination. The destination - is not used as input, though it is cleared.
dstThe destination is left untouched. The source image is - completely ignored.
src-overThe source is composited over the destination. this is - the default alpha blending compose method, when neither the compose - setting is set, nor is set in the image meta-data.
dst-overThe destination is composited over the source and the - result replaces the destination.
src-inThe part of the source lying inside of the destination - replaces the destination.
dst-inThe part of the destination lying inside of the source - replaces the destination. Areas not overlaid are cleared.
src-outThe part of the source lying outside of the destination - replaces the destination.
dst-outThe part of the destination lying outside of the source - replaces the destination.
src-atopThe part of the source lying inside of the destination is - composited onto the destination.
dst-atopThe part of the destination lying inside of the source is - composited over the source and replaces the destination. Areas not - overlaid are cleared.
xorThe part of the source that lies outside of the - destination is combined with the part of the destination that lies - outside of the source. Source or Destination, but not both.
- -

Any of the 'Src-*' methods can also be specified without the 'Src-' part. -For example the defaul compose method can be specified as just 'Over'.

- - -

The following mathemathical composition methods are also available.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
MethodDescription
multiplyThe source is multiplied by the destination and replaces - the destination. The resultant color is always at least as dark as - either of the two constituent colors. Multiplying any color with black - produces black. Multiplying any color with white leaves the original - color unchanged.
screenThe source and destination are complemented and then - multiplied and then replace the destination. The resultant color is - always at least as light as either of the two constituent colors. - Screening any color with white produces white. Screening any color - with black leaves the original color unchanged.
plusThe source is added to the destination and replaces the - destination. This operator is useful for averaging or a controled - merger of two images, rather than a direct overlay.
addAs per 'plus' but transparency data is treated as matte - values. As such any transparent areas in either image remain - transparent.
minusSubtract the colors in the source image from the - destination image. When transparency is involved, opaque areas is - subtracted from any destination opaque areas.
subtractSubtract the colors in the source image from the - destination image. When transparency is involved transparent areas are - subtracted, so only the opaque areas in the source remain opaque in - the destination image.
differenceSubtracts the darker of the two constituent colors from - the lighter. Painting with white inverts the destination color. - Painting with black produces no change.
exclusionProduces an effect similar to that of 'difference', but - appears as lower contrast. Painting with white inverts the - destination color. Painting with black produces no change.
darkenSelects the darker of the destination and source colors. - The destination is replaced with the source when the source is darker, - otherwise it is left unchanged.
lightenSelects the lighter of the destination and source colors. - The destination is replaced with the source when the source is - lighter, otherwise it is left unchanged.
- -

Typically these use the default 'Over' alpha blending when transparencies -are also involved, except for 'Plus' which uses a 'plus' alpha blending. -This means the alpha channel is used to not only specify that all -non-transparent parts of the input image is visible, but also applied color -channel 'weighting' of the values. This also applied to the lighting -composition methods below.

- -

As of IM v6.6.1-6, if the special 'Sync' flag is not specified -(enabled by default) with the -channel setting, then -the above mathematical compositions will nolonger syncronise its actiosn with -the alpha channel. Instead the math composition will be applied on an -individual channel basis as defined by the -channel. -this includes the alpha channel.

- -

This special usage allows you to perform mathematics between images.

- - -

The following lighting composition methods are also available.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
MethodDescription
linear-dodgeThis is equivelent to 'Plus' in that the color channels - are simply added, however it does not 'Plus' the alpha channel, but - uses the normal 'Over' alpha blending, which transparencies are - involved. Produces a sort of additive multiply-like result. Added - ImageMagick version 6.5.4-3.
linear-burnAs 'Linear-Dodge', but also subtract one from the result. - Sort of a additive 'Screen' of the images. Added ImageMagick version - 6.5.4-3.
color-dodgeBrightens the destination color to reflect the source - color. Painting with black produces no change.
color-burnDarkens the destination color to reflect the source - color. Painting with white produces no change. Fixed in ImageMagick - version 6.5.4-3.
overlayMultiplies or screens the colors, dependent on the - destination color. Source colors overlay the destination whilst - preserving its highlights and shadows. The destination color is not - replaced, but is mixed with the source color to reflect the lightness - or darkness of the destination.
hard-lightMultiplies or screens the colors, dependent on the source - color value. If the source color is lighter than 0.5, the destination - is lightened as if it were screened. If the source color is darker - than 0.5, the destination is darkened, as if it were multiplied. The - degree of lightening or darkening is proportional to the difference - between the source color and 0.5. If it is equal to 0.5 the - destination is unchanged. Painting with pure black or white produces - black or white.
linear-lightLike 'Hard-Light' but using linear-dodge and linear-burn - instead. Increases contrast slightly with an impact on the - foreground's tonal values.
soft-lightDarkens or lightens the colors, dependent on the source - color value. If the source color is lighter than 0.5, the destination - is lightened. If the source color is darker than 0.5, the destination - is darkened, as if it were burned in. The degree of darkening or - lightening is proportional to the difference between the source color - and 0.5. If it is equal to 0.5, the destination is unchanged. Painting - with pure black or white produces a distinctly darker or lighter area, - but does not result in pure black or white. Fixed in ImageMagick - version 6.5.4-3.
pegtop-lightAlmost equivelent to 'Soft-Light', but using a - continuious mathematical formula rather than two conditionally - selected formulae. Added ImageMagick version 6.5.4-3.
vivid-lightA modified 'Linear-Light' designed to preserve very stong - primary and secondary colors in the image. Added ImageMagick version - 6.5.4-3.
pin-lightSimilar to 'Hard-Light', but using sharp linear shadings, - to similate the effects of a strong 'pinhole' light source. Added - ImageMagick version 6.5.4-3.
- - - -

Also included are these special purpose compose methods:

- - - - - - - - - - - - - - - - - - -
MethodDescription
copy-*Copy the specified channel (Red, Green, Blue, Cyan, - Magenta, Yellow, Black, or Opacity) in the source image to the - same channel in the destination image. If the channel specified - does not exist in the source image, (which can only happen for methods, - 'copy-opacity' or 'copy-black') then it is - assumed that the source image is a special grayscale channel image - of the values to be copied.
change-maskReplace any destination pixel that is the similar to the source images pixel (as defined by the current -fuzz factor), with transparency.
- -

On top of these composed methods are a few special ones that not only require -the two images that are being merged or overlaid, but have some extra numerical -arguments, which are tabled below.

- -

In the "composite" command these composition methods are -selected using special options with the arguments needed. They are usually, -but not always, the same name as the composte 'method' they use, and replaces -the normal use of the -compose setting in the -"composite" command. For example...

- -

$magick> composite ... -blend 50x50 ...

-

As of IM v6.5.3-4 the "convert" command can now also supply -these extra arguments to its -composite operator, -using the special -set attribute of 'option:compose:args'. This means you can now make use of -these special argumented -compose methods, those the -argument and the method both need to be set separatally. For example...

- -

$magick> convert ... -compose blend -set option:compose:args 50x50 -composite ...

-

The following is a table of these special 'argumented' compose methods, -with a brief summary of what they do. For more details see the equivalent -"composite" command option name.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
MethodDescription
dissolveArguments: - src_percent[xdst_percent] -
Equivalent to "composite" -dissolve -
Dissolve the 'source' image by the percentage given before overlaying - 'over' the 'destination' image. If src_percent is - greater than 100, it starts dissolving the main image so it will - become transparent at a value of '200'. If - both percentages are given, each image are dissolved to the - percentages given. -
blendArguments: - src_percent[xdst_percent] -
Equivalent to "composite" -blend -
Average the images together ('plus') according to the percentages - given and each pixels transparency. If only a single percentage value - is given it sets the weight of the composite or 'source' image, while - the background image is weighted by the exact opposite amount. That is - a -blend 30 merges 30% of the 'source' image with 70% of - the 'destination' image. Thus it is equivalent to -blend - 30x70. -
mathematicsArguments: A, B, C, D -
Not available in "composite" at this time. -
Merge the source and destination images according to the formula -
     A*Sc*Dc + B*Sc + C*Dc + D -
Can be used to generate a custom composition method that would - otherwise need to be implemented using the slow -fx - DIY image operator. Added to ImageMagick version 6.5.4-3. -
As of IM v6.6.1-6 this method will do per-channel math compositions - if the 'Sync' flag is removed from -channel, - just like all the other mathematical compostion methods above. -
modulateArguments: - brightness[xsaturation] -
Equivalent to "composite" -watermark -
Take a grayscale image (with alpha mask) and modify the destination - image's brightness according to watermark image's grayscale value and - the brightness percentage. The destinations - color saturation attribute is just direct modified by the saturation percentage, which defaults to 100 percent - (no color change). - -
displaceArguments: - X-scale[xY-scale][!][%] -
Equivalent to "composite" -displace -
With this option, the 'overlay' image, and optionally the 'mask' - image, is used as a relative displacement map, which is used to - displace the lookup of what part of the destination image is seen at - each point of the overlaid area. Much like the displacement map is a - 'lens' that distorts the original 'background' image behind it. -

- The X-scale is modilated by the 'red' channel of the overlay image - while the Y-scale is modulated by the green channel, (the mask image - if given is rolled into green channel of the overlay image. This - separation allows you to modulate the X and Y lookup displacement - separatally allowing you to di 2 dimentional displacements, rather - than 1 dimentional verctored displacements (using grayscale image). -

- If the overlay image contains transparency this is used as a mask - of the resulting image to remove 'invalid' pixels. -

- The '%' flag makes the displacement scale relative to the size of the - overlay image (100% = half width/height of image). Using '!' switches - percentage arguments to refer to the destination image size instead. -

- Special flags were added Added to ImageMagick version 6.5.3-5. -
distortArguments: - X-scale[xY-scale[+X-center+Y-center]][!][%] -
Not available in "composite" at this time. -
Exactly as per 'Displace' (above), but using absolute coordinates, - relative to the center of the overlay (or that given). Basically - allows you to generate absolute distortion maps where 'black' will - look up the left/top edge, and 'white' looks up the bottom/right - edge of the destination image, according to the scale given. -

- The '!' flag not only switches percentage scaling, to use the - destination image, but also the image the center offset of the lookup. - This means the overlay can lookup a completely different region of the - destination image. -

- Added to ImageMagick version 6.5.3-5. -
blurArguments: - Width[xHeight[+Angle]] -
Equivalent to "composite" - -blur -
A Variable Blur Mapping Composition method, where each pixel in the - overlaid region is replaced with an Elliptical Weighted Average (EWA), - with an ellipse (typically a circle) of the given sigma size, scaled - according to overlay (source image) grayscale mapping. -

- As per 'Displace' and 'Distort', the red channel will modulate the - width of the ellipse, while the green channel will modulate the height - of the ellipse. However at this time the ellipse angle is not - modulated though this may be a future posibility (perhaps with a - special flag to enable use of blur channel for this purpose). -

- Added to ImageMagick version 6.5.4-0. -
+

This setting effects image processing operators that merge two (or more) +images together in some way. This includes the operators, +-composite, +-layers composite, +-flatten, +-mosaic, +-layers merge, +-border, +-frame, +and -extent.

-

To print a complete list of all the available compose operators, use -list compose.

+

It is also one of the primary options for the "composite" +command.

-composite

-
Perform alpha composition on the current image sequence.
+
Perform alpha composition on two images and an optional mask

Take the first image 'destination' and overlay the second 'source' image according to the current -compose setting. The location @@ -2688,7 +2200,10 @@ draw complex curves, it is highly recommended either to use the path -draw 'image SrcOver 100,100 225,225 image.jpg'

-

You can use 0,0 for the image size, which means to use the actual dimensions found in the image header. Otherwise, it is scaled to the given dimensions. See -compose for a description of the composite operators.

+

You can use 0,0 for the image size, which means to use the actual +dimensions found in the image header. Otherwise, it is scaled to the given +dimensions. See Alpha Compositing for +a detailed discussion of alpha composition methods that are available.

Use text to annotate an image with text. Follow the text coordinates with a string. If the string has embedded spaces, enclose it in single or double quotes.

@@ -3191,9 +2706,31 @@ is a TrueType font file, ps:helvetica is PostScript font, and
Surround the image with a border or beveled frame.
-

The color of the border is specified with the -mattecolor command line option.

+

The color of the border is specified with the -mattecolor command line option.

+ +

See Image Geometry for complete details about the geometry argument. The size portion of the geometry argument indicates the amount of extra width and +height that is added to the dimensions of the image. If no offsets are given +in the geometry argument, then the border added is +a solid color. Offsets x and y, if present, specify that +the width and height of the border is partitioned to form an outer bevel of +thickness x pixels and an inner bevel of thickness +y pixels. Negative offsets make no sense as frame arguments. +

+ +

The -frame option is affected by the current -compose setting and assumes that this is using the default +'Over' composition method. It generates a image of the appripriate +size with the current -bordercolor setting, and then +draws the frame of four distinct colors close to the current -mattecolor. The original image is then overlaid onto +center of this image. This means that with the default compose method of +'Over' any transparent parts may be replaced by the current -bordercolor setting.

-

See Image Geometry for complete details about the geometry argument. The size portion of the geometry argument indicates the amount of extra width and height that is added to the dimensions of the image. If no offsets are given in the geometry argument, then the border added is a solid color. Offsets x and y, if present, specify that the width and height of the border is partitioned to form an outer bevel of thickness x pixels and an inner bevel of thickness y pixels. (Negative offsets make no sense here.) The -frame option is not affected by the -gravity option.

+

The image composition is not +affected by the -gravity option.

@@ -3688,7 +3225,9 @@ lookup for positions outside the boundaries of the image.

When saving an image to a PostScript file, any label assigned to an image is used as a header string to print above the postscript image.

-

You can include the image filename, type, width, height, or other image attribute by embedding special format character. See -format for details of the percent escape codes.

+

You can include the image filename, type, width, height, or other image +attribute by embedding special format character. See Format and Print Image +Properties for details of the percent escape codes.

For example,

diff --git a/www/command-line-processing.html b/www/command-line-processing.html index f8768d73e..386f69341 100644 --- a/www/command-line-processing.html +++ b/www/command-line-processing.html @@ -145,7 +145,7 @@ Druckerei Online
diff --git a/www/command-line-tools.html b/www/command-line-tools.html index 81d49f7e2..9f732c041 100644 --- a/www/command-line-tools.html +++ b/www/command-line-tools.html @@ -169,11 +169,11 @@

[animate • compare • composite • conjure • convert • display • identify • import • mogrify • montage • stream]

-

ImageMagick includes a number of command-line utilities for manipulating images. Most of you are probably accustomed to editing images one at a time with a graphical user interface (GUI) with such programs as gimp or Photoshop. However, a GUI is not always convenient. Suppose you want to process an image dynamically from a web script or you want to apply the same operations to many images or repeat a specific operation at different times to the same or different image. For these types of operations, the command-line image processing utility is appropriate.

+

ImageMagick includes a number of command-line utilities for manipulating images. Most of you are probably accustomed to editing images one at a time with a graphical user interface (GUI) with such programs as gimp or Photoshop. However, a GUI is not always convenient. Suppose you want to process an image dynamically from a web script or you want to apply the same operations to many images or repeat a specific operation at different times to the same or different image. For these types of operations, the command-line image processing utility is appropriate.

The ImageMagick command-line tools exit with a status of 0 if the command line arguments have a proper syntax and no problems are encountered. Expect a descriptive message and an exit status of 1 if any exception occurs such as improper syntax, a problem reading or writing an image, or any other problem that prevents the command from completing successfully.

-

In the paragraphs below, find a short description for each command-line tool. Click on the program name to get details about the program usage and a list of command-line options that alters how the program behaves. If you are just getting acquainted with ImageMagick, start with the convert program. Be sure to peruse Anthony Thyssen's tutorial on how to use ImageMagick utilities to convert, compose, or edit images from the command-line.

+

In the paragraphs below, find a short description for each command-line tool. Click on the program name to get details about the program usage and a list of command-line options that alters how the program behaves. If you are just getting acquainted with ImageMagick, start with the convert program. Be sure to peruse Anthony Thyssen's tutorial on how to use ImageMagick utilities to convert, compose, or edit images from the command-line.

animate

diff --git a/www/compose.html b/www/compose.html index e69de29bb..8bcba456a 100644 --- a/www/compose.html +++ b/www/compose.html @@ -0,0 +1,723 @@ + + + + + + + ImageMagick: Alpha Compositing + + + + + + + + + + + + + + + + + + + + + + + +
+ + [ImageMagick] + + [sponsor] + + + + +
+ +
+ +
+ About ImageMagick +
+
+
+ Binary Releases +
+
+ Unix +
+
+ Mac OS X +
+
+ Windows +
+
+
+ Command-line Tools +
+
+ Processing +
+
+ Options +
+
+ Usage +
+
+ Program Interfaces +
+
+ MagickWand +
+
+ MagickCore +
+
+ PerlMagick +
+
+ Magick++ +
+
+
+ Install from Source +
+
+ Unix +
+
+ Windows +
+
+ Resources +
+
+ Architecture +
+
+ Download +
+
+
+ Search +
+
+
+ Site Map +
+
+ Links +
+
+
+ Sponsors: + +
+ + + + + + + +
+
+
+ +
+ + +
+ +
+ + +

The description of composition uses abstract terminology in order to allow +the description to be more precise, while avoiding constant values which are +specific to a particular build configuration. Each image pixel is represented +by red, green, and blue levels (which are equal for a gray pixel). The +build-dependent value QuantumRange is the maximum integral +value which may be stored, per pixel, in the red, green, or blue channels of +the image. Each image pixel may also optionally (if the image matte channel is +enabled) have an associated level of opacity, ranging from opaque to +transparent, which may be used to determine the influence of the pixel +color when compositing the pixel with another image pixel. If the image matte +channel is disabled, then all pixels in the image are treated as opaque. The +color of an opaque pixel is fully visible while the color of a transparent +pixel color is entirely absent (pixel color is ignored).

+ +

By definition, raster images have a rectangular shape. All image rows are of +equal length, as are all image columns. By treating the alpha channel as a +visual "mask" the rectangular image may be given a "shape" by treating the +alpha channel as a cookie-cutter for the image. This is done by setting the +pixels within the shape to be opaque, with pixels outside the shape set as +transparent. Pixels on the boundary of the shape may be between opaque and +transparent in order to provide antialiasing (visually smooth edges). The +description of the composition operators use this concept of image "shape" in +order to make the description of the operators easier to understand. While it +is convenient to describe the operators in terms of "shapes" they are by no +means limited to mask-style operations since they are based on continuous +floating-point mathematics rather than simple boolean operations.

+ +

The following alpha blending (Duff-Porter) compose methods are available:

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
MethodDescription
clearBoth the color and the alpha of the destination are + cleared. Neither the source nor the destination are used (except for + destinations size and other meta-data which is always preserved.
srcThe source is copied to the destination. The destination + is not used as input, though it is cleared.
dstThe destination is left untouched. The source image is + completely ignored.
src-overThe source is composited over the destination. this is + the default alpha blending compose method, when neither the compose + setting is set, nor is set in the image meta-data.
dst-overThe destination is composited over the source and the + result replaces the destination.
src-inThe part of the source lying inside of the destination + replaces the destination.
dst-inThe part of the destination lying inside of the source + replaces the destination. Areas not overlaid are cleared.
src-outThe part of the source lying outside of the destination + replaces the destination.
dst-outThe part of the destination lying outside of the source + replaces the destination.
src-atopThe part of the source lying inside of the destination is + composited onto the destination.
dst-atopThe part of the destination lying inside of the source is + composited over the source and replaces the destination. Areas not + overlaid are cleared.
xorThe part of the source that lies outside of the + destination is combined with the part of the destination that lies + outside of the source. Source or Destination, but not both.
+ +

Any of the 'Src-*' methods can also be specified without the 'Src-' part. +For example the defaul compose method can be specified as just 'Over'.

+ + +

The following mathemathical composition methods are also available.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
MethodDescription
multiplyThe source is multiplied by the destination and replaces + the destination. The resultant color is always at least as dark as + either of the two constituent colors. Multiplying any color with black + produces black. Multiplying any color with white leaves the original + color unchanged.
screenThe source and destination are complemented and then + multiplied and then replace the destination. The resultant color is + always at least as light as either of the two constituent colors. + Screening any color with white produces white. Screening any color + with black leaves the original color unchanged.
plusThe source is added to the destination and replaces the + destination. This operator is useful for averaging or a controled + merger of two images, rather than a direct overlay.
addAs per 'plus' but transparency data is treated as matte + values. As such any transparent areas in either image remain + transparent.
minusSubtract the colors in the source image from the + destination image. When transparency is involved, opaque areas is + subtracted from any destination opaque areas.
subtractSubtract the colors in the source image from the + destination image. When transparency is involved transparent areas are + subtracted, so only the opaque areas in the source remain opaque in + the destination image.
differenceSubtracts the darker of the two constituent colors from + the lighter. Painting with white inverts the destination color. + Painting with black produces no change.
exclusionProduces an effect similar to that of 'difference', but + appears as lower contrast. Painting with white inverts the + destination color. Painting with black produces no change.
darkenSelects the darker of the destination and source colors. + The destination is replaced with the source when the source is darker, + otherwise it is left unchanged.
lightenSelects the lighter of the destination and source colors. + The destination is replaced with the source when the source is + lighter, otherwise it is left unchanged.
+ +

Typically these use the default 'Over' alpha blending when transparencies +are also involved, except for 'Plus' which uses a 'plus' alpha blending. +This means the alpha channel is used to not only specify that all +non-transparent parts of the input image is visible, but also applied color +channel 'weighting' of the values. This also applied to the lighting +composition methods below.

+ +

As of IM v6.6.1-6, if the special 'Sync' flag is not specified +(enabled by default) with the -channel setting, then +the above mathematical compositions will nolonger syncronise its actiosn with +the alpha channel. Instead the math composition will be applied on an +individual channel basis as defined by the -channel. +this includes the alpha channel.

+ +

This special usage allows you to perform mathematics between images.

+ + +

The following lighting composition methods are also available.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
MethodDescription
linear-dodgeThis is equivelent to 'Plus' in that the color channels + are simply added, however it does not 'Plus' the alpha channel, but + uses the normal 'Over' alpha blending, which transparencies are + involved. Produces a sort of additive multiply-like result. Added + ImageMagick version 6.5.4-3.
linear-burnAs 'Linear-Dodge', but also subtract one from the result. + Sort of a additive 'Screen' of the images. Added ImageMagick version + 6.5.4-3.
color-dodgeBrightens the destination color to reflect the source + color. Painting with black produces no change.
color-burnDarkens the destination color to reflect the source + color. Painting with white produces no change. Fixed in ImageMagick + version 6.5.4-3.
overlayMultiplies or screens the colors, dependent on the + destination color. Source colors overlay the destination whilst + preserving its highlights and shadows. The destination color is not + replaced, but is mixed with the source color to reflect the lightness + or darkness of the destination.
hard-lightMultiplies or screens the colors, dependent on the source + color value. If the source color is lighter than 0.5, the destination + is lightened as if it were screened. If the source color is darker + than 0.5, the destination is darkened, as if it were multiplied. The + degree of lightening or darkening is proportional to the difference + between the source color and 0.5. If it is equal to 0.5 the + destination is unchanged. Painting with pure black or white produces + black or white.
linear-lightLike 'Hard-Light' but using linear-dodge and linear-burn + instead. Increases contrast slightly with an impact on the + foreground's tonal values.
soft-lightDarkens or lightens the colors, dependent on the source + color value. If the source color is lighter than 0.5, the destination + is lightened. If the source color is darker than 0.5, the destination + is darkened, as if it were burned in. The degree of darkening or + lightening is proportional to the difference between the source color + and 0.5. If it is equal to 0.5, the destination is unchanged. Painting + with pure black or white produces a distinctly darker or lighter area, + but does not result in pure black or white. Fixed in ImageMagick + version 6.5.4-3.
pegtop-lightAlmost equivelent to 'Soft-Light', but using a + continuious mathematical formula rather than two conditionally + selected formulae. Added ImageMagick version 6.5.4-3.
vivid-lightA modified 'Linear-Light' designed to preserve very stong + primary and secondary colors in the image. Added ImageMagick version + 6.5.4-3.
pin-lightSimilar to 'Hard-Light', but using sharp linear shadings, + to similate the effects of a strong 'pinhole' light source. Added + ImageMagick version 6.5.4-3.
+ + + +

Also included are these special purpose compose methods:

+ + + + + + + + + + + + + + + + + + +
MethodDescription
copy-*Copy the specified channel (Red, Green, Blue, Cyan, + Magenta, Yellow, Black, or Opacity) in the source image to the + same channel in the destination image. If the channel specified + does not exist in the source image, (which can only happen for methods, + 'copy-opacity' or 'copy-black') then it is + assumed that the source image is a special grayscale channel image + of the values to be copied.
change-maskReplace any destination pixel that is the similar to the source images pixel (as defined by the current -fuzz factor), with transparency.
+ +

On top of these composed methods are a few special ones that not only require +the two images that are being merged or overlaid, but have some extra numerical +arguments, which are tabled below.

+ +

In the "composite" command these composition methods are +selected using special options with the arguments needed. They are usually, +but not always, the same name as the composte 'method' they use, and replaces +the normal use of the -compose setting in the +"composite" command. For example...

+ +

$magick> composite ... -blend 50x50 ...

+

As of IM v6.5.3-4 the "convert" command can now also supply +these extra arguments to its -composite operator, +using the special -set attribute of 'option:compose:args'. This means you can now make use of +these special argumented -compose methods, those the +argument and the method both need to be set separatally. For example...

+ +

$magick> convert ... -compose blend -set option:compose:args 50x50 -composite ...

+

The following is a table of these special 'argumented' compose methods, +with a brief summary of what they do. For more details see the equivalent +"composite" command option name.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
MethodDescription
dissolveArguments: + src_percent[xdst_percent] +
Equivalent to "composite" -dissolve +
Dissolve the 'source' image by the percentage given before overlaying + 'over' the 'destination' image. If src_percent is + greater than 100, it starts dissolving the main image so it will + become transparent at a value of '200'. If + both percentages are given, each image are dissolved to the + percentages given. +
blendArguments: + src_percent[xdst_percent] +
Equivalent to "composite" -blend +
Average the images together ('plus') according to the percentages + given and each pixels transparency. If only a single percentage value + is given it sets the weight of the composite or 'source' image, while + the background image is weighted by the exact opposite amount. That is + a -blend 30 merges 30% of the 'source' image with 70% of + the 'destination' image. Thus it is equivalent to -blend + 30x70. +
mathematicsArguments: A, B, C, D +
Not available in "composite" at this time. +
Merge the source and destination images according to the formula +
     A*Sc*Dc + B*Sc + C*Dc + D +
Can be used to generate a custom composition method that would + otherwise need to be implemented using the slow -fx + DIY image operator. Added to ImageMagick version 6.5.4-3. +
As of IM v6.6.1-6 this method will do per-channel math compositions + if the 'Sync' flag is removed from -channel, + just like all the other mathematical compostion methods above. +
modulateArguments: + brightness[xsaturation] +
Equivalent to "composite" -watermark +
Take a grayscale image (with alpha mask) and modify the destination + image's brightness according to watermark image's grayscale value and + the brightness percentage. The destinations + color saturation attribute is just direct modified by the saturation percentage, which defaults to 100 percent + (no color change). + +
displaceArguments: + X-scale[xY-scale][!][%] +
Equivalent to "composite" -displace +
With this option, the 'overlay' image, and optionally the 'mask' + image, is used as a relative displacement map, which is used to + displace the lookup of what part of the destination image is seen at + each point of the overlaid area. Much like the displacement map is a + 'lens' that distorts the original 'background' image behind it. +

+ The X-scale is modilated by the 'red' channel of the overlay image + while the Y-scale is modulated by the green channel, (the mask image + if given is rolled into green channel of the overlay image. This + separation allows you to modulate the X and Y lookup displacement + separatally allowing you to di 2 dimentional displacements, rather + than 1 dimentional verctored displacements (using grayscale image). +

+ If the overlay image contains transparency this is used as a mask + of the resulting image to remove 'invalid' pixels. +

+ The '%' flag makes the displacement scale relative to the size of the + overlay image (100% = half width/height of image). Using '!' switches + percentage arguments to refer to the destination image size instead. +

+ Special flags were added Added to ImageMagick version 6.5.3-5. +
distortArguments: + X-scale[xY-scale[+X-center+Y-center]][!][%] +
Not available in "composite" at this time. +
Exactly as per 'Displace' (above), but using absolute coordinates, + relative to the center of the overlay (or that given). Basically + allows you to generate absolute distortion maps where 'black' will + look up the left/top edge, and 'white' looks up the bottom/right + edge of the destination image, according to the scale given. +

+ The '!' flag not only switches percentage scaling, to use the + destination image, but also the image the center offset of the lookup. + This means the overlay can lookup a completely different region of the + destination image. +

+ Added to ImageMagick version 6.5.3-5. +
blurArguments: + Width[xHeight[+Angle]] +
Equivalent to "composite" + -blur +
A Variable Blur Mapping Composition method, where each pixel in the + overlaid region is replaced with an Elliptical Weighted Average (EWA), + with an ellipse (typically a circle) of the given sigma size, scaled + according to overlay (source image) grayscale mapping. +

+ As per 'Displace' and 'Distort', the red channel will modulate the + width of the ellipse, while the green channel will modulate the height + of the ellipse. However at this time the ellipse angle is not + modulated though this may be a future posibility (perhaps with a + special flag to enable use of blur channel for this purpose). +

+ Added to ImageMagick version 6.5.4-0. +
+ +

To print a complete list of all the available compose operators, use -list compose.

+ + + +
+ + +
+ © 1999-2010 ImageMagick Studio LLC + Contact the Wizards +
+
+ + + diff --git a/www/contact.html b/www/contact.html index e3c19cc29..3bc2df3f2 100644 --- a/www/contact.html +++ b/www/contact.html @@ -175,7 +175,7 @@

Contact the Development Team

-

Use this form to contact the ImageMagick Wizards for any of the issues listed below. You can expect a reply within 24-48 hours if your message is on topic and is a sponsorshp, license, or security issue. The bug and documentation issues are for reporting only. For any other issue, post your message to the discourse server.

+

Use this form to contact the ImageMagick Wizards for any of the issues listed below. You can expect a reply within 24-48 hours if your message is on topic and is a sponsorshp, license, or security issue. The bug and documentation issues are for reporting only. For any other issue, post your message to the discourse server.

Contact the Wizards

Enter this code, diff --git a/www/convert.html b/www/convert.html index 0de5f00f4..3dd4acb0e 100644 --- a/www/convert.html +++ b/www/convert.html @@ -146,7 +146,7 @@ Druckerei Online

diff --git a/www/download.html b/www/download.html index 582d06276..51cf82df8 100644 --- a/www/download.html +++ b/www/download.html @@ -169,7 +169,7 @@

ImageMagick source and binary distributions are available from a variety of FTP and Web mirrors around the world listed below. ImageMagick stable and development source releases are also available from Subversion. Before you download, you may want to review recent changes to the ImageMagick distribution.

-

The latest release of ImageMagick is version 6.6.3-6.

+

The latest release of ImageMagick is version 6.6.3-7.

Australia
ftp://mirror.aarnet.edu.au/pub/ImageMagick/
diff --git a/www/examples.html b/www/examples.html index 945349037..9302d8d20 100644 --- a/www/examples.html +++ b/www/examples.html @@ -145,7 +145,7 @@ Druckerei Online @@ -167,7 +167,7 @@
-

Here are a few examples of what you can do with an image using ImageMagick from the command line, a program interface, or script. You can generate this image yourself with this PerlMagick script, examples.pl.


+

Here are a few examples of what you can do with an image using ImageMagick from the command line, a program interface, or script. You can generate this image yourself with this PerlMagick script, examples.pl.


[ImageMagick] diff --git a/www/exception.html b/www/exception.html index 9775b75ac..a2e192eb9 100644 --- a/www/exception.html +++ b/www/exception.html @@ -145,7 +145,7 @@ Druckerei Online
diff --git a/www/formats.html b/www/formats.html index b0d0e8d48..eaf1c7be9 100644 --- a/www/formats.html +++ b/www/formats.html @@ -146,7 +146,7 @@ Druckerei Online diff --git a/www/fx.html b/www/fx.html index 0511f47be..d9d57f0f8 100644 --- a/www/fx.html +++ b/www/fx.html @@ -146,7 +146,7 @@ Druckerei Online diff --git a/www/high-dynamic-range.html b/www/high-dynamic-range.html index a033d28a5..1e0adae82 100644 --- a/www/high-dynamic-range.html +++ b/www/high-dynamic-range.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/history.html b/www/history.html index 24fb02abc..3c7a83057 100644 --- a/www/history.html +++ b/www/history.html @@ -145,7 +145,7 @@ Druckerei Online @@ -179,7 +179,7 @@ I swear by my life and my love of it that I will never live for the sake of anot

The next generation of ImageMagick, version 5, started when Bob Friesenhahn contacted me and suggested I improve the application programming interface so users could leverage the image-processing algorithms from other languages or scripts. Bob also wrote a C++ wrapper for ImageMagick called Magick++, and began contributing enhancements such as the module loader facility, automatic file identification, and test suites. In the mean-time, the project picked up a few other notable contributors: Glenn Randers-Pehrson, William Radcliffe, and Leonard Rosenthol. By now, ImageMagick was being utilized by tens of thousands of users, who reacted gruffly when a new release broke an existing API call or script. The other members of the group wanted to freeze the API and command line but I was not quite ready, since ImageMagick was not quite what I had envisioned it could be. Bob and the others created a fork of ImageMagick while I continued to develop ImageMagick.

-

I did not work alone for long. Anthony Thyssen contacted me about deficiencies in the ImageMagick command line programs. He pointed out that the command line was confusing when dealing with more than one image. He suggested an orderly, well-defined method for dealing with the command line, and this became ImageMagick version 6 (the current release). His efforts are detailed on his web pages, Examples of ImageMagick Usage. I highly recommend that you peruse his site. He has illustrated the power of ImageMagick in ways that even I did not know were possible.

+

I did not work alone for long. Anthony Thyssen contacted me about deficiencies in the ImageMagick command line programs. He pointed out that the command line was confusing when dealing with more than one image. He suggested an orderly, well-defined method for dealing with the command line, and this became ImageMagick version 6 (the current release). His efforts are detailed on his web pages, Examples of ImageMagick Usage. I highly recommend that you peruse his site. He has illustrated the power of ImageMagick in ways that even I did not know were possible.

Another notable contributer, Fred Weinhaus, makes available a plethora of command-line scripts that perform geometric transforms, blurs, sharpens, edging, noise removal, and color manipulations.

diff --git a/www/identify.html b/www/identify.html index d32b44ccf..47de9b6cf 100644 --- a/www/identify.html +++ b/www/identify.html @@ -145,7 +145,7 @@ Druckerei Online @@ -237,7 +237,7 @@ Tainted: False
Filesize: 3.97266kb
Number pixels: 3.14453kb
- Version: ImageMagick 6.6.3-6 2010-08-08 Q16 http://www.imagemagick.org

+ Version: ImageMagick 6.6.3-7 2010-08-08 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 d757f431b..33039c6e8 100644 --- a/www/import.html +++ b/www/import.html @@ -146,7 +146,7 @@ Druckerei Online diff --git a/www/index.html b/www/index.html index ff97a7183..cd230d6de 100644 --- a/www/index.html +++ b/www/index.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/license.html b/www/license.html index bcea59054..8a82b93e5 100644 --- a/www/license.html +++ b/www/license.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/magick-core.html b/www/magick-core.html index 95ba0e506..8fed1ecc7 100644 --- a/www/magick-core.html +++ b/www/magick-core.html @@ -146,7 +146,7 @@ Druckerei Online diff --git a/www/magick-vector-graphics.html b/www/magick-vector-graphics.html index 89dc29939..fc42e109c 100644 --- a/www/magick-vector-graphics.html +++ b/www/magick-vector-graphics.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/magick-wand.html b/www/magick-wand.html index 1fa4302ac..6abd6f83e 100644 --- a/www/magick-wand.html +++ b/www/magick-wand.html @@ -146,7 +146,7 @@ Druckerei Online diff --git a/www/miff.html b/www/miff.html index dbae239f3..4a9ae10c8 100644 --- a/www/miff.html +++ b/www/miff.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/mirrors.html b/www/mirrors.html index 95ea9988d..607e5257e 100644 --- a/www/mirrors.html +++ b/www/mirrors.html @@ -145,7 +145,7 @@ Druckerei Online @@ -170,9 +170,9 @@

The ImageMagick web site is available from a variety of web mirrors around the world listed below.

France
-
http://imagemagick.europnews.de/

+
http://imagemagick.europnews.de/

Unites States
-
http://www.imagemagick.org/
+
http://www.imagemagick.org/

If you want to add a new web-site mirror, please contact us.

diff --git a/www/mogrify.html b/www/mogrify.html index ebfa51bcd..9a0fd86a0 100644 --- a/www/mogrify.html +++ b/www/mogrify.html @@ -146,7 +146,7 @@ Druckerei Online diff --git a/www/montage.html b/www/montage.html index 58b8497f0..511f33f0b 100644 --- a/www/montage.html +++ b/www/montage.html @@ -146,7 +146,7 @@ Druckerei Online diff --git a/www/motion-picture.html b/www/motion-picture.html index 81ea871be..9f12a5ae9 100644 --- a/www/motion-picture.html +++ b/www/motion-picture.html @@ -146,7 +146,7 @@ Druckerei Online diff --git a/www/quantize.html b/www/quantize.html index 9e4dc3360..f363b45e5 100644 --- a/www/quantize.html +++ b/www/quantize.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/resources.html b/www/resources.html index 1b6341aa1..f767270ec 100644 --- a/www/resources.html +++ b/www/resources.html @@ -144,6 +144,9 @@ + diff --git a/www/sitemap.html b/www/sitemap.html index 989e88ad6..4f71a7325 100644 --- a/www/sitemap.html +++ b/www/sitemap.html @@ -145,7 +145,7 @@ Druckerei Online @@ -178,7 +178,7 @@
Introduction: convert, edit, and compose images from the command-line or program interface.
Examples of ImageMagick usage: a few examples that show what you can do with an image using ImageMagick.
-
Anthony Thyssen's examples of ImageMagick usage: a comprehensive tutorial of using ImageMagick from the command line.
+
Anthony Thyssen's examples of ImageMagick usage: a comprehensive tutorial of using ImageMagick from the command line.
Color names: how to specify a color name, a hex color, or a numerical RGB, RGBA, HSL, HSLA, CMYK, or CMYKA color.
Resources: ImageMagick depends on external resources including configuration files, loadable modules, fonts, and environment variables.
Architecture: get to know more about the software and algorithms behind ImageMagick.
@@ -192,12 +192,12 @@
Download ImageMagick: ImageMagick source and binary distributions are available from a variety of FTP and Web mirrors.
@@ -236,7 +236,7 @@
Command line processing: the anatomy of the command line.
Command line options: annotated list of all options that can appear on the command-line.
Fx: apply a mathematical expression to an image or image channels.
-
Fred's ImageMagick Scripts: a plethora of command-line scripts that perform geometric transforms, blurs, sharpens, edging, noise removal, and color manipulations.
+
Fred's ImageMagick Scripts: a plethora of command-line scripts that perform geometric transforms, blurs, sharpens, edging, noise removal, and color manipulations.
@@ -246,21 +246,21 @@
Program interfaces: application programming interfaces.
    -
    ChMagick: is a Ch an embeddable MagickCore C/C++ interpreter for cross-platform scripting.
    -
    CL-Magick: provides a Common Lisp interface to the ImageMagick library.
    -
    G2F: implements an Ada 95 binding to a subset of the low-level MagickCore library.
    -
    Magick++: provides an object-oriented C++ interface to ImageMagick.
    -
    IMagick: is a native PHP extension to create and modify images using the ImageMagick API.
    -
    JMagick: provides an object-oriented Java interface to ImageMagick.
    +
    ChMagick: is a Ch an embeddable MagickCore C/C++ interpreter for cross-platform scripting.
    +
    CL-Magick: provides a Common Lisp interface to the ImageMagick library.
    +
    G2F: implements an Ada 95 binding to a subset of the low-level MagickCore library.
    +
    Magick++: provides an object-oriented C++ interface to ImageMagick.
    +
    IMagick: is a native PHP extension to create and modify images using the ImageMagick API.
    +
    JMagick: provides an object-oriented Java interface to ImageMagick.
    MagickCore: C API, recommended for wizard-level developers.
    MagickWand: convert, compose, and edit images from the C language.
    -
    MagickWand for PHP: a native PHP-extension to the ImageMagick MagickWand API.
    -
    nMagick: is a port of the ImageMagick library to the haXe and Neko platforms.
    -
    PascalMagick: a Pascal binding for the MagickWand API and also the low-level MagickCore library.
    +
    MagickWand for PHP: a native PHP-extension to the ImageMagick MagickWand API.
    +
    nMagick: is a port of the ImageMagick library to the haXe and Neko platforms.
    +
    PascalMagick: a Pascal binding for the MagickWand API and also the low-level MagickCore library.
    PerlMagick: convert, compose, and edit images from the Perl language.
    -
    PythonMagick: an object-oriented Python interface to ImageMagick.
    -
    RMagick: is an interface between the Ruby programming language and ImageMagick.
    -
    TclMagick: a native Tcl-extension to the ImageMagick MagickWand API.
    +
    PythonMagick: an object-oriented Python interface to ImageMagick.
    +
    RMagick: is an interface between the Ruby programming language and ImageMagick.
    +
    TclMagick: a native Tcl-extension to the ImageMagick MagickWand API.
@@ -280,8 +280,8 @@
-
Definitive Guide to ImageMagick: this book explains ImageMagick in a practical, learn-by-example fashion.
-
ImageMagick Tricks: this book is packed with examples of photo manipulations, logo creation, animations, and complete web projects.
+
Definitive Guide to ImageMagick: this book explains ImageMagick in a practical, learn-by-example fashion.
+
ImageMagick Tricks: this book is packed with examples of photo manipulations, logo creation, animations, and complete web projects.
Discourse server: get help from fellow ImageMagick users and developers, post to these forums.
Contact the Wizards: for bug reports (only if you do not want to sign up to the discourse server), a source or documentation patch, a security or license issue, or if you want to be a sponsor of the ImageMagick project.
@@ -291,7 +291,7 @@
-
Report bugs and vulnerabilities: our highest priority is to fix security defects and bug reports, usually within 48 hours of your report. The bug discourse server requires that you register. If you do not want to register, you can contact the ImageMagick developers with a convenient web form.
+
Report bugs and vulnerabilities: our highest priority is to fix security defects and bug reports, usually within 48 hours of your report. The bug discourse server requires that you register. If you do not want to register, you can contact the ImageMagick developers with a convenient web form.
Sponsor ImageMagick: contribute bug fixes, enhancements, hardware, funds, etc. to ensure the ImageMagick project thrives.
ImageMagick t-shirt: donate $25 USD and we acknowledge your gift with a logoed t-shirt.
@@ -317,8 +317,8 @@

Technology Sandbox

-
Fourier Transform Processing With ImageMagick
-
ImageMagick v6 Examples -- Fourier Transforms
+
Fourier Transform Processing With ImageMagick
+
ImageMagick v6 Examples -- Fourier Transforms
diff --git a/www/sponsors.html b/www/sponsors.html index 634fc58bb..1eb7ae196 100644 --- a/www/sponsors.html +++ b/www/sponsors.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/subversion.html b/www/subversion.html index c4a49283e..1a3ffeaf3 100644 --- a/www/subversion.html +++ b/www/subversion.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/t-shirt.html b/www/t-shirt.html index 7398c77e5..081004205 100644 --- a/www/t-shirt.html +++ b/www/t-shirt.html @@ -145,7 +145,7 @@ Druckerei Online -- 2.40.0