From 95524f92fc346f548f202d36ffc6a17fdbd1b1cb Mon Sep 17 00:00:00 2001 From: cristy Date: Tue, 16 Feb 2010 18:44:34 +0000 Subject: [PATCH] --- coders/caption.c | 7 +- coders/label.c | 7 +- coders/meta.c | 7 +- coders/mvg.c | 7 +- coders/psd.c | 7 +- config/english.xml | 4 +- config/francais.xml | 4 +- index.html | 2 +- www/ImageMagickObject.html | 2 +- www/advanced-windows-installation.html | 2 +- www/api.html | 42 +++++------ www/api/animate.html | 5 +- www/api/annotate.html | 2 +- www/api/attribute.html | 2 +- www/api/cache-view.html | 2 +- www/api/cipher.html | 2 +- www/api/color.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/display.html | 2 +- www/api/distort.html | 2 +- www/api/draw.html | 5 +- www/api/drawing-wand.html | 5 +- www/api/effect.html | 2 +- www/api/enhance.html | 5 +- www/api/exception.html | 2 +- www/api/feature.html | 2 +- www/api/fx.html | 2 +- www/api/layer.html | 3 - www/api/magick-deprecate.html | 5 +- www/api/magick-property.html | 5 +- www/api/magick-wand.html | 3 - www/api/magick.html | 3 - www/api/memory.html | 2 +- www/api/module.html | 2 +- www/api/paint.html | 5 +- www/api/pixel-iterator.html | 2 +- www/api/pixel-view.html | 2 +- www/api/profile.html | 2 +- www/api/property.html | 3 + www/api/quantize.html | 3 - www/api/resize.html | 2 +- www/api/segment.html | 2 +- www/api/signature.html | 5 +- www/api/stream.html | 2 +- www/architecture.html | 2 +- www/binary-releases.html | 5 +- www/color.html | 5 +- www/command-line-options.html | 2 +- www/command-line-tools.html | 4 +- www/composite.html | 2 +- www/conjure.html | 3 + www/contact.html | 2 +- www/convert.html | 2 +- www/download.html | 3 + www/escape.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 | 2 +- www/identify.html | 2 +- www/import.html | 2 +- www/index.html | 2 +- www/install-source.html | 2 +- www/jp2.html | 5 +- www/license.html | 2 +- www/links.html | 96 +++++++++++++------------- www/mirrors.html | 7 +- www/perl-magick.html | 2 +- www/resources.html | 2 +- www/sitemap.html | 55 +++++++-------- www/t-shirt.html | 2 +- 77 files changed, 216 insertions(+), 203 deletions(-) diff --git a/coders/caption.c b/coders/caption.c index c45c81f5a..035572bfe 100644 --- a/coders/caption.c +++ b/coders/caption.c @@ -195,7 +195,12 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info, if (image->rows == 0) image->rows=(unsigned long) ((i+1)*draw_info->pointsize+ draw_info->stroke_width+0.5); - (void) SetImageBackgroundColor(image); + if (SetImageBackgroundColor(image) == MagickFalse) + { + InheritException(exception,&image->exception); + image=DestroyImageList(image); + return((Image *) NULL); + } /* Draw caption. */ diff --git a/coders/label.c b/coders/label.c index 6aa82cfbd..43a2d6ded 100644 --- a/coders/label.c +++ b/coders/label.c @@ -184,7 +184,12 @@ static Image *ReadLABELImage(const ImageInfo *image_info, if (image->rows == 0) image->rows=(unsigned long) (draw_info->pointsize+draw_info->stroke_width+ 0.5); - (void) SetImageBackgroundColor(image); + if (SetImageBackgroundColor(image) == MagickFalse) + { + InheritException(exception,&image->exception); + image=DestroyImageList(image); + return((Image *) NULL); + } (void) AnnotateImage(image,draw_info); draw_info=DestroyDrawInfo(draw_info); return(GetFirstImageInList(image)); diff --git a/coders/meta.c b/coders/meta.c index 70496364b..d9105ea85 100644 --- a/coders/meta.c +++ b/coders/meta.c @@ -1102,7 +1102,12 @@ static Image *ReadMETAImage(const ImageInfo *image_info, } image->columns=1; image->rows=1; - (void) SetImageBackgroundColor(image); + if (SetImageBackgroundColor(image) == MagickFalse) + { + InheritException(exception,&image->exception); + image=DestroyImageList(image); + return((Image *) NULL); + } length=1; if (LocaleNCompare(image_info->magick,"8BIM",4) == 0) { diff --git a/coders/mvg.c b/coders/mvg.c index d56cfea3e..a1b4e68d7 100644 --- a/coders/mvg.c +++ b/coders/mvg.c @@ -189,7 +189,12 @@ static Image *ReadMVGImage(const ImageInfo *image_info,ExceptionInfo *exception) DefaultResolution; image->columns=(unsigned long) (draw_info->affine.sx*image->columns); image->rows=(unsigned long) (draw_info->affine.sy*image->rows); - (void) SetImageBackgroundColor(image); + if (SetImageBackgroundColor(image) == MagickFalse) + { + InheritException(exception,&image->exception); + image=DestroyImageList(image); + return((Image *) NULL); + } /* Render drawing. */ diff --git a/coders/psd.c b/coders/psd.c index ca3a59a30..7a954f202 100644 --- a/coders/psd.c +++ b/coders/psd.c @@ -683,7 +683,12 @@ static Image *ReadPSDImage(const ImageInfo *image_info,ExceptionInfo *exception) image->depth=psd_info.depth; image->columns=psd_info.columns; image->rows=psd_info.rows; - (void) SetImageBackgroundColor(image); + if (SetImageBackgroundColor(image) == MagickFalse) + { + InheritException(exception,&image->exception); + image=DestroyImageList(image); + return((Image *) NULL); + } image->matte=psd_info.channels >= 4 ? MagickTrue : MagickFalse; if (psd_info.mode == LabMode) image->colorspace=LabColorspace; diff --git a/config/english.xml b/config/english.xml index 19d18a875..774e258b8 100644 --- a/config/english.xml +++ b/config/english.xml @@ -59,8 +59,8 @@ unable to get cache nexus - - unable to open cache + + unable to open pixel cache unable to persist pixel cache diff --git a/config/francais.xml b/config/francais.xml index 85e7bfe41..7123c8b59 100644 --- a/config/francais.xml +++ b/config/francais.xml @@ -59,8 +59,8 @@ impossible de récupérer le nexus du cache - - impossible d'ouvrir le cache + + impossible d'ouvrir le cache pixels impossible de rendre persistant le cache pixels diff --git a/index.html b/index.html index 183f28f25..dc4a8cfd5 100644 --- a/index.html +++ b/index.html @@ -226,7 +226,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/ImageMagickObject.html b/www/ImageMagickObject.html index 2d8665ef4..0e7821d9a 100644 --- a/www/ImageMagickObject.html +++ b/www/ImageMagickObject.html @@ -210,7 +210,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/advanced-windows-installation.html b/www/advanced-windows-installation.html index 4fb423286..9277c4160 100644 --- a/www/advanced-windows-installation.html +++ b/www/advanced-windows-installation.html @@ -486,7 +486,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/api.html b/www/api.html index 9047ec64b..60d076ded 100644 --- a/www/api.html +++ b/www/api.html @@ -163,7 +163,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

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

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

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

@@ -237,50 +237,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.

@@ -288,7 +288,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/api/animate.html b/www/api/animate.html index b2c5446ad..2ebd51315 100644 --- a/www/api/animate.html +++ b/www/api/animate.html @@ -123,9 +123,6 @@ Sponsors:
- @@ -186,7 +183,7 @@ _8c.html" target="source" name="AnimateImages">AnimateImages Discourse Server • - Studio + Studio  
diff --git a/www/api/annotate.html b/www/api/annotate.html index ebee841ab..217e1631a 100644 --- a/www/api/annotate.html +++ b/www/api/annotate.html @@ -325,7 +325,7 @@ _8c.html" target="source" name="GetTypeMetrics">GetTypeMetrics Discourse Server • - Studio + Studio   diff --git a/www/api/attribute.html b/www/api/attribute.html index f789aac74..cac0aec7a 100644 --- a/www/api/attribute.html +++ b/www/api/attribute.html @@ -333,7 +333,7 @@ _8c.html" target="source" name="SetImageChannelDepth">SetImageChannelDepth  --> Discourse Server • - Studio + Studio   diff --git a/www/api/cache-view.html b/www/api/cache-view.html index 0bbffeb17..9320914b0 100644 --- a/www/api/cache-view.html +++ b/www/api/cache-view.html @@ -579,7 +579,7 @@ _8c.html" target="source" name="SyncCacheViewAuthenticPixels">SyncCacheViewAuthe Discourse Server • - Studio + Studio   diff --git a/www/api/cipher.html b/www/api/cipher.html index 789121088..8c6de6a84 100644 --- a/www/api/cipher.html +++ b/www/api/cipher.html @@ -358,7 +358,7 @@ _8c.html" target="source" name="PasskeyEncipherImage">PasskeyEncipherImage  --> Discourse Server • - Studio + Studio   diff --git a/www/api/color.html b/www/api/color.html index 283bb267d..27912711b 100644 --- a/www/api/color.html +++ b/www/api/color.html @@ -371,7 +371,7 @@ _8c.html" target="source" name="QueryMagickColorname">QueryMagickColorname  --> Discourse Server • - Studio + Studio   diff --git a/www/api/compare.html b/www/api/compare.html index 0add127d5..4f79aba76 100644 --- a/www/api/compare.html +++ b/www/api/compare.html @@ -328,7 +328,7 @@ _8c.html" target="source" name="SimilarityImage">SimilarityImage Discourse Server • - Studio + Studio   diff --git a/www/api/composite.html b/www/api/composite.html index 483ae6260..59da23d16 100644 --- a/www/api/composite.html +++ b/www/api/composite.html @@ -235,7 +235,7 @@ _8c.html" target="source" name="TextureImage">TextureImage Discourse Server • - Studio + Studio   diff --git a/www/api/constitute.html b/www/api/constitute.html index ea4f8bce2..c1099097c 100644 --- a/www/api/constitute.html +++ b/www/api/constitute.html @@ -336,7 +336,7 @@ _8c.html" target="source" name="WriteImages">WriteImages Discourse Server • - Studio + Studio   diff --git a/www/api/decorate.html b/www/api/decorate.html index eabefa44c..ce9df822e 100644 --- a/www/api/decorate.html +++ b/www/api/decorate.html @@ -239,7 +239,7 @@ _8c.html" target="source" name="RaiseImage">RaiseImage Discourse Server • - Studio + Studio   diff --git a/www/api/deprecate.html b/www/api/deprecate.html index 8d8b682b7..f65406b1e 100644 --- a/www/api/deprecate.html +++ b/www/api/deprecate.html @@ -2600,7 +2600,7 @@ _8c.html" target="source" name="UnshiftImageList">UnshiftImageList Discourse Server • - Studio + Studio   diff --git a/www/api/display.html b/www/api/display.html index afdc25489..c86a6202f 100644 --- a/www/api/display.html +++ b/www/api/display.html @@ -239,7 +239,7 @@ _8c.html" target="source" name="XDisplayBackgroundImage">XDisplayBackgroundImage Discourse Server • - Studio + Studio   diff --git a/www/api/distort.html b/www/api/distort.html index 3f0592e78..7a2d0952c 100644 --- a/www/api/distort.html +++ b/www/api/distort.html @@ -260,7 +260,7 @@ _8c.html" target="source" name="SparseColorImage">SparseColorImage Discourse Server • - Studio + Studio   diff --git a/www/api/draw.html b/www/api/draw.html index 3f611aeea..325f2f542 100644 --- a/www/api/draw.html +++ b/www/api/draw.html @@ -123,6 +123,9 @@ Sponsors:
+ @@ -378,7 +381,7 @@ _8c.html" target="source" name="GetAffineMatrix">GetAffineMatrix Discourse Server • - Studio + Studio  
diff --git a/www/api/drawing-wand.html b/www/api/drawing-wand.html index 82b626eae..27af6a261 100644 --- a/www/api/drawing-wand.html +++ b/www/api/drawing-wand.html @@ -123,9 +123,6 @@ Sponsors:
- @@ -3070,7 +3067,7 @@ _8c.html" target="source" name="PushDrawingWand">PushDrawingWand Discourse Server • - Studio + Studio  
diff --git a/www/api/effect.html b/www/api/effect.html index 40567baeb..c2262d489 100644 --- a/www/api/effect.html +++ b/www/api/effect.html @@ -755,7 +755,7 @@ _8c.html" target="source" name="UnsharpMaskImage">UnsharpMaskImage Discourse Server • - Studio + Studio   diff --git a/www/api/enhance.html b/www/api/enhance.html index a44103b93..9eb181cbe 100644 --- a/www/api/enhance.html +++ b/www/api/enhance.html @@ -123,6 +123,9 @@ Sponsors:
+ @@ -726,7 +729,7 @@ _8c.html" target="source" name="SigmoidalContrastImage">SigmoidalContrastImage  --> Discourse Server • - Studio + Studio  
diff --git a/www/api/exception.html b/www/api/exception.html index 8473d3fe2..13f47f61b 100644 --- a/www/api/exception.html +++ b/www/api/exception.html @@ -468,7 +468,7 @@ _8c.html" target="source" name="ThrowException">ThrowException Discourse Server • - Studio + Studio   diff --git a/www/api/feature.html b/www/api/feature.html index c51a659f5..c6125f6e2 100644 --- a/www/api/feature.html +++ b/www/api/feature.html @@ -196,7 +196,7 @@ _8c.html" target="source" name="GetImageChannelFeatures">GetImageChannelFeatures Discourse Server • - Studio + Studio   diff --git a/www/api/fx.html b/www/api/fx.html index 36b51e3fc..c03fd9f56 100644 --- a/www/api/fx.html +++ b/www/api/fx.html @@ -794,7 +794,7 @@ _8c.html" target="source" name="WaveImage">WaveImage Discourse Server • - Studio + Studio   diff --git a/www/api/layer.html b/www/api/layer.html index 0681ac0c1..577d27489 100644 --- a/www/api/layer.html +++ b/www/api/layer.html @@ -123,9 +123,6 @@ Sponsors:
- diff --git a/www/api/magick-deprecate.html b/www/api/magick-deprecate.html index 25d277c3a..d48276eb6 100644 --- a/www/api/magick-deprecate.html +++ b/www/api/magick-deprecate.html @@ -123,6 +123,9 @@ Sponsors:
+ @@ -900,7 +903,7 @@ _8c.html" target="source" name="PixelIteratorGetException">PixelIteratorGetExcep Discourse Server • - Studio + Studio  
diff --git a/www/api/magick-property.html b/www/api/magick-property.html index 7a65d7b64..746cd5fcc 100644 --- a/www/api/magick-property.html +++ b/www/api/magick-property.html @@ -123,6 +123,9 @@ Sponsors:
+ @@ -1627,7 +1630,7 @@ _8c.html" target="source" name="MagickSetType">MagickSetType Discourse Server • - Studio + Studio  
diff --git a/www/api/magick-wand.html b/www/api/magick-wand.html index 31ddcec65..afab73cc3 100644 --- a/www/api/magick-wand.html +++ b/www/api/magick-wand.html @@ -123,9 +123,6 @@ Sponsors:
- diff --git a/www/api/magick.html b/www/api/magick.html index b82fb1d63..a1ea078b8 100644 --- a/www/api/magick.html +++ b/www/api/magick.html @@ -123,9 +123,6 @@ Sponsors:
- diff --git a/www/api/memory.html b/www/api/memory.html index 67dec59cd..71ec4984f 100644 --- a/www/api/memory.html +++ b/www/api/memory.html @@ -407,7 +407,7 @@ _8c.html" target="source" name="SetMagickMemoryMethods">SetMagickMemoryMethods  --> Discourse Server • - Studio + Studio  
diff --git a/www/api/module.html b/www/api/module.html index 0b25eb08d..5cdaf132f 100644 --- a/www/api/module.html +++ b/www/api/module.html @@ -519,7 +519,7 @@ _8c.html" target="source" name="UnregisterModule">UnregisterModule Discourse Server • - Studio + Studio  
diff --git a/www/api/paint.html b/www/api/paint.html index 8bde423b4..e0a0668c5 100644 --- a/www/api/paint.html +++ b/www/api/paint.html @@ -123,6 +123,9 @@ Sponsors:
+ @@ -326,7 +329,7 @@ _8c.html" target="source" name="TransparentPaintImageChroma">TransparentPaintIma Discourse Server • - Studio + Studio  
diff --git a/www/api/pixel-iterator.html b/www/api/pixel-iterator.html index 73b381dc9..0ea862e87 100644 --- a/www/api/pixel-iterator.html +++ b/www/api/pixel-iterator.html @@ -509,7 +509,7 @@ _8c.html" target="source" name="PixelSyncIterator">PixelSyncIterator Discourse Server • - Studio + Studio  
diff --git a/www/api/pixel-view.html b/www/api/pixel-view.html index dbed0407c..2cfea3764 100644 --- a/www/api/pixel-view.html +++ b/www/api/pixel-view.html @@ -570,7 +570,7 @@ _8c.html" target="source" name="UpdatePixelViewIterator">UpdatePixelViewIterator Discourse Server • - Studio + Studio   diff --git a/www/api/profile.html b/www/api/profile.html index 422eba70d..db88db720 100644 --- a/www/api/profile.html +++ b/www/api/profile.html @@ -379,7 +379,7 @@ _8c.html" target="source" name="SyncImageProfiles">SyncImageProfiles Discourse Server • - Studio + Studio   diff --git a/www/api/property.html b/www/api/property.html index 655959cd6..e34a46ca4 100644 --- a/www/api/property.html +++ b/www/api/property.html @@ -123,6 +123,9 @@ Sponsors:
+ diff --git a/www/api/quantize.html b/www/api/quantize.html index e3abf15f2..af53e78e1 100644 --- a/www/api/quantize.html +++ b/www/api/quantize.html @@ -123,9 +123,6 @@ Sponsors:
- diff --git a/www/api/resize.html b/www/api/resize.html index 2a7b9969b..ef43a3304 100644 --- a/www/api/resize.html +++ b/www/api/resize.html @@ -455,7 +455,7 @@ _8c.html" target="source" name="ZoomImage">ZoomImage Discourse Server • - Studio + Studio  
diff --git a/www/api/segment.html b/www/api/segment.html index 16a4cb4ab..0cd4e84c5 100644 --- a/www/api/segment.html +++ b/www/api/segment.html @@ -196,7 +196,7 @@ _8c.html" target="source" name="SegmentImage">SegmentImage Discourse Server • - Studio + Studio  
diff --git a/www/api/signature.html b/www/api/signature.html index 5203fdff0..7efd13902 100644 --- a/www/api/signature.html +++ b/www/api/signature.html @@ -123,9 +123,6 @@ Sponsors:
- @@ -182,7 +179,7 @@ _8c.html" target="source" name="SignatureImage">SignatureImage Discourse Server • - Studio + Studio  
diff --git a/www/api/stream.html b/www/api/stream.html index 9dad252f6..0edd87b77 100644 --- a/www/api/stream.html +++ b/www/api/stream.html @@ -211,7 +211,7 @@ _8c.html" target="source" name="WriteStream">WriteStream Discourse Server • - Studio + Studio   diff --git a/www/architecture.html b/www/architecture.html index c932d4f44..272580c29 100644 --- a/www/architecture.html +++ b/www/architecture.html @@ -1333,7 +1333,7 @@ ModuleExport unsigned long analyzeImage(Image **images,const int argc, Discourse Server • - Studio + Studio   diff --git a/www/binary-releases.html b/www/binary-releases.html index 4c5f3d40c..e153335b6 100644 --- a/www/binary-releases.html +++ b/www/binary-releases.html @@ -123,9 +123,6 @@ Sponsors:
- @@ -376,7 +373,7 @@ Discourse Server • - Studio + Studio  
diff --git a/www/color.html b/www/color.html index f62a46048..fef57777b 100644 --- a/www/color.html +++ b/www/color.html @@ -124,9 +124,6 @@ Sponsors:
- @@ -5021,7 +5018,7 @@ color swatch of that color and to convert to all the other color models. Discourse Server • - Studio + Studio  
diff --git a/www/command-line-options.html b/www/command-line-options.html index fbf875946..da66cacd1 100644 --- a/www/command-line-options.html +++ b/www/command-line-options.html @@ -5764,7 +5764,7 @@ percentage, which defaults to 100 percent (no color change).

Discourse Server • - Studio + Studio   diff --git a/www/command-line-tools.html b/www/command-line-tools.html index 9a66bdddf..a071cdc18 100644 --- a/www/command-line-tools.html +++ b/www/command-line-tools.html @@ -157,11 +157,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/composite.html b/www/composite.html index 2da0731ff..1c39d1b6f 100644 --- a/www/composite.html +++ b/www/composite.html @@ -603,7 +603,7 @@ transparent, extract, background, or shape the alpha channel Discourse Server • - Studio + Studio  
diff --git a/www/conjure.html b/www/conjure.html index 9ee12148e..214d1ba6d 100644 --- a/www/conjure.html +++ b/www/conjure.html @@ -124,6 +124,9 @@ Sponsors:
+ diff --git a/www/contact.html b/www/contact.html index 1506e5ccd..63826bb8b 100644 --- a/www/contact.html +++ b/www/contact.html @@ -163,7 +163,7 @@

Contact the Development Team

-

Use this form to contact the ImageMagick Wizards for any of the topics listed below. You can expect a reply within 24-48 hours if your submission concerns one of the approved topics listed below. For all other topics, post your message to the discourse server.

+

Use this form to contact the ImageMagick Wizards for any of the topics listed below. You can expect a reply within 24-48 hours if your submission concerns one of the approved topics listed below. For all other topics, post your message to the discourse server.

Contact the Wizards

Enter this code, diff --git a/www/convert.html b/www/convert.html index ea12f9808..25f308339 100644 --- a/www/convert.html +++ b/www/convert.html @@ -1278,7 +1278,7 @@ transparent, extract, background, or shape the alpha channel Discourse Server • - Studio + Studio   diff --git a/www/download.html b/www/download.html index c0b524510..9d1daa3cd 100644 --- a/www/download.html +++ b/www/download.html @@ -123,6 +123,9 @@ Sponsors:

+ diff --git a/www/escape.html b/www/escape.html index 5bbd92416..597d576f5 100644 --- a/www/escape.html +++ b/www/escape.html @@ -444,7 +444,7 @@ for an image with filename bird.miff and whose width is 512 and heigh Discourse Server • - Studio + Studio  
diff --git a/www/examples.html b/www/examples.html index 50b7339f7..bfeec350f 100644 --- a/www/examples.html +++ b/www/examples.html @@ -155,7 +155,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] @@ -167,7 +167,7 @@ Discourse Server • - Studio + Studio  
diff --git a/www/exception.html b/www/exception.html index 8e7c1b859..a14bc936a 100644 --- a/www/exception.html +++ b/www/exception.html @@ -357,7 +357,7 @@ Discourse Server • - Studio + Studio  
diff --git a/www/formats.html b/www/formats.html index 875edcfce..932ae72e1 100644 --- a/www/formats.html +++ b/www/formats.html @@ -1752,7 +1752,7 @@ the supported image formats.

Discourse Server • - Studio + Studio   diff --git a/www/fx.html b/www/fx.html index 13368e430..3ad95fffb 100644 --- a/www/fx.html +++ b/www/fx.html @@ -469,7 +469,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/high-dynamic-range.html b/www/high-dynamic-range.html index 21f812da3..a5620a2d9 100644 --- a/www/high-dynamic-range.html +++ b/www/high-dynamic-range.html @@ -195,7 +195,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/history.html b/www/history.html index a73e5459b..24fcb7f2c 100644 --- a/www/history.html +++ b/www/history.html @@ -167,7 +167,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.

It has been 20 years since ImageMagick was first conceived, and it looks likely that it will be here for another 20 and beyond. The command line and the application programming interface are stable, but there is still work to do. We are currently working on improving the conjure utility, Scalable Vector Graphics (SVG) support, and adding better support for video formats.

diff --git a/www/identify.html b/www/identify.html index 39e77f9a2..fb6beb682 100644 --- a/www/identify.html +++ b/www/identify.html @@ -433,7 +433,7 @@ transparent, extract, background, or shape the alpha channel Discourse Server • - Studio + Studio   diff --git a/www/import.html b/www/import.html index 97c300f56..6aaff8f93 100644 --- a/www/import.html +++ b/www/import.html @@ -498,7 +498,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/index.html b/www/index.html index 993ffa8d8..ecb45e51a 100644 --- a/www/index.html +++ b/www/index.html @@ -226,7 +226,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/install-source.html b/www/install-source.html index 2b11bdaa3..4633cc33e 100644 --- a/www/install-source.html +++ b/www/install-source.html @@ -226,7 +226,7 @@ to compile the program and on completion run the program.

Discourse Server • - Studio + Studio   diff --git a/www/jp2.html b/www/jp2.html index 475f4f77f..17becc69f 100644 --- a/www/jp2.html +++ b/www/jp2.html @@ -124,9 +124,6 @@ Sponsors:
- @@ -265,7 +262,7 @@ Discourse Server • - Studio + Studio  
diff --git a/www/license.html b/www/license.html index 53e595b77..a2860d4a9 100644 --- a/www/license.html +++ b/www/license.html @@ -277,7 +277,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/links.html b/www/links.html index 94ab4cfdd..da42797ab 100644 --- a/www/links.html +++ b/www/links.html @@ -163,23 +163,23 @@

Command-line Tutorials

@@ -187,18 +187,18 @@
@@ -206,10 +206,10 @@
@@ -217,24 +217,24 @@

ImageMagick Book Review

Mailing List Archives

@@ -242,13 +242,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
@@ -256,16 +256,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

@@ -275,7 +275,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/mirrors.html b/www/mirrors.html index b3136ecaf..65005d8a9 100644 --- a/www/mirrors.html +++ b/www/mirrors.html @@ -123,9 +123,6 @@ Sponsors:
- @@ -158,9 +155,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/perl-magick.html b/www/perl-magick.html index 5ac7027b8..d00288cf5 100644 --- a/www/perl-magick.html +++ b/www/perl-magick.html @@ -2549,7 +2549,7 @@ blobs in any of these image formats and provid Discourse Server • - Studio + Studio  
diff --git a/www/resources.html b/www/resources.html index e5d2bcc6d..df29fee5a 100644 --- a/www/resources.html +++ b/www/resources.html @@ -410,7 +410,7 @@ file or data stream.

Discourse Server • - Studio + Studio   diff --git a/www/sitemap.html b/www/sitemap.html index eb01fe3a9..6dadc6530 100644 --- a/www/sitemap.html +++ b/www/sitemap.html @@ -123,9 +123,6 @@ Sponsors:
- @@ -166,7 +163,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.
@@ -180,12 +177,12 @@
Download ImageMagick: ImageMagick source and binary distributions are available from a variety of FTP and Web mirrors.
@@ -224,7 +221,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.
@@ -234,21 +231,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.
@@ -266,8 +263,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.
@@ -277,7 +274,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.
@@ -301,9 +298,9 @@

Technology Sandbox

-
Fast Fourier Transforms Toolkit
-
Fourier Transform Processing With ImageMagick
-
ImageMagick v6 Examples -- Fourier Transforms
+
Fast Fourier Transforms Toolkit
+
Fourier Transform Processing With ImageMagick
+
ImageMagick v6 Examples -- Fourier Transforms
@@ -313,7 +310,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/t-shirt.html b/www/t-shirt.html index d651b7685..13b899808 100644 --- a/www/t-shirt.html +++ b/www/t-shirt.html @@ -194,7 +194,7 @@ Discourse Server • - Studio + Studio   -- 2.40.0