From: cristy Date: Sat, 27 Nov 2010 21:42:59 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~8445 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=771f7a7dfb2c4e71ae0561ea973c7a5b83033cfe;p=imagemagick --- diff --git a/ImageMagick.spec b/ImageMagick.spec index 8bfc9c9f1..1d8116d97 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,5 +1,5 @@ %global VERSION 6.6.6 -%global Patchlevel 0 +%global Patchlevel 1 Name: ImageMagick Version: %{VERSION} diff --git a/config/configure.xml b/config/configure.xml index c92cfe04e..31ffb0135 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -8,8 +8,8 @@ - - + + diff --git a/index.html b/index.html index ccecf4ea3..cba0289f3 100644 --- a/index.html +++ b/index.html @@ -127,7 +127,7 @@ diff --git a/libtool b/libtool index 05ea275a9..242009877 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.6-0 +# Generated automatically by config.status (ImageMagick) 6.6.6-1 # 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 f6dc937fd..66263aa12 100644 --- a/magick/version.h +++ b/magick/version.h @@ -30,11 +30,11 @@ extern "C" { #define MagickLibVersion 0x666 #define MagickLibVersionText "6.6.6" #define MagickLibVersionNumber 4,0,0 -#define MagickLibAddendum "-0" +#define MagickLibAddendum "-1" #define MagickLibInterface 4 #define MagickLibMinInterface 4 -#define MagickReleaseDate "2010-11-21" -#define MagickChangeDate "20101121" +#define MagickReleaseDate "2010-11-27" +#define MagickChangeDate "20101126" #define MagickAuthoritativeURL "http://www.imagemagick.org" #if defined(MAGICKCORE_OPENMP_SUPPORT) #define MagickOpenMPFeature "OpenMP " diff --git a/version.sh b/version.sh index eebc4193c..58a1405e3 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.6' PACKAGE_LIB_VERSION="0x666" -PACKAGE_RELEASE="0" +PACKAGE_RELEASE="1" PACKAGE_LIB_VERSION_NUMBER="6,6,6,${PACKAGE_RELEASE}" PACKAGE_RELEASE_DATE=`date +%F` PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION" diff --git a/www/ImageMagickObject.html b/www/ImageMagickObject.html index df315a65d..e86d42a36 100644 --- a/www/ImageMagickObject.html +++ b/www/ImageMagickObject.html @@ -128,7 +128,7 @@ diff --git a/www/advanced-unix-installation.html b/www/advanced-unix-installation.html index abff38c44..0ada18e67 100644 --- a/www/advanced-unix-installation.html +++ b/www/advanced-unix-installation.html @@ -147,9 +147,6 @@ - @@ -194,7 +191,7 @@

The configure script looks at your environment and decides what it can cobble together to get ImageMagick compiled and installed on your system. This includes finding a compiler, where your compiler header files are located (e.g. stdlib.h), and if any delegate libraries are available for ImageMagick to use (e.g. JPEG, PNG, TIFF, etc.). If you are willing to accept configure's default options, and build from within the source directory, you can simply type:

-

$magick> cd ImageMagick-6.6.5-10 $magick> ./configure

+

$magick> cd ImageMagick-6.6.5-0 $magick> ./configure

Watch the configure script output to verify that it finds everything that you think it should. Pay particular attention to the last lines of the script output. For example, here is a recent report from our system:

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

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

Unpack and change into the top-level ImageMagick directory:

-

$magick> tar xvfz ImageMagick-6.6.5-10.tar.gz $magick> cd ImageMagick-6.6.5-10

Configure ImageMagick:

+

$magick> tar xvfz ImageMagick-6.6.5-0.tar.gz $magick> cd ImageMagick-6.6.5-0

Configure ImageMagick:

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

Although you can download and install delegate libraries yourself, many are already available in the GnuWin32 distribution. Download and install whichever delegate libraries you require such as JPEG, PNG, TIFF, etc. Make sure you specify the development headers when you install a package. Next type,

-

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

+

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

Dealing with Unexpected Problems

