From abd337dc352df2e07d62e0f1456b168db55bca6a Mon Sep 17 00:00:00 2001 From: cristy Date: Tue, 17 Aug 2010 01:06:59 +0000 Subject: [PATCH] --- ImageMagick.spec | 2 +- config/configure.xml | 2 +- index.html | 2 +- libtool | 2 +- magick/version.h | 2 +- version.sh | 2 +- www/ImageMagickObject.html | 2 +- www/advanced-unix-installation.html | 2 +- www/advanced-windows-installation.html | 3 - www/animate.html | 3 - www/api.html | 42 +++++----- www/api/animate.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/color.html | 2 +- www/api/compare.html | 2 +- www/api/constitute.html | 2 +- www/api/decorate.html | 3 - www/api/deprecate.html | 3 - www/api/distort.html | 2 +- www/api/draw.html | 2 +- www/api/drawing-wand.html | 2 +- www/api/effect.html | 2 +- www/api/exception.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-deprecate.html | 2 +- www/api/magick-image.html | 2 +- www/api/magick-property.html | 2 +- www/api/magick-wand.html | 3 + www/api/memory.html | 2 +- www/api/module.html | 2 +- www/api/monitor.html | 2 +- www/api/montage.html | 3 + 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/signature.html | 2 +- www/api/statistic.html | 2 +- www/api/stream.html | 2 +- www/api/transform.html | 2 +- www/architecture.html | 2 +- www/command-line-options.html | 2 +- www/command-line-processing.html | 2 +- www/command-line-tools.html | 6 +- www/compose.html | 108 +++++++++++++++++-------- www/composite.html | 3 - www/conjure.html | 2 +- www/contact.html | 4 +- www/download.html | 2 +- www/escape.html | 2 +- www/examples.html | 4 +- www/fx.html | 2 +- www/high-dynamic-range.html | 2 +- www/history.html | 4 +- www/index.html | 2 +- www/install-source.html | 2 +- www/jp2.html | 2 +- www/license.html | 2 +- www/links.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/montage.html | 2 +- www/motion-picture.html | 2 +- www/quantize.html | 2 +- www/resources.html | 2 +- www/search.html | 3 - www/sitemap.html | 50 ++++++------ www/stream.html | 2 +- 85 files changed, 209 insertions(+), 177 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 4d081d7f4..df9c4e6f8 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -8,7 +8,7 @@ - + diff --git a/index.html b/index.html index 3c3a367c1..0ab6c3919 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 33b4ea3d4..a29b13d8f 100644 --- a/magick/version.h +++ b/magick/version.h @@ -30,7 +30,7 @@ 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-16" 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 60fa22191..f114f97f3 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 0dec335e2..1e4f3ff43 100644 --- a/www/advanced-unix-installation.html +++ b/www/advanced-unix-installation.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/advanced-windows-installation.html b/www/advanced-windows-installation.html index 1c6269cbb..037486987 100644 --- a/www/advanced-windows-installation.html +++ b/www/advanced-windows-installation.html @@ -144,9 +144,6 @@ - diff --git a/www/animate.html b/www/animate.html index fa1eb13ba..e1fc6940c 100644 --- a/www/animate.html +++ b/www/animate.html @@ -145,9 +145,6 @@ - diff --git a/www/api.html b/www/api.html index 2dcc6e05f..676a9ad3f 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 d0a93779c..bd4d1160e 100644 --- a/www/api/animate.html +++ b/www/api/animate.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/attribute.html b/www/api/attribute.html index d8b509f5b..acf714c1c 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 a75ab02ad..260721c95 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 0eab958f7..87d142791 100644 --- a/www/api/cache-view.html +++ b/www/api/cache-view.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/cache.html b/www/api/cache.html index 133b7771f..0ee623548 100644 --- a/www/api/cache.html +++ b/www/api/cache.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/cipher.html b/www/api/cipher.html index 001d42796..bc9cfa9a9 100644 --- a/www/api/cipher.html +++ b/www/api/cipher.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/color.html b/www/api/color.html index c0043bd11..5b456176f 100644 --- a/www/api/color.html +++ b/www/api/color.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/compare.html b/www/api/compare.html index a61ba72f9..583966d8a 100644 --- a/www/api/compare.html +++ b/www/api/compare.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/constitute.html b/www/api/constitute.html index adfa74307..acd5caefe 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 81cab3b41..aeec98118 100644 --- a/www/api/decorate.html +++ b/www/api/decorate.html @@ -144,9 +144,6 @@ - diff --git a/www/api/deprecate.html b/www/api/deprecate.html index dbf917069..fd245826d 100644 --- a/www/api/deprecate.html +++ b/www/api/deprecate.html @@ -144,9 +144,6 @@ - diff --git a/www/api/distort.html b/www/api/distort.html index 9cc187b3b..dabd735eb 100644 --- a/www/api/distort.html +++ b/www/api/distort.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/draw.html b/www/api/draw.html index 95f0d421b..0dcc6088d 100644 --- a/www/api/draw.html +++ b/www/api/draw.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/drawing-wand.html b/www/api/drawing-wand.html index 7296bded0..4b6c9fd79 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 1d164e1ae..7e22fac4a 100644 --- a/www/api/effect.html +++ b/www/api/effect.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/exception.html b/www/api/exception.html index e03d2fd11..1b0c089fa 100644 --- a/www/api/exception.html +++ b/www/api/exception.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/fx.html b/www/api/fx.html index b00239def..bc53adf5f 100644 --- a/www/api/fx.html +++ b/www/api/fx.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/histogram.html b/www/api/histogram.html index c4907f312..602e51de7 100644 --- a/www/api/histogram.html +++ b/www/api/histogram.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/image-view.html b/www/api/image-view.html index f1a18d517..a14985369 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 909cdce97..d9db7bb97 100644 --- a/www/api/image.html +++ b/www/api/image.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/layer.html b/www/api/layer.html index af53bfd61..7eb4ff21b 100644 --- a/www/api/layer.html +++ b/www/api/layer.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/list.html b/www/api/list.html index adb4891d9..13f9204fb 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 5a7e85f64..3876bfb4e 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-image.html b/www/api/magick-image.html index a062d1fa4..b45845c1f 100644 --- a/www/api/magick-image.html +++ b/www/api/magick-image.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/magick-property.html b/www/api/magick-property.html index 79bb01caf..fde905600 100644 --- a/www/api/magick-property.html +++ b/www/api/magick-property.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/magick-wand.html b/www/api/magick-wand.html index d5b91b710..44b559305 100644 --- a/www/api/magick-wand.html +++ b/www/api/magick-wand.html @@ -144,6 +144,9 @@ + diff --git a/www/api/memory.html b/www/api/memory.html index 70b9d1583..73dde1447 100644 --- a/www/api/memory.html +++ b/www/api/memory.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/module.html b/www/api/module.html index 2ef669162..c8c57bb03 100644 --- a/www/api/module.html +++ b/www/api/module.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/monitor.html b/www/api/monitor.html index 5084cfd31..181dd7c9c 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 0b78e2d94..27c69e01c 100644 --- a/www/api/montage.html +++ b/www/api/montage.html @@ -144,6 +144,9 @@ + diff --git a/www/api/paint.html b/www/api/paint.html index f2f37dc17..b39d1e851 100644 --- a/www/api/paint.html +++ b/www/api/paint.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/pixel-iterator.html b/www/api/pixel-iterator.html index b0e12448e..eec573501 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 54e0601db..110c12318 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 7a5755803..1e79ce9de 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 84466d967..748016d6b 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 410c9d8ba..485774aab 100644 --- a/www/api/quantize.html +++ b/www/api/quantize.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/resize.html b/www/api/resize.html index fdd343b22..097949373 100644 --- a/www/api/resize.html +++ b/www/api/resize.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/resource.html b/www/api/resource.html index bcf9f1e7c..743d502cf 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 f405e27ae..0a360ae39 100644 --- a/www/api/segment.html +++ b/www/api/segment.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/signature.html b/www/api/signature.html index 97d81e3fa..45a93332a 100644 --- a/www/api/signature.html +++ b/www/api/signature.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/api/statistic.html b/www/api/statistic.html index c1bb03d50..4887252ff 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 415cf48ae..06ea124ef 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 a5f4e2075..2dea94532 100644 --- a/www/api/transform.html +++ b/www/api/transform.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/architecture.html b/www/architecture.html index 01f06bfd6..72c818fa0 100644 --- a/www/architecture.html +++ b/www/architecture.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/command-line-options.html b/www/command-line-options.html index 5a747be52..9759d94f2 100644 --- a/www/command-line-options.html +++ b/www/command-line-options.html @@ -149,7 +149,7 @@ Druckerei Online diff --git a/www/command-line-processing.html b/www/command-line-processing.html index 386f69341..f8768d73e 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 9f732c041..07a0073a7 100644 --- a/www/command-line-tools.html +++ b/www/command-line-tools.html @@ -145,7 +145,7 @@ Druckerei Online @@ -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 8bcba456a..d9b5f85d7 100644 --- a/www/compose.html +++ b/www/compose.html @@ -169,6 +169,12 @@
+

