From ae6203dadd53ccb3e1a95fc223aeb9ad5ab336b0 Mon Sep 17 00:00:00 2001 From: cristy Date: Mon, 9 Aug 2010 01:12:14 +0000 Subject: [PATCH] --- ChangeLog | 1 + index.html | 2 +- magick/option.c | 2 + utilities/compare.1.in | 1 + wand/compare.c | 89 ++++++++++++++---------- www/advanced-windows-installation.html | 2 +- www/api.html | 40 +++++------ www/api/animate.html | 2 +- www/api/annotate.html | 3 - www/api/attribute.html | 2 +- www/api/blob.html | 2 +- www/api/color.html | 2 +- www/api/colormap.html | 2 +- www/api/compare.html | 2 +- www/api/composite.html | 2 +- www/api/decorate.html | 2 +- www/api/distort.html | 2 +- www/api/draw.html | 2 +- www/api/drawing-wand.html | 2 +- www/api/effect.html | 2 +- www/api/enhance.html | 2 +- www/api/exception.html | 3 + www/api/feature.html | 3 + www/api/fx.html | 2 +- www/api/histogram.html | 2 +- www/api/image.html | 2 +- www/api/list.html | 3 + www/api/magick-property.html | 2 +- www/api/magick-wand.html | 2 +- www/api/magick.html | 2 +- www/api/memory.html | 2 +- www/api/module.html | 3 - www/api/monitor.html | 3 - www/api/montage.html | 2 +- www/api/morphology.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/quantize.html | 2 +- www/api/resource.html | 2 +- www/api/segment.html | 2 +- www/api/shear.html | 2 +- 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/changelog.html | 10 ++- www/cipher.html | 2 +- www/command-line-options.html | 11 +-- www/command-line-processing.html | 2 +- www/command-line-tools.html | 6 +- www/compare.html | 5 ++ www/composite.html | 3 + www/conjure.html | 2 +- www/contact.html | 2 +- www/display.html | 2 +- www/examples.html | 5 +- www/fx.html | 2 +- www/history.html | 4 +- www/identify.html | 2 +- www/index.html | 2 +- www/jp2.html | 2 +- www/license.html | 2 +- www/links.html | 96 +++++++++++++------------- www/magick-vector-graphics.html | 2 +- www/magick-wand.html | 2 +- www/miff.html | 2 +- www/mirrors.html | 4 +- www/mogrify.html | 2 +- www/motion-picture.html | 2 +- www/perl-magick.html | 2 +- www/quantize.html | 3 + www/resources.html | 2 +- www/search.html | 3 + www/sitemap.html | 51 +++++++------- www/sponsors.html | 2 +- www/stream.html | 2 +- www/subversion.html | 2 +- 81 files changed, 256 insertions(+), 213 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4dc9c40fa..08aa29420 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ * Return proper standard deviation for combined channels (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=16786). * Handle transparency properly for the PSD image format. + * Add -subimage-search option to the compare utility. 2010-08-05 6.6.3-3 Glenn Randers-Pehrson * Properly map PNG intent to image->rendering_intent diff --git a/index.html b/index.html index 69b40e383..a5cf8c077 100644 --- a/index.html +++ b/index.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/magick/option.c b/magick/option.c index a1b7db2d1..731265341 100644 --- a/magick/option.c +++ b/magick/option.c @@ -608,6 +608,8 @@ static const OptionInfo { "-strokewidth", 1L, MagickFalse }, { "+style", 0L, MagickFalse }, { "-style", 1L, MagickFalse }, + { "+subimage-search", 0L, MagickFalse }, + { "-subimage-search", 0L, MagickFalse }, { "+swap", 0L, MagickFalse }, { "-swap", 1L, MagickFalse }, { "+swirl", 0L, MagickFalse }, diff --git a/utilities/compare.1.in b/utilities/compare.1.in index 0e34a8869..38d3ece4e 100644 --- a/utilities/compare.1.in +++ b/utilities/compare.1.in @@ -43,6 +43,7 @@ Image Settings: \-seed value seed a new sequence of pseudo-random numbers \-set attribute value set an image attribute \-size geometry width and height of image + \-subimage-search search for subimage \-transparent-color color transparent color \-type type image type diff --git a/wand/compare.c b/wand/compare.c index caabeb4e5..af854453f 100644 --- a/wand/compare.c +++ b/wand/compare.c @@ -139,6 +139,7 @@ static MagickBooleanType CompareUsage(void) "-size geometry width and height of image", "-transparent-color color", " transparent color", + "-subimage-search search for subimage", "-type type image type", "-verbose print detailed information about the image", "-version print version information", @@ -225,13 +226,10 @@ WandExport MagickBooleanType CompareImageCommand(ImageInfo *image_info, ImageStack image_stack[MaxImageStackDepth+1]; - ssize_t - j, - k; - MagickBooleanType fire, - pend; + pend, + subimage_search; MagickStatusType status; @@ -245,6 +243,10 @@ WandExport MagickBooleanType CompareImageCommand(ImageInfo *image_info, register ssize_t i; + ssize_t + j, + k; + /* Set defaults. */ @@ -282,6 +284,7 @@ WandExport MagickBooleanType CompareImageCommand(ImageInfo *image_info, pend=MagickFalse; reconstruct_image=NewImageList(); status=MagickTrue; + subimage_search=MagickFalse; /* Compare an image. */ @@ -836,6 +839,16 @@ WandExport MagickBooleanType CompareImageCommand(ImageInfo *image_info, ThrowCompareInvalidArgumentException(option,argv[i]); break; } + if (LocaleCompare("subimage-search",option+1) == 0) + { + if (*option == '+') + { + subimage_search=MagickFalse; + break; + } + subimage_search=MagickTrue; + break; + } ThrowCompareException(OptionError,"UnrecognizedOption",option) } case 't': @@ -929,39 +942,43 @@ WandExport MagickBooleanType CompareImageCommand(ImageInfo *image_info, difference_image=CompareImageChannels(image,reconstruct_image,channels, metric,&distortion,exception); else - if (similarity_image != (Image *) NULL) - { - Image - *composite_image; + if (subimage_search == MagickFalse) + difference_image=CompareImageChannels(image,reconstruct_image,channels, + metric,&distortion,exception); + else + if (similarity_image != (Image *) NULL) + { + Image + *composite_image; - /* - Determine if reconstructed image is a subimage of the image. - */ - composite_image=CloneImage(image,0,0,MagickTrue,exception); - if (composite_image == (Image *) NULL) - difference_image=CompareImageChannels(image,reconstruct_image, - channels,metric,&distortion,exception); - else - { - (void) CompositeImage(composite_image,CopyCompositeOp, - reconstruct_image,offset.x,offset.y); - difference_image=CompareImageChannels(image,composite_image, + /* + Determine if reconstructed image is a subimage of the image. + */ + composite_image=CloneImage(image,0,0,MagickTrue,exception); + if (composite_image == (Image *) NULL) + difference_image=CompareImageChannels(image,reconstruct_image, channels,metric,&distortion,exception); - if (difference_image != (Image *) NULL) - { - difference_image->page.x=offset.x; - difference_image->page.y=offset.y; - } - composite_image=DestroyImage(composite_image); - } - if (difference_image == (Image *) NULL) - similarity_image=DestroyImage(similarity_image); - else - { - AppendImageToList(&difference_image,similarity_image); - similarity_image=(Image *) NULL; - } - } + else + { + (void) CompositeImage(composite_image,CopyCompositeOp, + reconstruct_image,offset.x,offset.y); + difference_image=CompareImageChannels(image,composite_image, + channels,metric,&distortion,exception); + if (difference_image != (Image *) NULL) + { + difference_image->page.x=offset.x; + difference_image->page.y=offset.y; + } + composite_image=DestroyImage(composite_image); + } + if (difference_image == (Image *) NULL) + similarity_image=DestroyImage(similarity_image); + else + { + AppendImageToList(&difference_image,similarity_image); + similarity_image=(Image *) NULL; + } + } if (difference_image == (Image *) NULL) status=0; else diff --git a/www/advanced-windows-installation.html b/www/advanced-windows-installation.html index f78b4a4e4..cc880a840 100644 --- a/www/advanced-windows-installation.html +++ b/www/advanced-windows-installation.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api.html b/www/api.html index 0f3ac2e53..9b9b16428 100644 --- a/www/api.html +++ b/www/api.html @@ -172,7 +172,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

@@ -184,7 +184,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+

@@ -196,31 +196,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

@@ -234,7 +234,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

@@ -246,50 +246,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 d58b44db6..412cf2cb0 100644 --- a/www/api/animate.html +++ b/www/api/animate.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/annotate.html b/www/api/annotate.html index e5fd9ecbc..7f1f56be8 100644 --- a/www/api/annotate.html +++ b/www/api/annotate.html @@ -141,9 +141,6 @@ - diff --git a/www/api/attribute.html b/www/api/attribute.html index 3c2df695f..fb2278aaf 100644 --- a/www/api/attribute.html +++ b/www/api/attribute.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/blob.html b/www/api/blob.html index 14915df68..7b3f13dc6 100644 --- a/www/api/blob.html +++ b/www/api/blob.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/color.html b/www/api/color.html index 3107b7ab8..1be2593c2 100644 --- a/www/api/color.html +++ b/www/api/color.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/colormap.html b/www/api/colormap.html index eeaf0a45d..098f7418e 100644 --- a/www/api/colormap.html +++ b/www/api/colormap.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/compare.html b/www/api/compare.html index 0da1a4d6b..8b13a7d53 100644 --- a/www/api/compare.html +++ b/www/api/compare.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/composite.html b/www/api/composite.html index ef33f9496..c16765ce9 100644 --- a/www/api/composite.html +++ b/www/api/composite.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/decorate.html b/www/api/decorate.html index aa90a25e9..03988c141 100644 --- a/www/api/decorate.html +++ b/www/api/decorate.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/distort.html b/www/api/distort.html index fc0959362..4ec8a46ed 100644 --- a/www/api/distort.html +++ b/www/api/distort.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/draw.html b/www/api/draw.html index 5b00992f6..832b0fdad 100644 --- a/www/api/draw.html +++ b/www/api/draw.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/drawing-wand.html b/www/api/drawing-wand.html index eb68074b9..48a874e03 100644 --- a/www/api/drawing-wand.html +++ b/www/api/drawing-wand.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/effect.html b/www/api/effect.html index b83528e88..6677d62bc 100644 --- a/www/api/effect.html +++ b/www/api/effect.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/enhance.html b/www/api/enhance.html index d272a06d9..6f924be4f 100644 --- a/www/api/enhance.html +++ b/www/api/enhance.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/exception.html b/www/api/exception.html index fd6631892..226b7d44f 100644 --- a/www/api/exception.html +++ b/www/api/exception.html @@ -141,6 +141,9 @@ + diff --git a/www/api/feature.html b/www/api/feature.html index c7980de59..6bcb95f5a 100644 --- a/www/api/feature.html +++ b/www/api/feature.html @@ -141,6 +141,9 @@ + diff --git a/www/api/fx.html b/www/api/fx.html index f8631cf21..189f346e7 100644 --- a/www/api/fx.html +++ b/www/api/fx.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/histogram.html b/www/api/histogram.html index 80dfb0ad8..2f616c81b 100644 --- a/www/api/histogram.html +++ b/www/api/histogram.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/image.html b/www/api/image.html index bb19da912..0ae09b4f6 100644 --- a/www/api/image.html +++ b/www/api/image.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/list.html b/www/api/list.html index c442718f3..3c4792d3d 100644 --- a/www/api/list.html +++ b/www/api/list.html @@ -141,6 +141,9 @@ + diff --git a/www/api/magick-property.html b/www/api/magick-property.html index f74c15aee..864256b7b 100644 --- a/www/api/magick-property.html +++ b/www/api/magick-property.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/magick-wand.html b/www/api/magick-wand.html index b9abb7a7c..4a6228628 100644 --- a/www/api/magick-wand.html +++ b/www/api/magick-wand.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/magick.html b/www/api/magick.html index d170fda82..7b4eec389 100644 --- a/www/api/magick.html +++ b/www/api/magick.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/memory.html b/www/api/memory.html index e8a14fd5f..6c8076203 100644 --- a/www/api/memory.html +++ b/www/api/memory.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/module.html b/www/api/module.html index 9ce276042..cdd469249 100644 --- a/www/api/module.html +++ b/www/api/module.html @@ -141,9 +141,6 @@ - diff --git a/www/api/monitor.html b/www/api/monitor.html index b649b0575..fe4d9f4a8 100644 --- a/www/api/monitor.html +++ b/www/api/monitor.html @@ -141,9 +141,6 @@ - diff --git a/www/api/montage.html b/www/api/montage.html index 0bc94ed0d..0b890665e 100644 --- a/www/api/montage.html +++ b/www/api/montage.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/morphology.html b/www/api/morphology.html index 50e041467..a40c0e50d 100644 --- a/www/api/morphology.html +++ b/www/api/morphology.html @@ -141,9 +141,6 @@ - diff --git a/www/api/paint.html b/www/api/paint.html index 2c3a68019..0e64add80 100644 --- a/www/api/paint.html +++ b/www/api/paint.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/pixel-iterator.html b/www/api/pixel-iterator.html index 3864af5d3..a804ee4bb 100644 --- a/www/api/pixel-iterator.html +++ b/www/api/pixel-iterator.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/pixel-wand.html b/www/api/pixel-wand.html index f1fc9b9d4..f210652c0 100644 --- a/www/api/pixel-wand.html +++ b/www/api/pixel-wand.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/profile.html b/www/api/profile.html index 1804fc25a..5f74f8795 100644 --- a/www/api/profile.html +++ b/www/api/profile.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/quantize.html b/www/api/quantize.html index c3eca08d6..887170efc 100644 --- a/www/api/quantize.html +++ b/www/api/quantize.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/resource.html b/www/api/resource.html index a0aecea5e..109d48af0 100644 --- a/www/api/resource.html +++ b/www/api/resource.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/segment.html b/www/api/segment.html index a6e6c60fc..94a330ce3 100644 --- a/www/api/segment.html +++ b/www/api/segment.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/shear.html b/www/api/shear.html index c1adf2ca9..269e28b88 100644 --- a/www/api/shear.html +++ b/www/api/shear.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/statistic.html b/www/api/statistic.html index 38f25c346..22659ca12 100644 --- a/www/api/statistic.html +++ b/www/api/statistic.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/stream.html b/www/api/stream.html index 8afaaf0a2..34ba8ff62 100644 --- a/www/api/stream.html +++ b/www/api/stream.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/transform.html b/www/api/transform.html index f3652965d..b617deae7 100644 --- a/www/api/transform.html +++ b/www/api/transform.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/version.html b/www/api/version.html index b013fcee7..6957e723a 100644 --- a/www/api/version.html +++ b/www/api/version.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/wand-view.html b/www/api/wand-view.html index e8c2226ec..f2a769252 100644 --- a/www/api/wand-view.html +++ b/www/api/wand-view.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/architecture.html b/www/architecture.html index 6a9d36d31..d449e6bb5 100644 --- a/www/architecture.html +++ b/www/architecture.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/changelog.html b/www/changelog.html index 69de3a268..1ebf44b9c 100644 --- a/www/changelog.html +++ b/www/changelog.html @@ -141,6 +141,9 @@ + @@ -161,7 +164,12 @@
-
    2010-08-05 6.6.3-3 Glenn Randers-Pehrson <glennrp@image...>
    +
      2010-08-07 6.6.3-4 Cristy <quetzlzacatenango@image...>
      +
    • The orient option sometimes improperly set "undefined" (reference http://www.imagemagick.org/discourse-server/viewtopic.html?f=3&t=16795).
    • +
    • Only list orientation options for the -list orientation option (reference http://www.imagemagick.org/discourse-server/viewtopic.html?f=3&t=16801).
    • +
    • Return proper standard deviation for combined channels (reference http://www.imagemagick.org/discourse-server/viewtopic.html?f=3&t=16786).
    • +
    • Handle transparency properly for the PSD image format.

    • +
      2010-08-05 6.6.3-3 Glenn Randers-Pehrson <glennrp@image...>
    • Properly map PNG intent to image->rendering_intent

    • 2010-08-01 6.6.3-3 Cristy <quetzlzacatenango@image...>
    • Eliminate bogus "invalid colormap index" when pinging ICO images.
    • diff --git a/www/cipher.html b/www/cipher.html index 909a1d97d..7ccabe817 100644 --- a/www/cipher.html +++ b/www/cipher.html @@ -143,7 +143,7 @@ Druckerei Online
diff --git a/www/command-line-options.html b/www/command-line-options.html index 74226209b..5be9e0571 100644 --- a/www/command-line-options.html +++ b/www/command-line-options.html @@ -145,9 +145,6 @@ - @@ -169,7 +166,7 @@
+[ ‑adaptive‑blur  • ‑adaptive‑resize  • ‑adaptive‑sharpen  • ‑adjoin  • ‑affine  • ‑alpha  • ‑annotate  • ‑antialias  • ‑append  • ‑attenuate  • ‑authenticate  • ‑auto‑gamma  • ‑auto‑level  • ‑auto‑orient  • ‑backdrop  • ‑background  • ‑bench  • ‑bias  • ‑blackpoint‑compensation  • ‑black‑threshold  • ‑blend  • ‑blue‑primary  • ‑blue‑shift  • ‑blur  • ‑border  • ‑bordercolor  • ‑borderwidth  • ‑brightness‑contrast  • ‑cache  • ‑caption  • ‑cdl  • ‑channel  • ‑charcoal  • ‑chop  • ‑clamp  • ‑clip  • ‑clip‑mask  • ‑clip‑path  • ‑clone  • ‑clut  • ‑coalesce  • ‑colorize  • ‑colormap  • ‑color‑matrix  • ‑colors  • ‑colorspace  • ‑combine  • ‑comment  • ‑compose  • ‑composite  • ‑compress  • ‑contrast  • ‑contrast‑stretch  • ‑convolve  • ‑crop  • ‑cycle  • ‑debug  • ‑decipher  • ‑deconstruct  • ‑define  • ‑delay  • ‑delete  • ‑density  • ‑depth  • ‑descend  • ‑deskew  • ‑despeckle  • ‑direction  • ‑displace  • ‑display  • ‑dispose  • ‑dissimilarity‑threshold  • ‑dissolve  • ‑distort  • ‑dither  • ‑draw  • ‑edge  • ‑emboss  • ‑encipher  • ‑encoding  • ‑endian  • ‑enhance  • ‑equalize  • ‑evaluate  • ‑evaluate‑sequence  • ‑extent  • ‑extract  • ‑family  • ‑features  • ‑fft  • ‑fill  • ‑filter  • ‑flatten  • ‑flip  • ‑floodfill  • ‑flop  • ‑font  • ‑foreground  • ‑format  • ‑format[identify]  • ‑frame  • ‑frame[import]  • ‑function  • ‑fuzz  • ‑fx  • ‑gamma  • ‑gaussian‑blur  • ‑geometry  • ‑gravity  • ‑green‑primary  • ‑hald‑clut  • ‑help  • ‑highlight‑color  • ‑iconGeometry  • ‑iconic  • ‑identify  • ‑ift  • ‑immutable  • ‑implode  • ‑insert  • ‑intent  • ‑interlace  • ‑interpolate  • ‑interline‑spacing  • ‑interword‑spacing  • ‑kerning  • ‑label  • ‑lat  • ‑layers  • ‑level  • ‑level‑colors  • ‑limit  • ‑linear‑stretch  • ‑linewidth  • ‑liquid‑rescale  • ‑list  • ‑log  • ‑loop  • ‑lowlight‑color  • ‑magnify  • ‑map  • ‑map[stream]  • ‑mask  • ‑mattecolor  • ‑median  • ‑metric  • ‑mode  • ‑modulate  • ‑monitor  • ‑monochrome  • ‑morph  • ‑morphology  • ‑mosaic  • ‑motion‑blur  • ‑name  • ‑negate  • ‑noise  • ‑normalize  • ‑opaque  • ‑ordered‑dither  • ‑orient  • ‑page  • ‑paint  • ‑path  • ‑pause[animate]  • ‑pause[import]  • ‑pen  • ‑ping  • ‑pointsize  • ‑polaroid  • ‑posterize  • ‑precision  • ‑preview  • ‑print  • ‑process  • ‑profile  • ‑quality  • ‑quantize  • ‑quiet  • ‑radial‑blur  • ‑raise  • ‑random‑threshold  • ‑red‑primary  • ‑regard‑warnings  • ‑region  • ‑remap  • ‑remote  • ‑render  • ‑repage  • ‑resample  • ‑resize  • ‑respect‑parentheses  • ‑reverse  • ‑roll  • ‑rotate  • ‑sample  • ‑sampling‑factor  • ‑scale  • ‑scene  • ‑screen  • ‑seed  • ‑segment  • ‑selective‑blur  • ‑separate  • ‑sepia‑tone  • ‑set  • ‑shade  • ‑shadow  • ‑shared‑memory  • ‑sharpen  • ‑shave  • ‑shear  • ‑sigmoidal‑contrast  • ‑silent  • ‑size  • ‑sketch  • ‑snaps  • ‑solarize  • ‑sparse‑color  • ‑splice  • ‑spread  • ‑stegano  • ‑stereo  • ‑stretch  • ‑strip  • ‑stroke  • ‑strokewidth  • ‑style  • ‑subimage‑search  • ‑swap  • ‑swirl  • ‑taint  • ‑text‑font  • ‑texture  • ‑threshold  • ‑thumbnail  • ‑tile  • ‑tile‑offset  • ‑tint  • ‑title  • ‑transform  • ‑transparent  • ‑transparent‑color  • ‑transpose  • ‑transverse  • ‑treedepth  • ‑trim  • ‑type  • ‑undercolor  • ‑unique‑colors  • ‑units  • ‑unsharp  • ‑update  • ‑verbose  • ‑version  • ‑view  • ‑vignette  • ‑virtual‑pixel  • ‑visual  • ‑watermark  • ‑wave  • ‑weight  • ‑white‑point  • ‑white‑threshold  • ‑window  • ‑window‑group  • ‑write ]

Below is list of command-line options recognized by the ImageMagick command-line @@ -5522,6 +5519,12 @@ values range from 0 to the maximum value the storage type can support.

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

+
+

-subimage-search

+
+ +
search for subimage.
+

-swap index,index

diff --git a/www/command-line-processing.html b/www/command-line-processing.html index dca0106d9..dde4bff22 100644 --- a/www/command-line-processing.html +++ b/www/command-line-processing.html @@ -142,7 +142,7 @@ Druckerei Online
diff --git a/www/command-line-tools.html b/www/command-line-tools.html index 28e638106..e606bdae1 100644 --- a/www/command-line-tools.html +++ b/www/command-line-tools.html @@ -142,7 +142,7 @@ Druckerei Online @@ -166,11 +166,11 @@ -

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/compare.html b/www/compare.html index 499b93809..bd70f439c 100644 --- a/www/compare.html +++ b/www/compare.html @@ -379,6 +379,11 @@ transparent, extract, background, or shape the alpha channel width and height of image + + -subimage-search + search for subimage + + -transparent-color color transparent color diff --git a/www/composite.html b/www/composite.html index 2d5edf430..2119c166a 100644 --- a/www/composite.html +++ b/www/composite.html @@ -142,6 +142,9 @@ +
diff --git a/www/conjure.html b/www/conjure.html index c3bb7a413..68980498c 100644 --- a/www/conjure.html +++ b/www/conjure.html @@ -143,7 +143,7 @@ Druckerei Online diff --git a/www/contact.html b/www/contact.html index a57f93934..17d777652 100644 --- a/www/contact.html +++ b/www/contact.html @@ -172,7 +172,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/display.html b/www/display.html index 648f7666f..ac29be9fb 100644 --- a/www/display.html +++ b/www/display.html @@ -143,7 +143,7 @@ Druckerei Online

diff --git a/www/examples.html b/www/examples.html index a377aec23..ded47488c 100644 --- a/www/examples.html +++ b/www/examples.html @@ -141,6 +141,9 @@ + @@ -161,7 +164,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 1ece0dbca..222f67675 100644 --- a/www/fx.html +++ b/www/fx.html @@ -143,7 +143,7 @@ Druckerei Online
diff --git a/www/history.html b/www/history.html index d50326bcc..d41e5c726 100644 --- a/www/history.html +++ b/www/history.html @@ -142,7 +142,7 @@ Druckerei Online @@ -176,7 +176,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 7d0b9cb69..b2577ba97 100644 --- a/www/identify.html +++ b/www/identify.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/index.html b/www/index.html index 4477c2f0d..4bb97a49b 100644 --- a/www/index.html +++ b/www/index.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/jp2.html b/www/jp2.html index 0317e52c1..a70b514b8 100644 --- a/www/jp2.html +++ b/www/jp2.html @@ -143,7 +143,7 @@ Druckerei Online diff --git a/www/license.html b/www/license.html index 26b26b151..a87dfff11 100644 --- a/www/license.html +++ b/www/license.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/links.html b/www/links.html index 7b32e49d0..bbd463f4f 100644 --- a/www/links.html +++ b/www/links.html @@ -142,7 +142,7 @@ Druckerei Online @@ -172,23 +172,23 @@

Command-line Tutorials

@@ -196,18 +196,18 @@
@@ -215,10 +215,10 @@
@@ -226,24 +226,24 @@

ImageMagick Book Review

Mailing List Archives

@@ -251,13 +251,13 @@
Denmark
-
http://imagemagick.europnews.de

+
http://imagemagick.europnews.de

Germany
-
http://imagemagick.linux-mirror.org

+
http://imagemagick.linux-mirror.org

Ireland
-
http://imagemagick.oss-mirror.org

+
http://imagemagick.oss-mirror.org

United States
-
http://www.imagemagick.org
+
http://www.imagemagick.org
@@ -265,16 +265,16 @@
    -
    G'MIC: convert, manipulate and visualize generic 1D/2D/3D multi-spectral image files
    -
    Image Commander: bulk picture processing with a GUI
    +
    G'MIC: convert, manipulate and visualize generic 1D/2D/3D multi-spectral image files
    +
    Image Commander: bulk picture processing with a GUI

Other Projects Hosted by ImageMagick Studio

diff --git a/www/magick-vector-graphics.html b/www/magick-vector-graphics.html index b34230aef..4994ced22 100644 --- a/www/magick-vector-graphics.html +++ b/www/magick-vector-graphics.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/magick-wand.html b/www/magick-wand.html index 2c8a3aae6..2485caa83 100644 --- a/www/magick-wand.html +++ b/www/magick-wand.html @@ -143,7 +143,7 @@ Druckerei Online diff --git a/www/miff.html b/www/miff.html index 943a8aade..edf9a170b 100644 --- a/www/miff.html +++ b/www/miff.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/mirrors.html b/www/mirrors.html index 4b2723379..6b8509361 100644 --- a/www/mirrors.html +++ b/www/mirrors.html @@ -167,9 +167,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 0bfcb0640..c1bc24a60 100644 --- a/www/mogrify.html +++ b/www/mogrify.html @@ -143,7 +143,7 @@ Druckerei Online diff --git a/www/motion-picture.html b/www/motion-picture.html index 104d7ec56..27a99c18e 100644 --- a/www/motion-picture.html +++ b/www/motion-picture.html @@ -143,7 +143,7 @@ Druckerei Online diff --git a/www/perl-magick.html b/www/perl-magick.html index 169aaba4e..25b24008e 100644 --- a/www/perl-magick.html +++ b/www/perl-magick.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/quantize.html b/www/quantize.html index 4bc318105..ba29a7479 100644 --- a/www/quantize.html +++ b/www/quantize.html @@ -141,6 +141,9 @@ + diff --git a/www/resources.html b/www/resources.html index 0461d6ae0..309552e90 100644 --- a/www/resources.html +++ b/www/resources.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/search.html b/www/search.html index a379f1b7d..5431d9bbf 100644 --- a/www/search.html +++ b/www/search.html @@ -141,6 +141,9 @@ + diff --git a/www/sitemap.html b/www/sitemap.html index 7d3f37ab3..85708882c 100644 --- a/www/sitemap.html +++ b/www/sitemap.html @@ -141,9 +141,6 @@ - @@ -175,7 +172,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.
@@ -189,12 +186,12 @@
Download ImageMagick: ImageMagick source and binary distributions are available from a variety of FTP and Web mirrors.
@@ -233,7 +230,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.
@@ -243,21 +240,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.
@@ -277,8 +274,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.
@@ -288,7 +285,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.
@@ -314,8 +311,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 9e0719f09..275f91215 100644 --- a/www/sponsors.html +++ b/www/sponsors.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/stream.html b/www/stream.html index 08e71991c..c2a65740e 100644 --- a/www/stream.html +++ b/www/stream.html @@ -143,7 +143,7 @@ Druckerei Online diff --git a/www/subversion.html b/www/subversion.html index 084e27050..c08ffcd48 100644 --- a/www/subversion.html +++ b/www/subversion.html @@ -142,7 +142,7 @@ Druckerei Online -- 2.40.0