diff --git a/www/advanced-windows-installation.html b/www/advanced-windows-installation.html index 4d5e3f8e3..fedee9b6b 100644 --- a/www/advanced-windows-installation.html +++ b/www/advanced-windows-installation.html @@ -147,9 +147,6 @@ -
@@ -446,7 +443,7 @@
  1. Double-click on - VisualMagick/bin/ImageMagick-6.6.5-10-Q16-windows-dll.exe + VisualMagick/bin/ImageMagick-6.6.5-0-Q16-windows-dll.exe to launch the ImageMagick binary distribution.
  2. Complete the installer screens to install ImageMagick on your system.
diff --git a/www/animate.html b/www/animate.html index 3c461cbf6..075192078 100644 --- a/www/animate.html +++ b/www/animate.html @@ -128,7 +128,7 @@ diff --git a/www/api.html b/www/api.html index c1deb8459..a33d861fd 100644 --- a/www/api.html +++ b/www/api.html @@ -127,7 +127,7 @@ @@ -178,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

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

@@ -202,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

@@ -240,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

@@ -252,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 c7064a523..f986c537c 100644 --- a/www/api/animate.html +++ b/www/api/animate.html @@ -147,9 +147,6 @@ - diff --git a/www/api/annotate.html b/www/api/annotate.html index 16534908d..41e8afe61 100644 --- a/www/api/annotate.html +++ b/www/api/annotate.html @@ -127,7 +127,7 @@ diff --git a/www/api/attribute.html b/www/api/attribute.html index 3058b41e8..94a4dc1f0 100644 --- a/www/api/attribute.html +++ b/www/api/attribute.html @@ -127,7 +127,7 @@ diff --git a/www/api/blob.html b/www/api/blob.html index 35cd9a89d..798435ef5 100644 --- a/www/api/blob.html +++ b/www/api/blob.html @@ -147,9 +147,6 @@ - diff --git a/www/api/cache-view.html b/www/api/cache-view.html index f782e2a2c..b918512b4 100644 --- a/www/api/cache-view.html +++ b/www/api/cache-view.html @@ -127,7 +127,7 @@ diff --git a/www/api/cache.html b/www/api/cache.html index f36e15b23..d4615cc53 100644 --- a/www/api/cache.html +++ b/www/api/cache.html @@ -127,7 +127,7 @@ diff --git a/www/api/cipher.html b/www/api/cipher.html index c529cc6e2..4a50c9e5d 100644 --- a/www/api/cipher.html +++ b/www/api/cipher.html @@ -127,7 +127,7 @@ diff --git a/www/api/color.html b/www/api/color.html index bd7f2a613..36cb4debd 100644 --- a/www/api/color.html +++ b/www/api/color.html @@ -127,7 +127,7 @@ diff --git a/www/api/colormap.html b/www/api/colormap.html index 15be1f848..c803d561d 100644 --- a/www/api/colormap.html +++ b/www/api/colormap.html @@ -127,7 +127,7 @@ diff --git a/www/api/compare.html b/www/api/compare.html index fe33314a2..0c8cfd234 100644 --- a/www/api/compare.html +++ b/www/api/compare.html @@ -127,7 +127,7 @@ diff --git a/www/api/composite.html b/www/api/composite.html index 623e26e34..70f3c47d5 100644 --- a/www/api/composite.html +++ b/www/api/composite.html @@ -127,7 +127,7 @@ diff --git a/www/api/constitute.html b/www/api/constitute.html index 774bea12d..97e6fa2c9 100644 --- a/www/api/constitute.html +++ b/www/api/constitute.html @@ -147,9 +147,6 @@ - diff --git a/www/api/decorate.html b/www/api/decorate.html index 6b516c7c9..34d632079 100644 --- a/www/api/decorate.html +++ b/www/api/decorate.html @@ -147,9 +147,6 @@ - diff --git a/www/api/deprecate.html b/www/api/deprecate.html index 27aeacc2c..55add6036 100644 --- a/www/api/deprecate.html +++ b/www/api/deprecate.html @@ -127,7 +127,7 @@ diff --git a/www/api/display.html b/www/api/display.html index 9a10b430b..0f10e6998 100644 --- a/www/api/display.html +++ b/www/api/display.html @@ -127,7 +127,7 @@ diff --git a/www/api/distort.html b/www/api/distort.html index 6583f3e44..ae5b0e0be 100644 --- a/www/api/distort.html +++ b/www/api/distort.html @@ -127,7 +127,7 @@ diff --git a/www/api/draw.html b/www/api/draw.html index ae0746d44..656f369b7 100644 --- a/www/api/draw.html +++ b/www/api/draw.html @@ -127,7 +127,7 @@ diff --git a/www/api/drawing-wand.html b/www/api/drawing-wand.html index 1c7e26896..c8f48e863 100644 --- a/www/api/drawing-wand.html +++ b/www/api/drawing-wand.html @@ -147,9 +147,6 @@ - @@ -170,7 +167,7 @@
- +