This page descibed the Image composition methods that is used to define how +two images should be merged together in various image operations. For the +Command Line API it is typically set using the -compose setting option.

+ +

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 @@ -285,8 +291,21 @@ floating-point mathematics rather than simple boolean operations.

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'.

+For example the default compose method can be specified as just 'Over'.

+ +

Many of these compose methods will clear the destination image which was +not overlaid by the source image. This is to be expected as part of that +specific composition methods defintion. Seeing the You can disable this by +setting the special -set +'option:compose:outside-overlay' to 'false' will turn off this behaviour.

+

On top of the above 12 Duff-Porter Alpha Composition methods, one special +related method 'Copy' has been provided. This is equivelent to the +'Src' with the special -set option 'option:compose:outside-overlay' set to +'false>'.

+ +

The following mathemathical composition methods are also available.

@@ -376,21 +395,28 @@ For example the defaul compose method can be specified as just 'Over'.

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.

+are also involved, except for 'Plus' which uses a 'plus' alpha blending. This +means the alpha channel of both images will only be used to ensure that any +visible input remains visible even in parts not overlaid. It also means that +any values are weighted by the alpha channel of the input and output images. +This 'Over' alpha blending is 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.

+(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 true mathematics of the image channels, without alpha +compostion effects, becomming involved.

-

This special usage allows you to perform mathematics between images.

+

This special flag is not applied to the lighting composition methods (see +below) even though they are closely related to mathematical composition +methods.

+

The following lighting composition methods are also available.

@@ -497,6 +523,7 @@ this includes the alpha channel.

+

Also included are these special purpose compose methods:

@@ -507,6 +534,13 @@ this includes the alpha channel.

Description + + copy + This is equivelent to the Duff-Porter composition method + 'Src,' but withotu clearing the parts of the destination + image that is not overlaid. + + copy-* Copy the specified channel (Red, Green, Blue, Cyan, @@ -520,11 +554,16 @@ this includes the alpha channel.

change-mask - Replace any destination pixel that is the similar to the source images pixel (as defined by the current -fuzz factor), with transparency. + Replace 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.

@@ -532,17 +571,20 @@ 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...

+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 ...

+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.

@@ -558,7 +600,7 @@ with a brief summary of what they do. For more details see the equivalent dissolve Arguments: src_percent[xdst_percent] -
Equivalent to "composite" -dissolve +
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 @@ -572,7 +614,8 @@ with a brief summary of what they do. For more details see the equivalent blend Arguments: src_percent[xdst_percent] -
Equivalent to "composite" -blend +
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 @@ -590,11 +633,13 @@ with a brief summary of what they do. For more details see the equivalent
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. + 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. + if the 'Sync' flag is removed from -channel, just like all + the other mathematical compostion methods above. @@ -602,7 +647,7 @@ with a brief summary of what they do. For more details see the equivalent modulate Arguments: brightness[xsaturation] -
Equivalent to "composite" -watermark +
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 @@ -617,7 +662,7 @@ with a brief summary of what they do. For more details see the equivalent displace Arguments: X-scale[xY-scale][!][%] -
Equivalent to "composite" -displace +
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 @@ -668,8 +713,7 @@ with a brief summary of what they do. For more details see the equivalent Arguments: Width[xHeight[+Angle]] -
Equivalent to "composite" - -blur +
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 @@ -689,7 +733,7 @@ with a brief summary of what they do. For more details see the equivalent

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

+href="../www/command-line-options.html#list">-list compose.

diff --git a/www/composite.html b/www/composite.html index fc9612082..c3dae2545 100644 --- a/www/composite.html +++ b/www/composite.html @@ -145,9 +145,6 @@ -
diff --git a/www/conjure.html b/www/conjure.html index 1853796a2..c3e1ad662 100644 --- a/www/conjure.html +++ b/www/conjure.html @@ -146,7 +146,7 @@ Druckerei Online diff --git a/www/contact.html b/www/contact.html index 3bc2df3f2..775cb5cf5 100644 --- a/www/contact.html +++ b/www/contact.html @@ -145,7 +145,7 @@ Druckerei Online @@ -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/download.html b/www/download.html index 51cf82df8..9eb87888b 100644 --- a/www/download.html +++ b/www/download.html @@ -145,7 +145,7 @@ Druckerei Online

diff --git a/www/escape.html b/www/escape.html index 5cbfbff2d..1a55e7b4e 100644 --- a/www/escape.html +++ b/www/escape.html @@ -146,7 +146,7 @@ Druckerei Online diff --git a/www/examples.html b/www/examples.html index 9302d8d20..2cf1b57d9 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/fx.html b/www/fx.html index d9d57f0f8..0511f47be 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 1e0adae82..a033d28a5 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 3c7a83057..147e2e9ec 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/index.html b/www/index.html index cd230d6de..3b0bfe3fc 100644 --- a/www/index.html +++ b/www/index.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/install-source.html b/www/install-source.html index 51d5b55a1..e7bb083ac 100644 --- a/www/install-source.html +++ b/www/install-source.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/jp2.html b/www/jp2.html index 75a1f6e4c..4c70babe0 100644 --- a/www/jp2.html +++ b/www/jp2.html @@ -146,7 +146,7 @@ Druckerei Online diff --git a/www/license.html b/www/license.html index 8a82b93e5..bcea59054 100644 --- a/www/license.html +++ b/www/license.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/links.html b/www/links.html index 59ebb2efe..1c47d261b 100644 --- a/www/links.html +++ b/www/links.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/magick-core.html b/www/magick-core.html index 8fed1ecc7..95ba0e506 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 fc42e109c..89dc29939 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 6abd6f83e..d222f7496 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 4a9ae10c8..a76757b43 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 607e5257e..3e755cdc8 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/montage.html b/www/montage.html index 511f33f0b..58b8497f0 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 9f12a5ae9..81ea871be 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 f363b45e5..e3ea1218c 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 f767270ec..37a4babe4 100644 --- a/www/resources.html +++ b/www/resources.html @@ -145,7 +145,7 @@ Druckerei Online diff --git a/www/search.html b/www/search.html index 007f8a128..278b32e4f 100644 --- a/www/search.html +++ b/www/search.html @@ -144,9 +144,6 @@ - diff --git a/www/sitemap.html b/www/sitemap.html index 4f71a7325..7d6264bfe 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/stream.html b/www/stream.html index 23ab454c6..83b48d625 100644 --- a/www/stream.html +++ b/www/stream.html @@ -146,7 +146,7 @@ Druckerei Online -- 2.40.0