ClearDrawingWand

@@ -729,6 +726,31 @@ _8c.html" target="source" name="DrawGetFontFamily">DrawGetFontFamily

DrawGetFontResolution

+
+ +

DrawGetFontResolution() gets the image X and Y resolution.

+ +

The format of the DrawGetFontResolution method is:

+ +
+  DrawBooleanType DrawGetFontResolution(const DrawingWand *wand,
+    double *x,double *y)
+
+ +

A description of each parameter follows:

+ +
wand
+

    the magick wand.

+ +
x
+

    the x-resolution.

+ +
y
+

    the y-resolution.

+ +
+

DrawGetFontSize

@@ -2264,6 +2286,31 @@ _8c.html" target="source" name="DrawSetFillOpacity">DrawSetFillOpacity

DrawSetFontResolution

+
+ +

DrawSetFontResolution() sets the image resolution.

+ +

The format of the DrawSetFontResolution method is:

+ +
+  DrawBooleanType DrawSetFontResolution(DrawingWand *wand,
+    const double x_resolution,const doubtl y_resolution)
+
+ +

A description of each parameter follows:

+ +
wand
+

    the magick wand.

+ +
x_resolution
+

    the image x resolution.

+ +
y_resolution
+

    the image y resolution.

+ +
+

DrawSetOpacity

diff --git a/www/api/effect.html b/www/api/effect.html index 3d2d16cc6..de768e8c4 100644 --- a/www/api/effect.html +++ b/www/api/effect.html @@ -127,7 +127,7 @@
diff --git a/www/api/enhance.html b/www/api/enhance.html index 3a8c7da9f..c6f03286e 100644 --- a/www/api/enhance.html +++ b/www/api/enhance.html @@ -147,9 +147,6 @@ - diff --git a/www/api/exception.html b/www/api/exception.html index d84415bec..d6dd094ae 100644 --- a/www/api/exception.html +++ b/www/api/exception.html @@ -127,7 +127,7 @@ diff --git a/www/api/feature.html b/www/api/feature.html index 5f51c2326..0fcfaa28d 100644 --- a/www/api/feature.html +++ b/www/api/feature.html @@ -127,7 +127,7 @@ diff --git a/www/api/fx.html b/www/api/fx.html index 5fe0120e2..859ae515a 100644 --- a/www/api/fx.html +++ b/www/api/fx.html @@ -127,7 +127,7 @@ diff --git a/www/api/histogram.html b/www/api/histogram.html index de8c7bcc8..8f0b609fd 100644 --- a/www/api/histogram.html +++ b/www/api/histogram.html @@ -127,7 +127,7 @@ diff --git a/www/api/image-view.html b/www/api/image-view.html index b56d4c60a..79c928a84 100644 --- a/www/api/image-view.html +++ b/www/api/image-view.html @@ -127,7 +127,7 @@ diff --git a/www/api/image.html b/www/api/image.html index 51b432a44..065bfdaac 100644 --- a/www/api/image.html +++ b/www/api/image.html @@ -127,7 +127,7 @@ diff --git a/www/api/layer.html b/www/api/layer.html index 8bf22b976..2a67c2e7d 100644 --- a/www/api/layer.html +++ b/www/api/layer.html @@ -127,7 +127,7 @@ diff --git a/www/api/list.html b/www/api/list.html index 9a57fc2e8..b0ece8864 100644 --- a/www/api/list.html +++ b/www/api/list.html @@ -127,7 +127,7 @@ diff --git a/www/api/magick-deprecate.html b/www/api/magick-deprecate.html index 453e8a5f4..fe544b54d 100644 --- a/www/api/magick-deprecate.html +++ b/www/api/magick-deprecate.html @@ -147,9 +147,6 @@ - diff --git a/www/api/magick-image.html b/www/api/magick-image.html index d2b5f1aef..22d76cac4 100644 --- a/www/api/magick-image.html +++ b/www/api/magick-image.html @@ -127,7 +127,7 @@ diff --git a/www/api/magick-property.html b/www/api/magick-property.html index 2ec8dca47..a927c5773 100644 --- a/www/api/magick-property.html +++ b/www/api/magick-property.html @@ -127,7 +127,7 @@ @@ -170,7 +167,7 @@
- +

MagickDeleteImageArtifact

@@ -780,6 +777,31 @@ _8c.html" target="source" name="MagickGetReleaseDate">MagickGetReleaseDate

MagickGetResolution

+
+ +

MagickGetResolution() gets the image X and Y resolution.

+ +

The format of the MagickGetResolution method is:

+ +
+  MagickBooleanType MagickGetResolution(const MagickWand *wand,double *x,
+    double *y)
+
+ +

A description of each parameter follows:

+ +
wand
+

    the magick wand.

+ +
x
+

    the x-resolution.

+ +
y
+

    the y-resolution.

+ +
+

MagickGetResource

diff --git a/www/api/magick-wand.html b/www/api/magick-wand.html index c74905481..493fad587 100644 --- a/www/api/magick-wand.html +++ b/www/api/magick-wand.html @@ -127,7 +127,7 @@
diff --git a/www/api/magick.html b/www/api/magick.html index 96dabad5b..c5ce7d2f9 100644 --- a/www/api/magick.html +++ b/www/api/magick.html @@ -127,7 +127,7 @@
diff --git a/www/api/memory.html b/www/api/memory.html index 5d79d947a..9dc9e435c 100644 --- a/www/api/memory.html +++ b/www/api/memory.html @@ -127,7 +127,7 @@ diff --git a/www/api/module.html b/www/api/module.html index 4713f1775..69f6fb2d0 100644 --- a/www/api/module.html +++ b/www/api/module.html @@ -147,9 +147,6 @@ - diff --git a/www/api/mogrify.html b/www/api/mogrify.html index 123e4d347..398f79a61 100644 --- a/www/api/mogrify.html +++ b/www/api/mogrify.html @@ -127,7 +127,7 @@ diff --git a/www/api/monitor.html b/www/api/monitor.html index 47da81520..95537b4e3 100644 --- a/www/api/monitor.html +++ b/www/api/monitor.html @@ -127,7 +127,7 @@ diff --git a/www/api/montage.html b/www/api/montage.html index d96534ae6..007dee395 100644 --- a/www/api/montage.html +++ b/www/api/montage.html @@ -127,7 +127,7 @@ diff --git a/www/api/morphology.html b/www/api/morphology.html index cb92f7eaf..285d8a3e2 100644 --- a/www/api/morphology.html +++ b/www/api/morphology.html @@ -127,7 +127,7 @@ diff --git a/www/api/paint.html b/www/api/paint.html index 291dcefd0..049acb1fb 100644 --- a/www/api/paint.html +++ b/www/api/paint.html @@ -127,7 +127,7 @@ diff --git a/www/api/pixel-iterator.html b/www/api/pixel-iterator.html index 483a96b78..0a16f0133 100644 --- a/www/api/pixel-iterator.html +++ b/www/api/pixel-iterator.html @@ -127,7 +127,7 @@ diff --git a/www/api/pixel-wand.html b/www/api/pixel-wand.html index eda1a5c36..972bdc8ef 100644 --- a/www/api/pixel-wand.html +++ b/www/api/pixel-wand.html @@ -127,7 +127,7 @@ diff --git a/www/api/profile.html b/www/api/profile.html index e63767b30..32756b1f3 100644 --- a/www/api/profile.html +++ b/www/api/profile.html @@ -127,7 +127,7 @@ diff --git a/www/api/property.html b/www/api/property.html index 7c8028c3c..f6fd6160b 100644 --- a/www/api/property.html +++ b/www/api/property.html @@ -147,9 +147,6 @@ - diff --git a/www/api/quantize.html b/www/api/quantize.html index b302bb54c..7e6182c30 100644 --- a/www/api/quantize.html +++ b/www/api/quantize.html @@ -127,7 +127,7 @@ diff --git a/www/api/registry.html b/www/api/registry.html index 447adffc0..f945bb3a8 100644 --- a/www/api/registry.html +++ b/www/api/registry.html @@ -127,7 +127,7 @@ diff --git a/www/api/resize.html b/www/api/resize.html index 5cc599c0d..29c52fdc7 100644 --- a/www/api/resize.html +++ b/www/api/resize.html @@ -147,9 +147,6 @@ - diff --git a/www/api/resource.html b/www/api/resource.html index 5a12d7b9b..6dfd96187 100644 --- a/www/api/resource.html +++ b/www/api/resource.html @@ -127,7 +127,7 @@ diff --git a/www/api/segment.html b/www/api/segment.html index 31ebca900..624a00373 100644 --- a/www/api/segment.html +++ b/www/api/segment.html @@ -147,9 +147,6 @@ - diff --git a/www/api/shear.html b/www/api/shear.html index 84ecbfaff..46f35f7a8 100644 --- a/www/api/shear.html +++ b/www/api/shear.html @@ -127,7 +127,7 @@ diff --git a/www/api/signature.html b/www/api/signature.html index 29d8c5b3d..3aa2d414b 100644 --- a/www/api/signature.html +++ b/www/api/signature.html @@ -127,7 +127,7 @@ diff --git a/www/api/statistic.html b/www/api/statistic.html index 0f0e26ae6..cbc7e780e 100644 --- a/www/api/statistic.html +++ b/www/api/statistic.html @@ -147,9 +147,6 @@ - diff --git a/www/api/stream.html b/www/api/stream.html index 683de903f..a7a7339d7 100644 --- a/www/api/stream.html +++ b/www/api/stream.html @@ -127,7 +127,7 @@ diff --git a/www/api/transform.html b/www/api/transform.html index 2d97c2de7..df7098a1f 100644 --- a/www/api/transform.html +++ b/www/api/transform.html @@ -127,7 +127,7 @@ diff --git a/www/api/version.html b/www/api/version.html index a2a56511b..701e304b9 100644 --- a/www/api/version.html +++ b/www/api/version.html @@ -147,9 +147,6 @@ - diff --git a/www/api/wand-view.html b/www/api/wand-view.html index 7d3cbf689..cfacc36b4 100644 --- a/www/api/wand-view.html +++ b/www/api/wand-view.html @@ -147,9 +147,6 @@ - diff --git a/www/architecture.html b/www/architecture.html index b811e47cf..7b22f6dc0 100644 --- a/www/architecture.html +++ b/www/architecture.html @@ -127,7 +127,7 @@ @@ -257,7 +254,7 @@

When the pixel cache is initialized, pixels are scaled from whatever bit depth they originated from to that required by the pixel cache. For example, a 1-channel 1-bit monochrome PBM image is scaled to a 4 channel 8-bit RGBA image, if you are using the Q8 version of ImageMagick, and 16-bit RGBA for the Q16 version. You can determine which version you have with the ‑version option:

-

$magick> identify -versionVersion: ImageMagick 6.6.5-10 2010-100-100 Q16 http://www.imagemagick.org

+

$magick> identify -versionVersion: ImageMagick 6.6.5-0 2010-00-00 Q16 http://www.imagemagick.org

As you can see, the convenience of the pixel cache sometimes comes with a trade-off in storage (e.g. storing a 1-bit monochrome image as 16-bit RGBA is wasteful) and speed (i.e. storing the entire image in memory is generally slower than accessing one scanline of pixels at a time). In most cases, the benefits of the pixel cache typically outweigh any disadvantages.

diff --git a/www/binary-releases.html b/www/binary-releases.html index 364c0f6ac..a4b67ad89 100644 --- a/www/binary-releases.html +++ b/www/binary-releases.html @@ -127,7 +127,7 @@ @@ -192,16 +189,16 @@ - ImageMagick-6.6.5-10.i386.rpm - download - download + ImageMagick-6.6.5-0.i386.rpm + download + download CentOS 5.4 i386 RPM - ImageMagick-6.6.5-10.x86_64.rpm - download - download + ImageMagick-6.6.5-0.x86_64.rpm + download + download CentOS 5.4 x86_64 RPM @@ -231,7 +228,7 @@

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

-

$magick> rpm -Uvh ImageMagick-6.6.5-10.i386.rpm

+

$magick> rpm -Uvh ImageMagick-6.6.5-0.i386.rpm

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

$magick> cd $HOME

@@ -273,9 +270,9 @@ - ImageMagick-x86_64-apple-darwin10.4.0.tar.gz - download - download + ImageMagick-x86_64-apple-darwin10.5.0.tar.gz + download + download Mac OS X Snow Leopard 10.6 (Intel) @@ -287,7 +284,7 @@

$magick> cd $HOME

Next, extract the contents of the package. For example:

-

$magick> tar xvfz ImageMagick-x86_64-apple-darwin10.4.0.tar.gz

+

$magick> tar xvfz ImageMagick-x86_64-apple-darwin10.5.0.tar.gz

Set the MAGICK_HOME environment variable to the path where you extracted the ImageMagick files. For example:

$magick> export MAGICK_HOME="$HOME/ImageMagick-6.6.5"

@@ -315,7 +312,7 @@

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

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

+ImageMagick-6.6.5-0-Q16-windows-dll.exe.

@@ -327,44 +324,44 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + diff --git a/www/changelog.html b/www/changelog.html index ae0421441..9e88ea175 100644 --- a/www/changelog.html +++ b/www/changelog.html @@ -127,7 +127,7 @@ @@ -170,7 +167,12 @@
-
    2010-11-21 6.6.5-10 Cristy <quetzlzacatenango@image...>
    +
      2010-11-26 6.6.6-0 Glenn Randers-Pehrson <glennrp@image...>
      +
    • Fixed two more cases where the PNG encoder lost transparency (reference
      http://www.imagemagick.org/discourse-server/viewtopic.html?f=3&t=17516).
      +
    • 2010-11-23 6.6.6-0 Cristy <quetzlzacatenango@image...>
      +
    • The policy.xml sets not-to-exceed resource values (e.g. policy memory limit 1GB, -limit 2GB exceeds policy maximum so memory limit is 1GB).
    • +
    • Support NCC (normalized cross correlation) compare metric.

    • +
      2010-11-21 6.6.5-10 Cristy <quetzlzacatenango@image...>
    • Fix png coder compile error when HDRI is enabled.

    • 2010-11-17 6.6.5-9 Glenn Randers-Pehrson <glennrp@image...>
    • Many of the problems with the PNG encoder have been fixed (reference http://www.imagemagick.org/discourse-server/viewtopic.html?f=3&t=16490).
    • diff --git a/www/cipher.html b/www/cipher.html index 303dead47..be971f713 100644 --- a/www/cipher.html +++ b/www/cipher.html @@ -148,9 +148,6 @@ -
diff --git a/www/color.html b/www/color.html index 0046fd15f..bce19c3f3 100644 --- a/www/color.html +++ b/www/color.html @@ -128,7 +128,7 @@ diff --git a/www/command-line-options.html b/www/command-line-options.html index 8c2a38db9..c6e9a26ea 100644 --- a/www/command-line-options.html +++ b/www/command-line-options.html @@ -131,7 +131,7 @@ @@ -4161,16 +4158,17 @@ style="background-color: #bdbdbd;">this shade of gray.

MAE mean absolute error (normalized), average channel error distance MEPP mean error per pixel (normalized mean error, normalized peak error) MSE mean error squared, average of the channel error squared + NCC normalized cross correlation PAE peak absolute (normalize peak absolute) PSNR peak signal to noise ratio RMSE root mean squared (normalized root mean squared) -

The 'AE' or absolute count of pixels that are different, can be -controlled using a -fuzz factor to ignore pixels which -only changed by a small amount. The 'PAE' can be used to find the +

Control the 'AE', or absolute count of pixels that are different, +with the -fuzz factor (ignore pixels which +only changed by a small amount). Use 'PAE' to find the size of the -fuzz factor needed to make all pixels -'similar', while 'MAE' can be used to find out the factor needed +'similar', while 'MAE' dtermines the factor needed for about half the pixels to be similar.

The 'MEPP' metric returns three different metrics diff --git a/www/command-line-processing.html b/www/command-line-processing.html index b3d0be12b..f6f0231ca 100644 --- a/www/command-line-processing.html +++ b/www/command-line-processing.html @@ -127,7 +127,7 @@

diff --git a/www/command-line-tools.html b/www/command-line-tools.html index ff50d9b30..13dc46840 100644 --- a/www/command-line-tools.html +++ b/www/command-line-tools.html @@ -127,7 +127,7 @@ @@ -172,11 +169,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 ba0e9ed4b..f09797a13 100644 --- a/www/compare.html +++ b/www/compare.html @@ -128,7 +128,7 @@
@@ -277,7 +274,7 @@ transparent, extract, background, or shape the alpha channel - + @@ -386,7 +383,7 @@ transparent, extract, background, or shape the alpha channel - + diff --git a/www/compose.html b/www/compose.html index 91ee8fe04..ec9b39ecb 100644 --- a/www/compose.html +++ b/www/compose.html @@ -148,9 +148,6 @@ - diff --git a/www/composite.html b/www/composite.html index d40179a63..55c27cf20 100644 --- a/www/composite.html +++ b/www/composite.html @@ -128,7 +128,7 @@ diff --git a/www/conjure.html b/www/conjure.html index a42849491..57980233f 100644 --- a/www/conjure.html +++ b/www/conjure.html @@ -128,7 +128,7 @@ diff --git a/www/contact.html b/www/contact.html index 770f22d02..7baa7f6ac 100644 --- a/www/contact.html +++ b/www/contact.html @@ -127,7 +127,7 @@ @@ -178,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. Do not use this form to send solicitations / advertisements. Be assured you will not get a response.

+

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. Do not use this form to send solicitations / advertisements. Be assured you will not get a response.

Contact the Wizards

Enter this code, diff --git a/www/convert.html b/www/convert.html index 06e15507a..21f22048c 100644 --- a/www/convert.html +++ b/www/convert.html @@ -128,7 +128,7 @@

diff --git a/www/display.html b/www/display.html index 80bbd5926..3c7857b09 100644 --- a/www/display.html +++ b/www/display.html @@ -128,7 +128,7 @@ diff --git a/www/download.html b/www/download.html index fbd0acbe4..a671ec134 100644 --- a/www/download.html +++ b/www/download.html @@ -127,7 +127,7 @@ @@ -172,7 +169,7 @@

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

-

The latest release of ImageMagick is version 6.6.5-10.

+

The latest release of ImageMagick is version 6.6.5-0.

Australia
ftp://mirror.aarnet.edu.au/pub/ImageMagick/
diff --git a/www/escape.html b/www/escape.html index 2c4cc6b63..5c63ae163 100644 --- a/www/escape.html +++ b/www/escape.html @@ -128,7 +128,7 @@ diff --git a/www/examples.html b/www/examples.html index 1f978c71d..7379f2163 100644 --- a/www/examples.html +++ b/www/examples.html @@ -127,7 +127,7 @@ @@ -170,7 +167,7 @@
-

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


+

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


[ImageMagick] diff --git a/www/exception.html b/www/exception.html index 9b5853f36..7b59c6265 100644 --- a/www/exception.html +++ b/www/exception.html @@ -127,7 +127,7 @@
diff --git a/www/formats.html b/www/formats.html index a8bc7112d..ea48e07b4 100644 --- a/www/formats.html +++ b/www/formats.html @@ -128,7 +128,7 @@
diff --git a/www/fx.html b/www/fx.html index ad045a5d1..d3541ecab 100644 --- a/www/fx.html +++ b/www/fx.html @@ -128,7 +128,7 @@ diff --git a/www/high-dynamic-range.html b/www/high-dynamic-range.html index ea7120c48..f3816b174 100644 --- a/www/high-dynamic-range.html +++ b/www/high-dynamic-range.html @@ -127,7 +127,7 @@ diff --git a/www/history.html b/www/history.html index 972604a30..70cdac253 100644 --- a/www/history.html +++ b/www/history.html @@ -127,7 +127,7 @@ @@ -182,7 +179,7 @@ I swear by my life and my love of it that I will never live for the sake of anot

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

-

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

+

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

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

diff --git a/www/identify.html b/www/identify.html index d33d9fd16..70093b1e2 100644 --- a/www/identify.html +++ b/www/identify.html @@ -127,7 +127,7 @@ @@ -240,7 +237,7 @@ Tainted: False
Filesize: 3.97266kb
Number pixels: 3.14453kb
- Version: ImageMagick 6.6.5-10 2010-100-100 Q16 http://www.imagemagick.org

+ Version: ImageMagick 6.6.5-0 2010-00-00 Q16 http://www.imagemagick.org

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

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

diff --git a/www/import.html b/www/import.html index 23e565d7a..b75870075 100644 --- a/www/import.html +++ b/www/import.html @@ -128,7 +128,7 @@ diff --git a/www/index.html b/www/index.html index 46288235b..18507c87d 100644 --- a/www/index.html +++ b/www/index.html @@ -127,7 +127,7 @@ diff --git a/www/install-source.html b/www/install-source.html index 21fce76ec..99e6d8727 100644 --- a/www/install-source.html +++ b/www/install-source.html @@ -127,7 +127,7 @@ diff --git a/www/jp2.html b/www/jp2.html index f25e52551..b2d840ad5 100644 --- a/www/jp2.html +++ b/www/jp2.html @@ -148,9 +148,6 @@ - diff --git a/www/license.html b/www/license.html index 9e94efb8c..fb64e1f87 100644 --- a/www/license.html +++ b/www/license.html @@ -127,7 +127,7 @@ diff --git a/www/links.html b/www/links.html index 19b1c3dd7..2d821c232 100644 --- a/www/links.html +++ b/www/links.html @@ -127,7 +127,7 @@ @@ -222,6 +219,7 @@
ImageMagick-6.6.5-10-Q16-windows-dll.exedownloaddownloadImageMagick-6.6.5-0-Q16-windows-dll.exedownloaddownload Win32 dynamic at 16 bits-per-pixel
ImageMagick-6.6.5-10-Q16-windows-x64-dll.exedownloaddownloadImageMagick-6.6.5-0-Q16-windows-x64-dll.exedownloaddownload Win64 dynamic at 16 bits-per-pixel
ImageMagick-6.6.5-10-Q8-windows-dll.exedownloaddownloadImageMagick-6.6.5-0-Q8-windows-dll.exedownloaddownload Win32 dynamic at 8 bits-per-pixel
ImageMagick-6.6.5-10-Q16-windows-static.exedownloaddownloadImageMagick-6.6.5-0-Q16-windows-static.exedownloaddownload Win32 static at 16 bits-per-pixel
ImageMagick-6.6.5-10-Q16-windows-x64-static.exedownloaddownloadImageMagick-6.6.5-0-Q16-windows-x64-static.exedownloaddownload Win64 static at 16 bits-per-pixel
ImageMagick-6.6.5-10-Q8-windows-static.exedownloaddownloadImageMagick-6.6.5-0-Q8-windows-static.exedownloaddownload Win32 static at 8 bits-per-pixel
-disimilarity-threshold valuemaximum RMSE for (sub)image match (default 0.2)maximum distortion for (sub)image match (default 0.2)
-subimage-search-subimage-search search for subimage