diff --git a/ImageMagick.spec b/ImageMagick.spec
index 9f1bdaa..79ea9d1 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,5 +1,5 @@
%global VERSION 6.6.9
-%global Patchlevel 4
+%global Patchlevel 5
Name: ImageMagick
Version: %{VERSION}
diff --git a/config/configure.xml b/config/configure.xml
index a3aae96..7274f95 100644
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -9,9 +9,9 @@
<configure name="NAME" value="ImageMagick"/>
<configure name="VERSION" value="6.6.9"/>
<configure name="LIB_VERSION" value="0x669"/>
- <configure name="LIB_VERSION_NUMBER" value="6,6,9,4"/>
+ <configure name="LIB_VERSION_NUMBER" value="6,6,9,5"/>
<configure name="SVN_REVISION" value="4138" />
- <configure name="RELEASE_DATE" value="2011-04-01"/>
+ <configure name="RELEASE_DATE" value="2011-04-06"/>
<configure name="CONFIGURE" value="./configure "/>
<configure name="PREFIX" value="/usr/local"/>
<configure name="EXEC-PREFIX" value="/usr/local"/>
diff --git a/index.html b/index.html
index 8de8387..97d69e1 100644
--- a/index.html
+++ b/index.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
+ <a title="Sponsor: Autoteile Online Shop" href="http://www.autoteile-carparts.de">Autoteile Online Shop</a><!-- 2011070100030 autoteile-Carparts-->
</div>
</div>
</div>
@@ -209,7 +209,7 @@
<p>The ImageMagick development process ensures a stable API and ABI. Before each ImageMagick release, we perform a comprehensive security assessment that includes <a href="http://www.valgrind.org">memory and thread</a> error detection to prevent security vulnerabilities.</p>
-<p>The current release is ImageMagick 6.6.9-3.</p>
+<p>The current release is ImageMagick 6.6.9-4.</p>
</div>
diff --git a/libtool b/libtool
index eb75781..e74ce33 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.9-4
+# Generated automatically by config.status (ImageMagick) 6.6.9-5
# 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 a78313f..11fa9de 100644
--- a/magick/version.h
+++ b/magick/version.h
@@ -31,11 +31,11 @@
#define MagickLibVersion 0x669
#define MagickLibVersionText "6.6.9"
#define MagickLibVersionNumber 4,0,1
-#define MagickLibAddendum "-4"
+#define MagickLibAddendum "-5"
#define MagickLibInterface 4
#define MagickLibMinInterface 4
-#define MagickReleaseDate "2011-04-01"
-#define MagickChangeDate "20110401"
+#define MagickReleaseDate "2011-04-06"
+#define MagickChangeDate "20110403"
#define MagickAuthoritativeURL "http://www.imagemagick.org"
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#define MagickOpenMPFeature "OpenMP "
diff --git a/utilities/convert.1 b/utilities/convert.1
index 7fb8be8..8925214 100644
--- a/utilities/convert.1
+++ b/utilities/convert.1
@@ -156,8 +156,8 @@
\-level value adjust the level of image contrast
\-linear-stretch geometry
improve contrast by `stretching with saturation' the intensity range
- \-median radius apply a median filter to the image
- \-mode radius make each pixel the 'predominate color' of the neighborhood
+ \-median geometry apply a median filter to the image
+ \-mode geometry make each pixel the 'predominate color' of the neighborhood
\-modulate value vary the brightness, saturation, and hue
\-monochrome transform image to black and white
\-morphology method kernel
@@ -165,7 +165,7 @@
\-motion-blur geometry
simulate motion blur
\-negate replace each pixel with its complementary color
- \-noise radius add or reduce noise in an image
+ \-noise geometry add or reduce noise in an image
\-normalize transform image to span the full range of colors
\-opaque color change this color to the fill color
\-ordered-dither NxN
diff --git a/utilities/mogrify.1 b/utilities/mogrify.1
index ae7b27f..a55674b 100644
--- a/utilities/mogrify.1
+++ b/utilities/mogrify.1
@@ -158,14 +158,14 @@
\-level value adjust the level of image contrast
\-linear-stretch geometry
improve contrast by `stretching with saturation' the intensity range
- \-median radius apply a median filter to the image
- \-mode radius make each pixel the 'predominate color' of the neighborhood
+ \-median geometry apply a median filter to the image
+ \-mode geometry make each pixel the 'predominate color' of the neighborhood
\-modulate value vary the brightness, saturation, and hue
\-monochrome transform image to black and white
\-motion-blur geometry
simulate motion blur
\-negate replace each pixel with its complementary color
- \-noise radius add or reduce noise in an image
+ \-noise geometry add or reduce noise in an image
\-normalize transform image to span the full range of colors
\-opaque color change this color to the fill color
\-ordered-dither NxN
diff --git a/version.sh b/version.sh
index c4730bc..c485057 100644
--- a/version.sh
+++ b/version.sh
@@ -12,7 +12,7 @@
# PACKAGE_NAME (e.g. "1.0.0").
PACKAGE_VERSION='6.6.9'
PACKAGE_LIB_VERSION="0x669"
-PACKAGE_RELEASE="4"
+PACKAGE_RELEASE="5"
PACKAGE_LIB_VERSION_NUMBER="6,6,9,${PACKAGE_RELEASE}"
PACKAGE_RELEASE_DATE=`date +%F`
PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION"
diff --git a/www/ImageMagickObject.html b/www/ImageMagickObject.html
index 83b514f..8cccef2 100644
--- a/www/ImageMagickObject.html
+++ b/www/ImageMagickObject.html
@@ -185,7 +185,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Fototapete" href=" http://www.allesdruck.de/Fototapete-Tapetendruck,category,8830.html">Fototapete</a><!-- 20110701000080 a-o.de -->
+ <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
</div>
</div>
</div>
diff --git a/www/advanced-unix-installation.html b/www/advanced-unix-installation.html
index bd125c0..798e5b1 100644
--- a/www/advanced-unix-installation.html
+++ b/www/advanced-unix-installation.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
+ <a title="Sponsor: Fototapete" href=" http://www.allesdruck.de/Fototapete-Tapetendruck,category,8830.html">Fototapete</a><!-- 20110701000080 a-o.de -->
</div>
</div>
</div>
@@ -221,7 +221,7 @@
<p>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:</p>
-<p class='crt'><span class="crtprompt"> $magick> </span><span class='crtin'>cd ImageMagick-6.6.9-3</span><span class='crtout'></span><span class="crtprompt"> $magick> </span><span class='crtin'>./configure</span></p>
+<p class='crt'><span class="crtprompt"> $magick> </span><span class='crtin'>cd ImageMagick-6.6.9-4</span><span class='crtout'></span><span class="crtprompt"> $magick> </span><span class='crtin'>./configure</span></p>
<p>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:</p>
@@ -573,7 +573,7 @@
<div class="doc-section">
<p><a href="../www/download.html">Download</a> the ImageMagick source distribution and verify the distribution against its <a href="http://www.imagemagick.org/download/digest.rdf">message digest</a>.</p>
<p>Unpack and change into the top-level ImageMagick directory:</p>
- <p class='crt'><span class="crtprompt"> $magick> </span><span class='crtin'>tar xvfz ImageMagick-6.6.9-3.tar.gz</span><span class='crtout'></span><span class="crtprompt"> $magick> </span><span class='crtin'>cd ImageMagick-6.6.9-3</span></p> <p>Configure ImageMagick:</p>
+ <p class='crt'><span class="crtprompt"> $magick> </span><span class='crtin'>tar xvfz ImageMagick-6.6.9-4.tar.gz</span><span class='crtout'></span><span class="crtprompt"> $magick> </span><span class='crtin'>cd ImageMagick-6.6.9-4</span></p> <p>Configure ImageMagick:</p>
<p class='crt'><span class="crtprompt"> $magick> </span><span class='crtin'>./configure --prefix=/opt --with-quantum-depth=16 \ <br/>
--disable-dependency-tracking --with-x=yes \ <br/>
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib/ \ <br/>
@@ -593,7 +593,7 @@
<p>Although you can download and install delegate libraries yourself, many are already available in the <a href="http://gnuwin32.sourceforge.net/">GnuWin32</a> 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,</p>
-<p class='crt'><span class="crtprompt"> $magick> </span><span class='crtin'>tar jxvf ImageMagick-6.6.9-?.tar.bz2</span><span class='crtout'></span><span class="crtprompt"> $magick> </span><span class='crtin'>cd ImageMagick-6.6.9-3</span><span class='crtout'></span><span class="crtprompt"> $magick> </span><span class='crtin'>export CPPFLAGS="-Ic:/Progra~1/GnuWin32/include"</span><span class='crtout'></span><span class="crtprompt"> $magick> </span><span class='crtin'>export LDFLAGS="-Lc:/Progra~1/GnuWin32/lib"</span><span class='crtout'></span><span class="crtprompt"> $magick> </span><span class='crtin'>./configure --without-perl</span><span class='crtout'></span><span class="crtprompt"> $magick> </span><span class='crtin'>make</span><span class='crtout'></span><span class="crtprompt"> $magick> </span><span class='crtin'>sudo make install</span></p></div>
+<p class='crt'><span class="crtprompt"> $magick> </span><span class='crtin'>tar jxvf ImageMagick-6.6.9-?.tar.bz2</span><span class='crtout'></span><span class="crtprompt"> $magick> </span><span class='crtin'>cd ImageMagick-6.6.9-4</span><span class='crtout'></span><span class="crtprompt"> $magick> </span><span class='crtin'>export CPPFLAGS="-Ic:/Progra~1/GnuWin32/include"</span><span class='crtout'></span><span class="crtprompt"> $magick> </span><span class='crtin'>export LDFLAGS="-Lc:/Progra~1/GnuWin32/lib"</span><span class='crtout'></span><span class="crtprompt"> $magick> </span><span class='crtin'>./configure --without-perl</span><span class='crtout'></span><span class="crtprompt"> $magick> </span><span class='crtin'>make</span><span class='crtout'></span><span class="crtprompt"> $magick> </span><span class='crtin'>sudo make install</span></p></div>
<h2><a id="problems"></a>Dealing with Unexpected Problems</h2>
<div class="doc-section">
diff --git a/www/advanced-windows-installation.html b/www/advanced-windows-installation.html
index 3bc7269..8d0dded 100644
--- a/www/advanced-windows-installation.html
+++ b/www/advanced-windows-installation.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
+ <a title="Sponsor: Autoteile Online Shop" href="http://www.autoteile-carparts.de">Autoteile Online Shop</a><!-- 2011070100030 autoteile-Carparts-->
</div>
</div>
</div>
@@ -473,7 +473,7 @@
<ol>
<li>Double-click on
- <kbd>VisualMagick/bin/ImageMagick-6.6.9-3-Q16-windows-dll.exe</kbd>
+ <kbd>VisualMagick/bin/ImageMagick-6.6.9-4-Q16-windows-dll.exe</kbd>
to launch the ImageMagick binary distribution.</li>
<li>Complete the installer screens to install ImageMagick on your system.</li>
</ol>
diff --git a/www/animate.html b/www/animate.html
index e7a75de..bf88358 100644
--- a/www/animate.html
+++ b/www/animate.html
@@ -185,7 +185,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
+ <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011080100025 atlas.multimedia-->
</div>
</div>
</div>
diff --git a/www/api.html b/www/api.html
index 25271e6..97c5e22 100644
--- a/www/api.html
+++ b/www/api.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
+ <a title="Sponsor: Autoteile Online Shop" href="http://www.autoteile-carparts.de">Autoteile Online Shop</a><!-- 2011070100030 autoteile-Carparts-->
</div>
</div>
</div>
diff --git a/www/api/animate.html b/www/api/animate.html
index 168951b..2ae5e7e 100644
--- a/www/api/animate.html
+++ b/www/api/animate.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
+ <a title="Sponsor: Autoteile Online Shop" href="http://www.autoteile-carparts.de">Autoteile Online Shop</a><!-- 2011070100030 autoteile-Carparts-->
</div>
</div>
</div>
diff --git a/www/api/annotate.html b/www/api/annotate.html
index b359171..6cc66f0 100644
--- a/www/api/annotate.html
+++ b/www/api/annotate.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
+ <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011080100025 atlas.multimedia-->
</div>
</div>
</div>
diff --git a/www/api/attribute.html b/www/api/attribute.html
index a5c2ea8..97b6292 100644
--- a/www/api/attribute.html
+++ b/www/api/attribute.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Fototapete" href=" http://www.allesdruck.de/Fototapete-Tapetendruck,category,8830.html">Fototapete</a><!-- 20110701000080 a-o.de -->
+ <a title="Sponsor: Autoteile Online Shop" href="http://www.autoteile-carparts.de">Autoteile Online Shop</a><!-- 2011070100030 autoteile-Carparts-->
</div>
</div>
</div>
diff --git a/www/api/blob.html b/www/api/blob.html
index 0fb55d6..98b5c8a 100644
--- a/www/api/blob.html
+++ b/www/api/blob.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Fototapete" href=" http://www.allesdruck.de/Fototapete-Tapetendruck,category,8830.html">Fototapete</a><!-- 20110701000080 a-o.de -->
+ <a title="Sponsor: Autoteile Online Shop" href="http://www.autoteile-carparts.de">Autoteile Online Shop</a><!-- 2011070100030 autoteile-Carparts-->
</div>
</div>
</div>
diff --git a/www/api/cache-view.html b/www/api/cache-view.html
index 0f26170..a8b5840 100644
--- a/www/api/cache-view.html
+++ b/www/api/cache-view.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Notebook Reparatur Berlin" href="http://www.notebook-reparaturen-berlin.de">Notebook Reparatur Berlin</a><!-- 2011060100025 gabi.schulze-->
+ <a title="Sponsor: Autoteile Online Shop" href="http://www.autoteile-carparts.de">Autoteile Online Shop</a><!-- 2011070100030 autoteile-Carparts-->
</div>
</div>
</div>
diff --git a/www/api/cache.html b/www/api/cache.html
index d08d35b..54a5787 100644
--- a/www/api/cache.html
+++ b/www/api/cache.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Notebook Reparatur Berlin" href="http://www.notebook-reparaturen-berlin.de">Notebook Reparatur Berlin</a><!-- 2011060100025 gabi.schulze-->
+ <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011080100025 atlas.multimedia-->
</div>
</div>
</div>
diff --git a/www/api/cipher.html b/www/api/cipher.html
index e98b08c..e9dd0a5 100644
--- a/www/api/cipher.html
+++ b/www/api/cipher.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Notebook Reparatur Berlin" href="http://www.notebook-reparaturen-berlin.de">Notebook Reparatur Berlin</a><!-- 2011060100025 gabi.schulze-->
+ <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
</div>
</div>
</div>
diff --git a/www/api/colormap.html b/www/api/colormap.html
index aa86c23..8227d57 100644
--- a/www/api/colormap.html
+++ b/www/api/colormap.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Fototapete" href=" http://www.allesdruck.de/Fototapete-Tapetendruck,category,8830.html">Fototapete</a><!-- 20110701000080 a-o.de -->
+ <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
</div>
</div>
</div>
diff --git a/www/api/composite.html b/www/api/composite.html
index 66a8b68..8100f7a 100644
--- a/www/api/composite.html
+++ b/www/api/composite.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011080100025 atlas.multimedia-->
+ <a title="Sponsor: Autoteile Online Shop" href="http://www.autoteile-carparts.de">Autoteile Online Shop</a><!-- 2011070100030 autoteile-Carparts-->
</div>
</div>
</div>
diff --git a/www/api/constitute.html b/www/api/constitute.html
index f6c492c..20d4775 100644
--- a/www/api/constitute.html
+++ b/www/api/constitute.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
+ <a title="Sponsor: Fototapete" href=" http://www.allesdruck.de/Fototapete-Tapetendruck,category,8830.html">Fototapete</a><!-- 20110701000080 a-o.de -->
</div>
</div>
</div>
diff --git a/www/api/decorate.html b/www/api/decorate.html
index bbd8742..51371bb 100644
--- a/www/api/decorate.html
+++ b/www/api/decorate.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
+ <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011080100025 atlas.multimedia-->
</div>
</div>
</div>
diff --git a/www/api/deprecate.html b/www/api/deprecate.html
index 4b8f4a8..4428460 100644
--- a/www/api/deprecate.html
+++ b/www/api/deprecate.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Fototapete" href=" http://www.allesdruck.de/Fototapete-Tapetendruck,category,8830.html">Fototapete</a><!-- 20110701000080 a-o.de -->
+ <a title="Sponsor: Autoteile Online Shop" href="http://www.autoteile-carparts.de">Autoteile Online Shop</a><!-- 2011070100030 autoteile-Carparts-->
</div>
</div>
</div>
diff --git a/www/api/display.html b/www/api/display.html
index f8a50b7..0c7d7a6 100644
--- a/www/api/display.html
+++ b/www/api/display.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
+ <a title="Sponsor: Autoteile Online Shop" href="http://www.autoteile-carparts.de">Autoteile Online Shop</a><!-- 2011070100030 autoteile-Carparts-->
</div>
</div>
</div>
diff --git a/www/api/distort.html b/www/api/distort.html
index d2dcad4..2a651cb 100644
--- a/www/api/distort.html
+++ b/www/api/distort.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
+ <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011080100025 atlas.multimedia-->
</div>
</div>
</div>
diff --git a/www/api/draw.html b/www/api/draw.html
index 3ba55e3..0695fb1 100644
--- a/www/api/draw.html
+++ b/www/api/draw.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
+ <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
</div>
</div>
</div>
diff --git a/www/api/drawing-wand.html b/www/api/drawing-wand.html
index 5b0125d..32b2d87 100644
--- a/www/api/drawing-wand.html
+++ b/www/api/drawing-wand.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
+ <a title="Sponsor: Fototapete" href=" http://www.allesdruck.de/Fototapete-Tapetendruck,category,8830.html">Fototapete</a><!-- 20110701000080 a-o.de -->
</div>
</div>
</div>
diff --git a/www/api/effect.html b/www/api/effect.html
index 111105c..884f0a7 100644
--- a/www/api/effect.html
+++ b/www/api/effect.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Notebook Reparatur Berlin" href="http://www.notebook-reparaturen-berlin.de">Notebook Reparatur Berlin</a><!-- 2011060100025 gabi.schulze-->
+ <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011080100025 atlas.multimedia-->
</div>
</div>
</div>
diff --git a/www/api/enhance.html b/www/api/enhance.html
index c022af8..5e81ad4 100644
--- a/www/api/enhance.html
+++ b/www/api/enhance.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
+ <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011080100025 atlas.multimedia-->
</div>
</div>
</div>
diff --git a/www/api/exception.html b/www/api/exception.html
index 3f884eb..5f2ce1a 100644
--- a/www/api/exception.html
+++ b/www/api/exception.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
+ <a title="Sponsor: Autoteile Online Shop" href="http://www.autoteile-carparts.de">Autoteile Online Shop</a><!-- 2011070100030 autoteile-Carparts-->
</div>
</div>
</div>
diff --git a/www/api/feature.html b/www/api/feature.html
index e102ec5..ec1976f 100644
--- a/www/api/feature.html
+++ b/www/api/feature.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
+ <a title="Sponsor: Autoteile Online Shop" href="http://www.autoteile-carparts.de">Autoteile Online Shop</a><!-- 2011070100030 autoteile-Carparts-->
</div>
</div>
</div>
diff --git a/www/api/fx.html b/www/api/fx.html
index 2e0415a..8b93aaa 100644
--- a/www/api/fx.html
+++ b/www/api/fx.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
+ <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
</div>
</div>
</div>
diff --git a/www/api/histogram.html b/www/api/histogram.html
index 931d409..a8af0f5 100644
--- a/www/api/histogram.html
+++ b/www/api/histogram.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
+ <a title="Sponsor: Autoteile Online Shop" href="http://www.autoteile-carparts.de">Autoteile Online Shop</a><!-- 2011070100030 autoteile-Carparts-->
</div>
</div>
</div>
diff --git a/www/api/image-view.html b/www/api/image-view.html
index 23f6b43..a5a7391 100644
--- a/www/api/image-view.html
+++ b/www/api/image-view.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011080100025 atlas.multimedia-->
+ <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
</div>
</div>
</div>
diff --git a/www/api/image.html b/www/api/image.html
index 50f7aab..0000a06 100644
--- a/www/api/image.html
+++ b/www/api/image.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Fototapete" href=" http://www.allesdruck.de/Fototapete-Tapetendruck,category,8830.html">Fototapete</a><!-- 20110701000080 a-o.de -->
+ <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
</div>
</div>
</div>
diff --git a/www/api/layer.html b/www/api/layer.html
index b60bcac..a508e27 100644
--- a/www/api/layer.html
+++ b/www/api/layer.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
+ <a title="Sponsor: Autoteile Online Shop" href="http://www.autoteile-carparts.de">Autoteile Online Shop</a><!-- 2011070100030 autoteile-Carparts-->
</div>
</div>
</div>
diff --git a/www/api/list.html b/www/api/list.html
index 59b26c7..f05d781 100644
--- a/www/api/list.html
+++ b/www/api/list.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Notebook Reparatur Berlin" href="http://www.notebook-reparaturen-berlin.de">Notebook Reparatur Berlin</a><!-- 2011060100025 gabi.schulze-->
+ <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011080100025 atlas.multimedia-->
</div>
</div>
</div>
diff --git a/www/api/magick-image.html b/www/api/magick-image.html
index c8e775b..eb4e3e8 100644
--- a/www/api/magick-image.html
+++ b/www/api/magick-image.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
+ <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
</div>
</div>
</div>
diff --git a/www/api/magick-property.html b/www/api/magick-property.html
index df72391..ed7cc09 100644
--- a/www/api/magick-property.html
+++ b/www/api/magick-property.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
+ <a title="Sponsor: Fototapete" href=" http://www.allesdruck.de/Fototapete-Tapetendruck,category,8830.html">Fototapete</a><!-- 20110701000080 a-o.de -->
</div>
</div>
</div>
diff --git a/www/api/magick-wand.html b/www/api/magick-wand.html
index b260631..14b577e 100644
--- a/www/api/magick-wand.html
+++ b/www/api/magick-wand.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
+ <a title="Sponsor: Autoteile Online Shop" href="http://www.autoteile-carparts.de">Autoteile Online Shop</a><!-- 2011070100030 autoteile-Carparts-->
</div>
</div>
</div>
diff --git a/www/api/magick.html b/www/api/magick.html
index 187db02..0b50c63 100644
--- a/www/api/magick.html
+++ b/www/api/magick.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
+ <a title="Sponsor: Autoteile Online Shop" href="http://www.autoteile-carparts.de">Autoteile Online Shop</a><!-- 2011070100030 autoteile-Carparts-->
</div>
</div>
</div>
diff --git a/www/api/memory.html b/www/api/memory.html
index 2480bcf..e126c16 100644
--- a/www/api/memory.html
+++ b/www/api/memory.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
+ <a title="Sponsor: Autoteile Online Shop" href="http://www.autoteile-carparts.de">Autoteile Online Shop</a><!-- 2011070100030 autoteile-Carparts-->
</div>
</div>
</div>
diff --git a/www/api/module.html b/www/api/module.html
index 77115b8..e4590b1 100644
--- a/www/api/module.html
+++ b/www/api/module.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Notebook Reparatur Berlin" href="http://www.notebook-reparaturen-berlin.de">Notebook Reparatur Berlin</a><!-- 2011060100025 gabi.schulze-->
+ <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
</div>
</div>
</div>
diff --git a/www/api/mogrify.html b/www/api/mogrify.html
index 61c853b..8edb4c7 100644
--- a/www/api/mogrify.html
+++ b/www/api/mogrify.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
+ <a title="Sponsor: Autoteile Online Shop" href="http://www.autoteile-carparts.de">Autoteile Online Shop</a><!-- 2011070100030 autoteile-Carparts-->
</div>
</div>
</div>
diff --git a/www/api/monitor.html b/www/api/monitor.html
index a779303..e3da838 100644
--- a/www/api/monitor.html
+++ b/www/api/monitor.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011080100025 atlas.multimedia-->
+ <a title="Sponsor: Autoteile Online Shop" href="http://www.autoteile-carparts.de">Autoteile Online Shop</a><!-- 2011070100030 autoteile-Carparts-->
</div>
</div>
</div>
diff --git a/www/api/montage.html b/www/api/montage.html
index 59d4344..95082dd 100644
--- a/www/api/montage.html
+++ b/www/api/montage.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
+ <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
</div>
</div>
</div>
diff --git a/www/api/morphology.html b/www/api/morphology.html
index 9349cf5..d62f374 100644
--- a/www/api/morphology.html
+++ b/www/api/morphology.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
+ <a title="Sponsor: Autoteile Online Shop" href="http://www.autoteile-carparts.de">Autoteile Online Shop</a><!-- 2011070100030 autoteile-Carparts-->
</div>
</div>
</div>
@@ -271,7 +271,7 @@
<p>Convolution Kernels</p>
-<p>Unity the No-Op kernel, also requivelent to Gaussian of sigma zero. Basically a 3x3 kernel of a 1 surrounded by zeros.</p>
+<p>Unity The a No-Op or Scaling single element kernel.</p>
<p>Gaussian:{radius},{sigma} Generate a two-dimentional gaussian kernel, as used by -gaussian. The sigma for the curve is required. The resulting kernel is normalized,</p>
@@ -307,12 +307,6 @@
<p>Sobel:{angle} Sobel 'Edge' convolution kernel (3x3) | -1, 0, 1 | | -2, 0,-2 | | -1, 0, 1 |</p>
-<p>Sobel:{type},{angle} Type 0: default un-nomalized version shown above.</p>
-
-<p>Type 1: As default but pre-normalized | 1, 0, -1 | | 2, 0, -2 | / 4 | 1, 0, -1 |</p>
-
-<p>Type 2: Diagonal version with same normalization as 1 | 1, 0, -1 | | 2, 0, -2 | / 4 | 1, 0, -1 |</p>
-
<p>Roberts:{angle} Roberts convolution kernel (3x3) | 0, 0, 0 | | -1, 1, 0 | | 0, 0, 0 |</p>
<p>Prewitt:{angle} Prewitt Edge convolution kernel (3x3) | -1, 0, 1 | | -1, 0, 1 | | -1, 0, 1 |</p>
@@ -371,16 +365,16 @@
<p>Square:[{radius}[,{scale}]] Generate a square shaped kernel of size radius*2+1, and defaulting to a 3x3 (radius 1).</p>
-<p>Note that using a larger radius for the "Square" or the "Diamond" is also equivelent to iterating the basic morphological method that many times. However iterating with the smaller radius is actually faster than using a larger kernel radius.</p>
+<p>Octagon:[{radius}[,{scale}]] Generate octagonal shaped kernel of given radius and constant scale. Default radius is 3 producing a 7x7 kernel. A radius of 1 will result in "Diamond" kernel.</p>
+
+<p>Disk:[{radius}[,{scale}]] Generate a binary disk, thresholded at the radius given, the radius may be a float-point value. Final Kernel size is floor(radius)*2+1 square. A radius of 5.3 is the default.</p>
+
+<p>NOTE: That a low radii Disk kernels produce the same results as many of the previously defined kernels, but differ greatly at larger radii. Here is a table of equivalences... "Disk:1" => "Diamond", "Octagon:1", or "Cross:1" "Disk:1.5" => "Square" "Disk:2" => "Diamond:2" "Disk:2.5" => "Octagon" "Disk:2.9" => "Square:2" "Disk:3.5" => "Octagon:3" "Disk:4.5" => "Octagon:4" "Disk:5.4" => "Octagon:5" "Disk:6.4" => "Octagon:6" All other Disk shapes are unique to this kernel, but because a "Disk" is more circular when using a larger radius, using a larger radius is preferred over iterating the morphological operation.</p>
<p>Rectangle:{geometry} Simply generate a rectangle of 1's with the size given. You can also specify the location of the 'control point', otherwise the closest pixel to the center of the rectangle is selected.</p>
<p>Properly centered and odd sized rectangles work the best.</p>
-<p>Disk:[{radius}[,{scale}]] Generate a binary disk of the radius given, radius may be a float. Kernel size will be ceil(radius)*2+1 square. NOTE: Here are some disk shapes of specific interest "Disk:1" => "diamond" or "cross:1" "Disk:1.5" => "square" "Disk:2" => "diamond:2" "Disk:2.5" => a general disk shape of radius 2 "Disk:2.9" => "square:2" "Disk:3.5" => default - octagonal/disk shape of radius 3 "Disk:4.2" => roughly octagonal shape of radius 4 "Disk:4.3" => a general disk shape of radius 4 After this all the kernel shape becomes more and more circular.</p>
-
-<p>Because a "disk" is more circular when using a larger radius, using a larger radius is preferred over iterating the morphological operation.</p>
-
<p>Symbol Dilation Kernels</p>
<p>These kernel is not a good general morphological kernel, but is used more for highlighting and marking any single pixels in an image using, a "Dilate" method as appropriate.</p>
@@ -395,7 +389,7 @@
<p>Hit and Miss Kernels</p>
-<p>Peak:radius1,radius2 Find any peak larger than the pixels the fall between the two radii. The default ring of pixels is as per "Ring". Edges Find flat orthogonal edges of a binary shape Corners Find 90 degree corners of a binary shape LineEnds:type Find end points of lines (for pruning a skeletion) Two types of lines ends (default to both) can be searched for Type 0: All line ends Type 1: single kernel for 4-conneected line ends Type 2: single kernel for simple line ends LineJunctions Find three line junctions (within a skeletion) Type 0: all line junctions Type 1: Y Junction kernel Type 2: Diagonal T Junction kernel Type 3: Orthogonal T Junction kernel Type 4: Diagonal X Junction kernel Type 5: Orthogonal + Junction kernel Ridges:type Find single pixel ridges or thin lines Type 1: Fine single pixel thick lines and ridges Type 2: Find two pixel thick lines and ridges ConvexHull Octagonal thicken kernel, to generate convex hulls of 45 degrees Skeleton:type Traditional skeleton generating kernels. Type 1: Tradional Skeleton kernel (4 connected skeleton) Type 2: HIPR2 Skeleton kernel (8 connected skeleton) Type 3: Experimental Variation to try to present left-right symmetry Type 4: Experimental Variation to preserve left-right symmetry</p>
+<p>Peak:radius1,radius2 Find any peak larger than the pixels the fall between the two radii. The default ring of pixels is as per "Ring". Edges Find flat orthogonal edges of a binary shape Corners Find 90 degree corners of a binary shape Diagonals:type A special kernel to thin the 'outside' of diagonals LineEnds:type Find end points of lines (for pruning a skeletion) Two types of lines ends (default to both) can be searched for Type 0: All line ends Type 1: single kernel for 4-conneected line ends Type 2: single kernel for simple line ends LineJunctions Find three line junctions (within a skeletion) Type 0: all line junctions Type 1: Y Junction kernel Type 2: Diagonal T Junction kernel Type 3: Orthogonal T Junction kernel Type 4: Diagonal X Junction kernel Type 5: Orthogonal + Junction kernel Ridges:type Find single pixel ridges or thin lines Type 1: Fine single pixel thick lines and ridges Type 2: Find two pixel thick lines and ridges ConvexHull Octagonal Thickening Kernel, to generate convex hulls of 45 degrees Skeleton:type Traditional skeleton generating kernels. Type 1: Tradional Skeleton kernel (4 connected skeleton) Type 2: HIPR2 Skeleton kernel (8 connected skeleton) Type 3: Thinning skeleton based on a ressearch paper by Dan S. Bloomberg (Default Type) ThinSE:type A huge variety of Thinning Kernels designed to preserve conectivity. many other kernel sets use these kernels as source definitions. Type numbers are 41-49, 81-89, 481, and 482 which are based on the super and sub notations used in the source research paper.</p>
<p>Distance Measuring Kernels</p>
@@ -403,15 +397,19 @@
<p>See the 'Distance' Morphological Method, for information of how it is applied.</p>
-<p>Chebyshev:[{radius}][x{scale}[!]] Chebyshev Distance (also known as Tchebychev Distance) is a value of one to any neighbour, orthogonal or diagonal. One why of thinking of it is the number of squares a 'King' or 'Queen' in chess needs to traverse reach any other position on a chess board. It results in a 'square' like distance function, but one where diagonals are closer than expected.</p>
+<p>Chebyshev:[{radius}][x{scale}[!]] Chebyshev Distance (also known as Tchebychev or Chessboard distance) is a value of one to any neighbour, orthogonal or diagonal. One why of thinking of it is the number of squares a 'King' or 'Queen' in chess needs to traverse reach any other position on a chess board. It results in a 'square' like distance function, but one where diagonals are given a value that is closer than expected.</p>
-<p>Manhattan:[{radius}][x{scale}[!]] Manhattan Distance (also known as Rectilinear Distance, or the Taxi Cab metric), is the distance needed when you can only travel in orthogonal (horizontal or vertical) only. It is the distance a 'Rook' in chess would travel. It results in a diamond like distances, where diagonals are further than expected.</p>
+<p>Manhattan:[{radius}][x{scale}[!]] Manhattan Distance (also known as Rectilinear, City Block, or the Taxi Cab distance metric), it is the distance needed when you can only travel in horizontal or vertical directions only. It is the distance a 'Rook' in chess would have to travel, and results in a diamond like distances, where diagonals are further than expected.</p>
-<p>Euclidean:[{radius}][x{scale}[!]] Euclidean Distance is the 'direct' or 'as the crow flys distance. However by default the kernel size only has a radius of 1, which limits the distance to 'Knight' like moves, with only orthogonal and diagonal measurements being correct. As such for the default kernel you will get octagonal like distance function, which is reasonally accurate.</p>
+<p>Octagonal:[{radius}][x{scale}[!]] An interleving of Manhatten and Chebyshev metrics producing an increasing octagonally shaped distance. Distances matches those of the "Octagon" shaped kernel of the same radius. The minimum radius and default is 2, producing a 5x5 kernel.</p>
-<p>However if you use a larger radius such as "Euclidean:4" you will get a much smoother distance gradient from the edge of the shape. Of course a larger kernel is slower to use, and generally not needed.</p>
+<p>Euclidean:[{radius}][x{scale}[!]] Euclidean distance is the 'direct' or 'as the crow flys' distance. However by default the kernel size only has a radius of 1, which limits the distance to 'Knight' like moves, with only orthogonal and diagonal measurements being correct. As such for the default kernel you will get octagonal like distance function.</p>
-<p>To allow the use of fractional distances that you get with diagonals the actual distance is scaled by a fixed value which the user can provide. This is not actually nessary for either ""Chebyshev" or "Manhattan" distance kernels, but is done for all three distance kernels. If no scale is provided it is set to a value of 100, allowing for a maximum distance measurement of 655 pixels using a Q16 version of IM, from any edge. However for small images this can result in quite a dark gradient.</p>
+<p>However using a larger radius such as "Euclidean:4" you will get a much smoother distance gradient from the edge of the shape. Especially if the image is pre-processed to include any anti-aliasing pixels. Of course a larger kernel is slower to use, and not always needed.</p>
+
+<p>The first three Distance Measuring Kernels will only generate distances of exact multiples of {scale} in binary images. As such you can use a scale of 1 without loosing any information. However you also need some scaling when handling non-binary anti-aliased shapes.</p>
+
+<p>The "Euclidean" Distance Kernel however does generate a non-integer fractional results, and as such scaling is vital even for binary shapes.</p>
</div>
<h2><a href="http://www.imagemagick.org/api/MagickCore/morphology_8c.html" id="CloneKernelInfo">CloneKernelInfo</a></h2>
@@ -463,9 +461,9 @@
<pre class="code">
Image *MorphologyApply(const Image *image,MorphologyMethod method,
- const ssize_t iterations,const KernelInfo *kernel,
- const CompositeMethod compose, const double bias,
- ExceptionInfo *exception)
+ const ChannelType channel, const ssize_t iterations,
+ const KernelInfo *kernel, const CompositeMethod compose,
+ const double bias, ExceptionInfo *exception)
</pre>
<p>A description of each parameter follows:</p>
@@ -476,6 +474,9 @@
<h5>method</h5>
<p>the morphology method to be applied.</p>
+<h5>channel</h5>
+<p>the channels to which the operations are applied The channel 'sync' flag determines if 'alpha weighting' is applied for convolution style operations.</p>
+
<h5>iterations</h5>
<p>apply the operation this many times (or no change). A value of -1 means loop until no change found. How this is applied may depend on the morphology method. Typically this is a value of 1.</p>
diff --git a/www/api/paint.html b/www/api/paint.html
index 03bfb4b..7d6371a 100644
--- a/www/api/paint.html
+++ b/www/api/paint.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
+ <a title="Sponsor: Autoteile Online Shop" href="http://www.autoteile-carparts.de">Autoteile Online Shop</a><!-- 2011070100030 autoteile-Carparts-->
</div>
</div>
</div>
diff --git a/www/api/pixel-iterator.html b/www/api/pixel-iterator.html
index 10d82ed..eac4f79 100644
--- a/www/api/pixel-iterator.html
+++ b/www/api/pixel-iterator.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Fototapete" href=" http://www.allesdruck.de/Fototapete-Tapetendruck,category,8830.html">Fototapete</a><!-- 20110701000080 a-o.de -->
+ <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
</div>
</div>
</div>
diff --git a/www/api/pixel-wand.html b/www/api/pixel-wand.html
index d4281c3..e126579 100644
--- a/www/api/pixel-wand.html
+++ b/www/api/pixel-wand.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011080100025 atlas.multimedia-->
+ <a title="Sponsor: Autoteile Online Shop" href="http://www.autoteile-carparts.de">Autoteile Online Shop</a><!-- 2011070100030 autoteile-Carparts-->
</div>
</div>
</div>
diff --git a/www/api/profile.html b/www/api/profile.html
index 58d1bd4..d8aa810 100644
--- a/www/api/profile.html
+++ b/www/api/profile.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
+ <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
</div>
</div>
</div>
diff --git a/www/api/property.html b/www/api/property.html
index 374eb6c..f77e56a 100644
--- a/www/api/property.html
+++ b/www/api/property.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Notebook Reparatur Berlin" href="http://www.notebook-reparaturen-berlin.de">Notebook Reparatur Berlin</a><!-- 2011060100025 gabi.schulze-->
+ <a title="Sponsor: Autoteile Online Shop" href="http://www.autoteile-carparts.de">Autoteile Online Shop</a><!-- 2011070100030 autoteile-Carparts-->
</div>
</div>
</div>
diff --git a/www/api/quantize.html b/www/api/quantize.html
index 19d8fbb..6c6fc4b 100644
--- a/www/api/quantize.html
+++ b/www/api/quantize.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011080100025 atlas.multimedia-->
+ <a title="Sponsor: Autoteile Online Shop" href="http://www.autoteile-carparts.de">Autoteile Online Shop</a><!-- 2011070100030 autoteile-Carparts-->
</div>
</div>
</div>
diff --git a/www/api/resize.html b/www/api/resize.html
index 3f26b08..6ccadb3 100644
--- a/www/api/resize.html
+++ b/www/api/resize.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011080100025 atlas.multimedia-->
+ <a title="Sponsor: Autoteile Online Shop" href="http://www.autoteile-carparts.de">Autoteile Online Shop</a><!-- 2011070100030 autoteile-Carparts-->
</div>
</div>
</div>
diff --git a/www/api/resource.html b/www/api/resource.html
index 288b433..c123013 100644
--- a/www/api/resource.html
+++ b/www/api/resource.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011080100025 atlas.multimedia-->
+ <a title="Sponsor: Notebook Reparatur Berlin" href="http://www.notebook-reparaturen-berlin.de">Notebook Reparatur Berlin</a><!-- 2011060100025 gabi.schulze-->
</div>
</div>
</div>
diff --git a/www/api/segment.html b/www/api/segment.html
index 108a436..17667dc 100644
--- a/www/api/segment.html
+++ b/www/api/segment.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
+ <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
</div>
</div>
</div>
diff --git a/www/api/shear.html b/www/api/shear.html
index ca525d0..d3b09f6 100644
--- a/www/api/shear.html
+++ b/www/api/shear.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
+ <a title="Sponsor: Fototapete" href=" http://www.allesdruck.de/Fototapete-Tapetendruck,category,8830.html">Fototapete</a><!-- 20110701000080 a-o.de -->
</div>
</div>
</div>
diff --git a/www/api/signature.html b/www/api/signature.html
index ae2cf11..fefd21c 100644
--- a/www/api/signature.html
+++ b/www/api/signature.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Notebook Reparatur Berlin" href="http://www.notebook-reparaturen-berlin.de">Notebook Reparatur Berlin</a><!-- 2011060100025 gabi.schulze-->
+ <a title="Sponsor: Fototapete" href=" http://www.allesdruck.de/Fototapete-Tapetendruck,category,8830.html">Fototapete</a><!-- 20110701000080 a-o.de -->
</div>
</div>
</div>
diff --git a/www/api/statistic.html b/www/api/statistic.html
index 79658bc..80d510f 100644
--- a/www/api/statistic.html
+++ b/www/api/statistic.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
+ <a title="Sponsor: Autoteile Online Shop" href="http://www.autoteile-carparts.de">Autoteile Online Shop</a><!-- 2011070100030 autoteile-Carparts-->
</div>
</div>
</div>
diff --git a/www/api/transform.html b/www/api/transform.html
index 9c947c6..6e1dae1 100644
--- a/www/api/transform.html
+++ b/www/api/transform.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
+ <a title="Sponsor: Autoteile Online Shop" href="http://www.autoteile-carparts.de">Autoteile Online Shop</a><!-- 2011070100030 autoteile-Carparts-->
</div>
</div>
</div>
diff --git a/www/api/version.html b/www/api/version.html
index f585396..074c6c2 100644
--- a/www/api/version.html
+++ b/www/api/version.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
+ <a title="Sponsor: Fototapete" href=" http://www.allesdruck.de/Fototapete-Tapetendruck,category,8830.html">Fototapete</a><!-- 20110701000080 a-o.de -->
</div>
</div>
</div>
diff --git a/www/api/wand-view.html b/www/api/wand-view.html
index 418275d..c96e46f 100644
--- a/www/api/wand-view.html
+++ b/www/api/wand-view.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
+ <a title="Sponsor: Fototapete" href=" http://www.allesdruck.de/Fototapete-Tapetendruck,category,8830.html">Fototapete</a><!-- 20110701000080 a-o.de -->
</div>
</div>
</div>
diff --git a/www/architecture.html b/www/architecture.html
index 101c39c..fc20680 100644
--- a/www/architecture.html
+++ b/www/architecture.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
+ <a title="Sponsor: Notebook Reparatur Berlin" href="http://www.notebook-reparaturen-berlin.de">Notebook Reparatur Berlin</a><!-- 2011060100025 gabi.schulze-->
</div>
</div>
</div>
@@ -288,7 +288,7 @@
<p>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 <a href="../www/command-line-options.html#version">‑version</a> option: </p>
-<p class='crt'><span class="crtprompt"> $magick> </span><span class='crtin'>identify -version</span><span class='crtout'>Version: ImageMagick 6.6.9-3 2011-04-01 Q16 http://www.imagemagick.org</span></p>
+<p class='crt'><span class="crtprompt"> $magick> </span><span class='crtin'>identify -version</span><span class='crtout'>Version: ImageMagick 6.6.9-4 2011-04-01 Q16 http://www.imagemagick.org</span></p>
<p>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.</p>
</div>
@@ -443,8 +443,8 @@
*view_1,
*view_2;
- view_1=OpenCacheView(source);
- view_2=OpenCacheView(source);
+ view_1=AcquireCacheView(source);
+ view_2=AcquireCacheView(source);
for (y=0; y < (ssize_t) source->rows; y++)
{
u=GetCacheViewVirtualPixels(view_1,0,y,source->columns,1,exception);
@@ -457,8 +457,8 @@
/* do something with u & v here */
}
}
- view_1=CloseCacheView(view_1);
- view_2=CloseCacheView(view_2);
+ view_2=DestroyCacheView(view_2);
+ view_1=DestroyCacheView(view_1);
if (y < (ssize_t) source->rows)
{ /* an exception was thrown */ }
</pre>
diff --git a/www/binary-releases.html b/www/binary-releases.html
index 679d08f..0e4c0a5 100644
--- a/www/binary-releases.html
+++ b/www/binary-releases.html
@@ -219,16 +219,16 @@
</tr>
<tr>
- <td valign="top">ImageMagick-6.6.9-3.i386.rpm</td>
- <td valign="top"><a href= "http://www.imagemagick.org/download/linux/CentOS/i386/ImageMagick-6.6.9-3.i386.rpm">download</a></td>
- <td valign="top"><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/linux/CentOS/i386/ImageMagick-6.6.9-3.i386.rpm">download</a></td>
+ <td valign="top">ImageMagick-6.6.9-4.i386.rpm</td>
+ <td valign="top"><a href= "http://www.imagemagick.org/download/linux/CentOS/i386/ImageMagick-6.6.9-4.i386.rpm">download</a></td>
+ <td valign="top"><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/linux/CentOS/i386/ImageMagick-6.6.9-4.i386.rpm">download</a></td>
<td valign="top">CentOS 5.4 i386 RPM</td>
</tr>
<tr>
- <td valign="top">ImageMagick-6.6.9-3.x86_64.rpm</td>
- <td valign="top"><a href= "http://www.imagemagick.org/download/linux/CentOS/x86_64/ImageMagick-6.6.9-3.x86_64.rpm">download</a></td>
- <td valign="top"><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/linux/CentOS/x86_64/ImageMagick-6.6.9-3.x86_64.rpm">download</a></td>
+ <td valign="top">ImageMagick-6.6.9-4.x86_64.rpm</td>
+ <td valign="top"><a href= "http://www.imagemagick.org/download/linux/CentOS/x86_64/ImageMagick-6.6.9-4.x86_64.rpm">download</a></td>
+ <td valign="top"><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/linux/CentOS/x86_64/ImageMagick-6.6.9-4.x86_64.rpm">download</a></td>
<td valign="top">CentOS 5.4 x86_64 RPM</td>
</tr>
@@ -265,7 +265,7 @@
<p>ImageMagick RPM's are self-installing. Simply type the following command and you're ready to start using ImageMagick:</p>
-<p class='crt'><span class="crtprompt"> $magick> </span><span class='crtin'>rpm -Uvh ImageMagick-6.6.9-3.i386.rpm</span></p>
+<p class='crt'><span class="crtprompt"> $magick> </span><span class='crtin'>rpm -Uvh ImageMagick-6.6.9-4.i386.rpm</span></p>
<p>For other systems, create (or choose) a directory to install the package into and change to that directory, for example:</p>
<p class='crt'><span class="crtprompt"> $magick> </span><span class='crtin'>cd $HOME</span></p>
@@ -365,7 +365,7 @@
<pre class="text">
./imagemagick_compile.sh <em>VERSION</em>
</pre>
-<p>where <em>VERSION</em> is the version of ImageMagick you want to compile (i.e.: 6.6.9-3, svn, ...)</p>
+<p>where <em>VERSION</em> is the version of ImageMagick you want to compile (i.e.: 6.6.9-4, svn, ...)</p>
<p>This script compiles ImageMagick as a static library to be included in iPhone projects and adds support for</p>
<ul>
@@ -404,7 +404,7 @@
<p>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.</p>
<p>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 <em>Q8</em> in the name are 8 bits-per-pixel component (e.g. 8-bit red, 8-bit green, etc.), whereas, <em>Q16</em> 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 <em>dll</em> in the filename include ImageMagick libraries as <a href="http://www.answers.com/topic/dll">dynamic link libraries</a>. If you are not sure which version is appropriate, choose
-<a href='http://www.imagemagick.org/download/binaries/ImageMagick-6.6.9-3-Q16-windows-dll.exe'>ImageMagick-6.6.9-3-Q16-windows-dll.exe</a>.</p>
+<a href='http://www.imagemagick.org/download/binaries/ImageMagick-6.6.9-4-Q16-windows-dll.exe'>ImageMagick-6.6.9-4-Q16-windows-dll.exe</a>.</p>
<table class="doc">
<col width="50%"/> <col width="10%"/> <col width="10%"/> <col width="30%"/>
@@ -416,44 +416,44 @@
</tr>
<tr>
- <td valign="top">ImageMagick-6.6.9-3-Q16-windows-dll.exe</td>
- <td valign="top"><a href= "http://www.imagemagick.org/download/binaries/ImageMagick-6.6.9-3-Q16-windows-dll.exe">download</a></td>
- <td valign="top"><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-6.6.9-3-Q16-windows-dll.exe">download</a></td>
+ <td valign="top">ImageMagick-6.6.9-4-Q16-windows-dll.exe</td>
+ <td valign="top"><a href= "http://www.imagemagick.org/download/binaries/ImageMagick-6.6.9-4-Q16-windows-dll.exe">download</a></td>
+ <td valign="top"><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-6.6.9-4-Q16-windows-dll.exe">download</a></td>
<td valign="top">Win32 dynamic at 16 bits-per-pixel</td>
</tr>
<tr>
- <td valign="top">ImageMagick-6.6.9-3-Q16-windows-static.exe</td>
- <td valign="top"><a href= "http://www.imagemagick.org/download/binaries/ImageMagick-6.6.9-3-Q16-windows-static.exe">download</a></td>
- <td valign="top"><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-6.6.9-3-Q16-windows-static.exe">download</a></td>
+ <td valign="top">ImageMagick-6.6.9-4-Q16-windows-static.exe</td>
+ <td valign="top"><a href= "http://www.imagemagick.org/download/binaries/ImageMagick-6.6.9-4-Q16-windows-static.exe">download</a></td>
+ <td valign="top"><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-6.6.9-4-Q16-windows-static.exe">download</a></td>
<td valign="top">Win32 static at 16 bits-per-pixel</td>
</tr>
<tr>
- <td valign="top">ImageMagick-6.6.9-3-Q8-windows-dll.exe</td>
- <td valign="top"><a href= "http://www.imagemagick.org/download/binaries/ImageMagick-6.6.9-3-Q8-windows-dll.exe">download</a></td>
- <td valign="top"><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-6.6.9-3-Q8-windows-dll.exe">download</a></td>
+ <td valign="top">ImageMagick-6.6.9-4-Q8-windows-dll.exe</td>
+ <td valign="top"><a href= "http://www.imagemagick.org/download/binaries/ImageMagick-6.6.9-4-Q8-windows-dll.exe">download</a></td>
+ <td valign="top"><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-6.6.9-4-Q8-windows-dll.exe">download</a></td>
<td valign="top">Win32 dynamic at 8 bits-per-pixel</td>
</tr>
<tr>
- <td valign="top">ImageMagick-6.6.9-3-Q8-windows-static.exe</td>
- <td valign="top"><a href= "http://www.imagemagick.org/download/binaries/ImageMagick-6.6.9-3-Q8-windows-static.exe">download</a></td>
- <td valign="top"><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-6.6.9-3-Q8-windows-static.exe">download</a></td>
+ <td valign="top">ImageMagick-6.6.9-4-Q8-windows-static.exe</td>
+ <td valign="top"><a href= "http://www.imagemagick.org/download/binaries/ImageMagick-6.6.9-4-Q8-windows-static.exe">download</a></td>
+ <td valign="top"><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-6.6.9-4-Q8-windows-static.exe">download</a></td>
<td valign="top">Win32 static at 8 bits-per-pixel</td>
</tr>
<tr>
- <td valign="top">ImageMagick-6.6.9-3-Q16-windows-x64-dll.exe</td>
- <td valign="top"><a href= "http://www.imagemagick.org/download/binaries/ImageMagick-6.6.9-3-Q16-windows-x64-dll.exe">download</a></td>
- <td valign="top"><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-6.6.9-3-Q16-windows-x64-dll.exe">download</a></td>
+ <td valign="top">ImageMagick-6.6.9-4-Q16-windows-x64-dll.exe</td>
+ <td valign="top"><a href= "http://www.imagemagick.org/download/binaries/ImageMagick-6.6.9-4-Q16-windows-x64-dll.exe">download</a></td>
+ <td valign="top"><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-6.6.9-4-Q16-windows-x64-dll.exe">download</a></td>
<td valign="top">Win64 dynamic at 16 bits-per-pixel</td>
</tr>
<tr>
- <td valign="top">ImageMagick-6.6.9-3-Q16-windows-x64-static.exe</td>
- <td valign="top"><a href= "http://www.imagemagick.org/download/binaries/ImageMagick-6.6.9-3-Q16-windows-x64-static.exe">download</a></td>
- <td valign="top"><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-6.6.9-3-Q16-windows-x64-static.exe">download</a></td>
+ <td valign="top">ImageMagick-6.6.9-4-Q16-windows-x64-static.exe</td>
+ <td valign="top"><a href= "http://www.imagemagick.org/download/binaries/ImageMagick-6.6.9-4-Q16-windows-x64-static.exe">download</a></td>
+ <td valign="top"><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-6.6.9-4-Q16-windows-x64-static.exe">download</a></td>
<td valign="top">Win64 static at 16 bits-per-pixel</td>
</tr>
diff --git a/www/changelog.html b/www/changelog.html
index 2c6fa7b..199464b 100644
--- a/www/changelog.html
+++ b/www/changelog.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011080100025 atlas.multimedia-->
+ <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
</div>
</div>
</div>
@@ -197,7 +197,21 @@
<div class="main">
<h1>ImageMagick Changelog</h1>
-<dl><dt>2011-04-01 6.6.9-3 Cristy <quetzlzacatenango@image...></dt>
+<dl><dt>2011-04-03 6.6.9-4 Anthony Thyssen <A.Thyssen@griffith...></dt>
+ <dd> Add of Octagon shape and Octagonal distance kernels for Morphology</dd>
+ <dd> Fix minor Morphology kernel compose bug (cleanup after Src/Dst swap)</dd>
+ <dd> Fix segmentation fault after error in a morphology 'named' kernel</dd>
+ <dd> Added a range of kernels used for specialised thinning purposes as defined in a research paper by Dan S. Bloomberg.</dd>
+ <dd> Added Dan Bloomberd best thinning skeletion, "Skeleton:3"</dd>
+ <dd> Removed origin pixel from many Hit-and-Miss kernels allowing kernels to not only be used for thinning, but also thickening.</dd>
+ <dd> Renamed "ThinDiagonals" kernel to just "Diagonals"</dd>
+ <dd> Distance uses a fast two pass algorithm, and no longer needs 'iteration'</dd>
+<dt>2011-04-02 6.6.9-4 Glenn Randers-Pehrson <glennrp@image...></dt>
+ <dd> Make the PNG encoder use depth==8 when incoming image->depth < 8 (the encoder later reduces the depth if it can), to avoid writing an incorrect image.</dd>
+ <dd> Remove any bogus colormap received by the PNG encoder with an image that is not PseudoClass (reference http://www.imagemagick.org/discourse-server/viewtopic.html?f=3&t=18475).</dd>
+<dt>2011-04-02 6.6.9-3 Cristy <quetzlzacatenango@image...></dt>
+ <dd> Added -statistic Gradient</dd>
+<dt>2011-04-01 6.6.9-3 Cristy <quetzlzacatenango@image...></dt>
<dd> New version 6.6.9-3.</dd>
<dt>2011-04-01 6.6.9-3 Cristy <quetzlzacatenango@image...></dt>
<dd> Set the caption height correctly for missing row geometry (reference http://www.imagemagick.org/discourse-server/viewtopic.html?f=3&t=18447).</dd>
diff --git a/www/cipher.html b/www/cipher.html
index bfac9f4..535c4b7 100644
--- a/www/cipher.html
+++ b/www/cipher.html
@@ -185,7 +185,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011080100025 atlas.multimedia-->
+ <a title="Sponsor: Fototapete" href=" http://www.allesdruck.de/Fototapete-Tapetendruck,category,8830.html">Fototapete</a><!-- 20110701000080 a-o.de -->
</div>
</div>
</div>
diff --git a/www/color.html b/www/color.html
index 0ca7b49..e243664 100644
--- a/www/color.html
+++ b/www/color.html
@@ -185,7 +185,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
+ <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011080100025 atlas.multimedia-->
</div>
</div>
</div>
diff --git a/www/command-line-options.html b/www/command-line-options.html
index cb630ac..6b6ed85 100644
--- a/www/command-line-options.html
+++ b/www/command-line-options.html
@@ -188,7 +188,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
+ <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011080100025 atlas.multimedia-->
</div>
</div>
</div>
@@ -279,7 +279,7 @@
<h4><a id="affine"></a>-affine
<em class="arg">s<sub>x</sub></em>,<em class="arg">r<sub>x</sub></em>,<em
class="arg">r<sub>y</sub></em>,<em class="arg">s<sub>y</sub></em>[,<em
- class="arg">t<sub>x</sub></em>,<em class="arg">t<sub>y</sub></em>]
+ class="arg">t<sub>x</sub></em>,<em class="arg">t<sub>y</sub></em>]</h4>
</div>
<table style='background-color:#FFFFE0; margin-left:40px; margin-right:40px; width:88%'><tr><td style='width:75%'>Set the drawing transformation matrix for combined rotating and scaling.</td><td style='text-align:right;'></td></tr></table>
@@ -1247,13 +1247,13 @@
<p>As an example, to add contrast to an image with offsets, try this command:</p>
<pre class="text">
-convert kittens.jpg -color-matrix \
- " 1.5 0.0 0.0 0.0, 0.0, -0.157 \
- 0.0 1.5 0.0 0.0, 0.0, -0.157 \
- 0.0 0.0 1.5 0.0, 0.0, -0.157 \
- 0.0 0.0 0.0 1.0, 0.0, 0.0 \
- 0.0 0.0 0.0 0.0, 1.0, 0.0 \
- 0.0 0.0 0.0 0.0, 0.0, 1.0" kittens.png
+ convert kittens.jpg -color-matrix \
+ " 1.5 0.0 0.0 0.0, 0.0, -0.157 \
+ 0.0 1.5 0.0 0.0, 0.0, -0.157 \
+ 0.0 0.0 1.5 0.0, 0.0, -0.157 \
+ 0.0 0.0 0.0 1.0, 0.0, 0.0 \
+ 0.0 0.0 0.0 0.0, 1.0, 0.0 \
+ 0.0 0.0 0.0 0.0, 0.0, 1.0" kittens.png
</pre>
<div style="margin: auto;">
<h4><a id="colorspace"></a>-colorspace <em class="arg">value</em></h4>
@@ -1264,28 +1264,12 @@
<p>Choices are:</p>
<pre class="text">
- CMY
- CMYK
- Gray
- HSB
- HSL
- HWB
- Lab
- Log
- OHTA
- Rec601Luma
- Rec601YCbCr
- Rec709Luma
- Rec709YCbCr
- RGB
- sRGB
- Transparent
- XYZ
- YCbCr
- YCC
- YIQ
- YPbPr
- YUV
+ CMY CMYK Gray HSB
+ HSL HWB Lab Log
+ OHTA Rec601Luma Rec601YCbCr Rec709Luma
+ Rec709YCbCr RGB sRGB Transparent
+ XYZ YCbCr YCC YIQ
+ YPbPr YUV
</pre>
<p>To print a complete list of colorspaces, use <a href="#list">-list colorspace</a>.</p>
@@ -1773,7 +1757,7 @@
can achieve this with a single define:</p>
<pre class="text">
- -define png:include-chunk=none,gAMA
+ -define png:include-chunk=none,gAMA
</pre>
<p>The critical PNG chunks <kbd>IHDR</kbd>, <kbd>PLTE</kbd>,
@@ -1790,7 +1774,7 @@
following for PNG output:</p>
<pre class="text">
- -define png:include-chunk=none,gama
+ -define png:include-chunk=none,gama
</pre>
<p>The default behavior is to include all known PNG ancillary chunks
@@ -1987,10 +1971,10 @@
<p>Here are the valid methods:</p>
<pre class="text">
-Undefined 0 No disposal specified (equivalent to '<kbd>none</kbd>').
-None 1 Do not dispose, just overlay next frame image.
-Background 2 Clear the frame area with the background color.
-Previous 3 Clear to the image prior to this frames overlay.
+ Undefined 0 No disposal specified (equivalent to '<kbd>none</kbd>').
+ None 1 Do not dispose, just overlay next frame image.
+ Background 2 Clear the frame area with the background color.
+ Previous 3 Clear to the image prior to this frames overlay.
</pre>
<p>You can also use the numbers given above, which is what the GIF format
@@ -2485,18 +2469,18 @@
<p>The transformation primitives:</p>
<pre class="text">
- rotate degrees
- translate dx,dy
- scale sx,sy
- skewX degrees
- skewY degrees
+ rotate degrees
+ translate dx,dy
+ scale sx,sy
+ skewX degrees
+ skewY degrees
</pre>
<p>The pixel operation primitives:</p>
<pre class="text">
- color x0,y0 method
- matte x0,y0 method
+ color x0,y0 method
+ matte x0,y0 method
</pre>
<p>The shape primitives are drawn in the color specified by the preceding <a href="#fill">-fill</a> setting. For unfilled shapes, use <a href="#fill">-fill none</a>. You can optionally control the stroke (the "outline" of a shape) with the <a href="#stroke">-stroke</a> and <a href="#strokewidth">-strokewidth</a> settings.</p>
@@ -3161,10 +3145,10 @@
<p>Here, <em class="arg">parameters</em> is a comma-separated list of numerical values. The number of values varies depending on which <em class="arg">function</em> is selected. Choose the <em class="arg">function</em> from:</p>
<pre class="text">
- Polynomial
- Sinusoid
- Arcsin
- Arctan
+ Polynomial
+ Sinusoid
+ Arcsin
+ Arctan
</pre>
<p>To print a complete list of <a href="#function">-function</a> operators, use <a href="#list">-list function</a>. Descriptions follow.</p>
@@ -3548,13 +3532,13 @@
<p>Choose from:</p>
<pre class="text">
- none
- line
- plane
- partition
- JPEG
- GIF
- PNG
+ none
+ line
+ plane
+ partition
+ JPEG
+ GIF
+ PNG
</pre>
<p>This option is used to specify the type of interlacing scheme for raw image formats such as <kbd>RGB</kbd> or <kbd>YUV</kbd>.</p>
@@ -3586,14 +3570,14 @@
point that falls between two, or even four different colored pixels. </p>
<pre class="text">
- integer: The color of the top-left pixel (floor function)
- nearest-neighbor: The nearest pixel to the lookup point (rounded function)
- average: The average color of the surrounding four pixels
- bilinear A double linear interpolation of pixels (the default)
- mesh Divide area into two flat triangular interpolations
- bicubic Fitted bicubic-spines of surrounding 16 pixels
- spline Direct spline curves (colors are blurred)
- filter Use resize <a href="#filter">-filter</a> settings
+ integer The color of the top-left pixel (floor function)
+ nearest-neighbor The nearest pixel to the lookup point (rounded function)
+ average The average color of the surrounding four pixels
+ bilinear A double linear interpolation of pixels (the default)
+ mesh Divide area into two flat triangular interpolations
+ bicubic Fitted bicubic-spines of surrounding 16 pixels
+ spline Direct spline curves (colors are blurred)
+ filter Use resize <a href="#filter">-filter</a> settings
</pre>
<p>This most important for distortion operators such as <a href="#distort"
@@ -4022,9 +4006,9 @@
<p>Use <a href="#list">-list resource</a> to list the current limits. For example, our system shows these limits:</p>
<p class='crt'><span class="crtprompt"> $magick> </span><span class='crtin'>identify -list resource</span><span class='crtout'></span></p><pre class="text">
-File Area Memory Map Disk Thread Time
-------------------------------------------------------------------------------
- 768 12.404GB 8.6642GiB 23.104GiB 18.446744EB 8 unlimited
+ File Area Memory Map Disk Thread Time
+ ------------------------------------------------------------------------------
+ 768 12.404GB 8.6642GiB 23.104GiB 18.446744EB 8 unlimited
</pre>
<p>Requests for pixel storage to keep intermediate images are satisfied by one of three resource categories: in-memory pool, memory-mapped files pool, and disk pool (in that order) depending on the <a href="../www/command-line-options.html#limit">‑limit</a> settings and whether the system honors a resource request. If the total size of allocated pixel storage in the given pool reaches the corresponding limit, the request is passed to the next pool. Additionally, requests that exceed the <kbd>area</kbd> limit automagically are allocated on disk.</p>
@@ -4099,72 +4083,23 @@
<table style='background-color:#FFFFE0; margin-left:40px; margin-right:40px; width:88%'><tr><td style='width:75%'>Print a list of supported arguments for various options or settings. Choose from these list types:</td><td style='text-align:right;'></td></tr></table>
<pre class="text">
- Align
- Alpha
- Boolean
- Channel
- Class
- ClipPath
- Coder
- Color
- Colorspace
- Command
- Compose
- Compress
- Configure
- DataType
- Debug
- Decoration
- Delegate
- Direction
- Dispose
- Distort
- Dither
- Endian
- Evaluate
- FillRule
- Filter
- Font
- Format
- Function
- Gravity
- ImageList
- Intent
- Interlace
- Interpolate
- Kernel
- Layers
- LineCap
- LineJoin
- List
- Locale
- LogEvent
- Log
- Magic
- Method
- Metric
- Mime
- Mode
- Morphology
- Module
- Noise
- Orientation
- Policy
- PolicyDomain
- PolicyRights
- Preview
- Primitive
- QuantumFormat
- Resource
- SparseColor
- Storage
- Stretch
- Style
- Threshold
- Type
- Units
- Validate
- VirtualPixel
+ Align Alpha Boolean Channel
+ Class ClipPath Coder Color
+ Colorspace Command Compose Compress
+ Configure DataType Debug Decoration
+ Delegate Direction Dispose Distort
+ Dither Endian Evaluate FillRule
+ Filter Font Format Function
+ Gravity ImageList Intent Interlace
+ Interpolate Kernel Layers LineCap
+ LineJoin List Locale LogEvent
+ Log Magic Method Metric
+ Mime Mode Morphology Module
+ Noise Orientation Policy PolicyDomain
+ PolicyRights Preview Primitive QuantumFormat
+ Resource SparseColor Storage Stretch
+ Style Threshold Type Units
+ Validate VirtualPixel
</pre>
<p>These lists vary depending on your version of ImageMagick. Use "<kbd>-list
@@ -4185,18 +4120,18 @@
characters:</p>
<pre class="text">
- %d domain
- %e event
- %f function
- %l line
- %m module
- %p process ID
- %r real CPU time
- %t wall clock time
- %u user CPU time
- %% percent sign
- \n newline
- \r carriage return
+ %d domain
+ %e event
+ %f function
+ %l line
+ %m module
+ %p process ID
+ %r real CPU time
+ %t wall clock time
+ %u user CPU time
+ %% percent sign
+ \n newline
+ \r carriage return
</pre>
<p>For example:</p>
@@ -4236,12 +4171,12 @@
<p>Choose from these <em class="arg">Standard Colormap</em> types:</p>
<pre class="text">
- best
- default
- gray
- red
- green
- blue
+ best
+ default
+ gray
+ red
+ green
+ blue
</pre>
<p>The <em class="arg">X server</em> must support the <em class="arg">Standard
@@ -4260,17 +4195,17 @@
<p>Here are the valid components of a map:</p>
<pre class="text">
- r red pixel component
- g green pixel component
- b blue pixel component
- a alpha pixel component (0 is transparent)
- o opacity pixel component (0 is opaque)
- i grayscale intensity pixel component
- c cyan pixel component
- m magenta pixel component
- y yellow pixel component
- k black pixel component
- p pad component (always 0)
+ r red pixel component
+ g green pixel component
+ b blue pixel component
+ a alpha pixel component (0 is transparent)
+ o opacity pixel component (0 is opaque)
+ i grayscale intensity pixel component
+ c cyan pixel component
+ m magenta pixel component
+ y yellow pixel component
+ k black pixel component
+ p pad component (always 0)
</pre>
<p>You can specify as many of these components as needed in any order (e.g.
@@ -4304,7 +4239,7 @@
<table style='background-color:#FFFFE0; margin-left:40px; margin-right:40px; width:88%'><tr><td style='width:75%'>return the maximum intensity of an image sequence.</td><td style='text-align:right;'></td></tr></table>
<div style="margin: auto;">
- <h4><a id="median"></a>-median <em class="arg">radius</em></h4>
+ <h4><a id="median"></a>-median <em class="arg">geometry</em></h4>
</div>
<table style='background-color:#FFFFE0; margin-left:40px; margin-right:40px; width:88%'><tr><td style='width:75%'>apply a median filter to the image.</td><td style='text-align:right;'></td></tr></table>
@@ -4318,15 +4253,15 @@
<p>Choose from:</p>
<pre class="text">
- AE absolute error count, number of different pixels (-fuzz effected)
- FUZZ mean color distance
- 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)
+ AE absolute error count, number of different pixels (-fuzz effected)
+ FUZZ mean color distance
+ 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)
</pre>
<p>Control the '<kbd>AE</kbd>', or absolute count of pixels that are different,
@@ -4352,7 +4287,7 @@
<div style="margin: auto;">
- <h4><a id="mode"></a>-mode <em class="arg">value</em></h4>
+ <h4><a id="mode"></a>-mode <em class="arg">geometry</em></h4>
</div>
<table style='background-color:#FFFFE0; margin-left:40px; margin-right:40px; width:88%'><tr><td style='width:75%'>make each pixel the 'predominate color' of the neighborhood.</td><td style='text-align:right;'>[<a href="../www/convert.html">convert</a>, <a href="../www/mogrify.html">mogrify</a>]</td></tr></table>
@@ -4485,7 +4420,7 @@
<p>The red, green, and blue intensities of an image are negated. White becomes black, yellow becomes blue, etc. Use <a href="#negate">+negate</a> to only negate the grayscale pixels of the image.</p>
<div style="margin: auto;">
- <h4><a id="noise"></a>-noise <em class="arg">radius</em><br/>
+ <h4><a id="noise"></a>-noise <em class="arg">geometry</em><br/>
+noise <em class="arg">type</em></h4>
</div>
@@ -4498,13 +4433,13 @@
<p>Use <a href="#noise">+noise</a> followed by a noise <em class="arg">type</em> to add noise to an image. Choose from these noise types:</p>
<pre class="text">
-Gaussian
-Impulse
-Laplacian
-Multiplicative
-Poisson
-Random
-Uniform
+ Gaussian
+ Impulse
+ Laplacian
+ Multiplicative
+ Poisson
+ Random
+ Uniform
</pre>
<p>To print a complete list of noises, use the <a href="#list">-list noise</a> option.</p>
@@ -4552,25 +4487,25 @@
<p>You can choose from these standard threshold maps:</p>
<pre class="text">
-threshold 1x1 Threshold 1x1 (non-dither)
-checks 2x1 Checkerboard 2x1 (dither)
-o2x2 2x2 Ordered 2x2 (dispersed)
-o3x3 3x3 Ordered 3x3 (dispersed)
-o4x4 4x4 Ordered 4x4 (dispersed)
-o8x8 8x8 Ordered 8x8 (dispersed)
-h4x4a 4x1 Halftone 4x4 (angled)
-h6x6a 6x1 Halftone 6x6 (angled)
-h8x8a 8x1 Halftone 8x8 (angled)
-h4x4o Halftone 4x4 (orthogonal)
-h6x6o Halftone 6x6 (orthogonal)
-h8x8o Halftone 8x8 (orthogonal)
-h16x16o Halftone 16x16 (orthogonal)
-c5x5b c5x5 Circles 5x5 (black)
-c5x5w Circles 5x5 (white)
-c6x6b c6x6 Circles 6x6 (black)
-c6x6w Circles 6x6 (white)
-c7x7b c7x7 Circles 7x7 (black)
-c7x7w Circles 7x7 (white)
+ threshold 1x1 Threshold 1x1 (non-dither)
+ checks 2x1 Checkerboard 2x1 (dither)
+ o2x2 2x2 Ordered 2x2 (dispersed)
+ o3x3 3x3 Ordered 3x3 (dispersed)
+ o4x4 4x4 Ordered 4x4 (dispersed)
+ o8x8 8x8 Ordered 8x8 (dispersed)
+ h4x4a 4x1 Halftone 4x4 (angled)
+ h6x6a 6x1 Halftone 6x6 (angled)
+ h8x8a 8x1 Halftone 8x8 (angled)
+ h4x4o Halftone 4x4 (orthogonal)
+ h6x6o Halftone 6x6 (orthogonal)
+ h8x8o Halftone 8x8 (orthogonal)
+ h16x16o Halftone 16x16 (orthogonal)
+ c5x5b c5x5 Circles 5x5 (black)
+ c5x5w Circles 5x5 (white)
+ c6x6b c6x6 Circles 6x6 (black)
+ c6x6w Circles 6x6 (white)
+ c7x7b c7x7 Circles 7x7 (black)
+ c7x7w Circles 7x7 (white)
</pre>
<p> The <kbd>threshold</kbd> generated a simple 50% threshold of the image.
@@ -4633,15 +4568,15 @@
<p>Choose from these orientations:</p>
<pre class="text">
- bottom-left
- bottom-right
- left-bottom
- left-top
- right-bottom
- right-top
- top-left
- top-right
- undefined
+ bottom-left
+ bottom-right
+ left-bottom
+ left-top
+ right-bottom
+ right-top
+ top-left
+ top-right
+ undefined
</pre>
<p>To print a complete list of orientations, use the <a href="#list" >-list
@@ -4795,35 +4730,14 @@
<p>Use this option to affect the preview operation of an image (e.g. <kbd>convert file.png -preview Gamma Preview:gamma.png</kbd>). Choose from these previews:</p>
<pre class="text">
- Rotate
- Shear
- Roll
- Hue
- Saturation
- Brightness
- Gamma
- Spiff
- Dull
- Grayscale
- Quantize
- Despeckle
- ReduceNoise
- Add Noise
- Sharpen
- Blur
- Threshold
- EdgeDetect
- Spread
- Shade
- Raise
- Segment
- Solarize
- Swirl
- Implode
- Wave
- OilPaint
- CharcoalDrawing
- JPEG
+ Rotate Shear Roll Hue
+ Saturation Brightness Gamma Spiff
+ Dull Grayscale Quantize Despeckle
+ ReduceNoise Add Noise Sharpen Blur
+ Threshold EdgeDetect Spread Shade
+ Raise Segment Solarize Swirl
+ Implode Wave OilPaint CharcoalDrawing
+ JPEG
</pre>
<p>To print a complete list of previews, use the <a href="#list">-list preview</a> option.</p>
@@ -4905,11 +4819,11 @@
<p>If filter-type is 4 or less, the specified filter-type is used for all scanlines:</p>
<pre class="text">
- 0: none
- 1: sub
- 2: up
- 3: average
- 4: Paeth
+ 0: none
+ 1: sub
+ 2: up
+ 3: average
+ 4: Paeth
</pre>
<p>If filter-type is 5, adaptive filtering is used when quality is greater than 50 and the image does not have a color map, otherwise no filtering is used.</p>
@@ -5402,11 +5316,11 @@
<p>For Photo CD images, choose from these sizes:</p>
<pre class="text">
- 192x128
- 384x256
- 768x512
- 1536x1024
- 3072x2048
+ 192x128
+ 384x256
+ 768x512
+ 1536x1024
+ 3072x2048
</pre>
<div style="margin: auto;">
@@ -5527,12 +5441,13 @@
<p>Choose from these statistic types:</p>
<pre class="text">
- Maximum
- Minimum
- Mean
- Median
- Mode
- Nonpeak
+ Gradient maximum difference in area
+ Maximum maximum value per channel in neighborhood
+ Minimum minimum value per channel in neighborhood
+ Mean average value per channel in neighborhood
+ Median median value per channel in neighborhood
+ Mode mode (most frequent) value per channel in neighborhood
+ Nonpeak value just before or after the median value per channel in neighborhood
</pre>
<div style="margin: auto;">
@@ -5558,13 +5473,13 @@
<table style='background-color:#FFFFE0; margin-left:40px; margin-right:40px; width:88%'><tr><td style='width:75%'>pixel storage type. Here are the valid types:</td><td style='text-align:right;'></td></tr></table>
<pre class="text">
- char store pixels as unsigned characters
- double store pixels as doubles
- float store pixels as floats
- integer store pixels as integers
- long store pixels as longs
- quantum store pixels in the native depth of your ImageMagick distribution
- short store pixels as unsigned shorts
+ char unsigned characters
+ double doubles
+ float floats
+ integer integers
+ long longs
+ quantum pixels in the native depth of your ImageMagick distribution
+ short unsigned shorts
</pre>
<p>Float and double types are normalized from 0.0 to 1.0 otherwise the pixels
@@ -5579,16 +5494,16 @@
<p>This setting suggests a type of stretch that ImageMagick should try to apply to the currently selected font family. Select <em class="arg">fontStretch</em> from the following.</p>
<pre class="text">
- Any
- Condensed
- Expanded
- ExtraCondensed
- ExtraExpanded
- Normal
- SemiCondensed
- SemiExpanded
- UltraCondensed
- UltraExpanded
+ Any
+ Condensed
+ Expanded
+ ExtraCondensed
+ ExtraExpanded
+ Normal
+ SemiCondensed
+ SemiExpanded
+ UltraCondensed
+ UltraExpanded
</pre>
<p>To print a complete list of stretch types, use <a href="#list">-list stretch</a>.</p>
@@ -5630,10 +5545,10 @@
the following.</p>
<pre class="text">
- Any
- Italic
- Normal
- Oblique
+ Any
+ Italic
+ Normal
+ Oblique
</pre>
<p>For other settings that affect fonts, see the options <a href="#font">-font</a>, <a href="#family">-family</a>, <a href="#stretch">-stretch</a>, and <a href="#weight">-weight</a>. </p>
@@ -5973,13 +5888,13 @@
<p>The parameters are:</p>
<pre class="text">
- radius: The radius of the Gaussian, in pixels, not counting the center
- pixel (default 0).
- sigma: The standard deviation of the Gaussian, in pixels (default 1.0).
- amount: The fraction of the difference between the original and the blur
- image that is added back into the original (default 1.0).
- threshold: The threshold, as a fraction of <em class="QR">QuantumRange</em>, needed to apply the
- difference amount (default 0.05).
+ radius The radius of the Gaussian, in pixels, not counting the center
+ pixel (default 0).
+ sigma The standard deviation of the Gaussian, in pixels (default 1.0).
+ amount The fraction of the difference between the original and the blur
+ image that is added back into the original (default 1.0).
+ threshold The threshold, as a fraction of <em class="QR">QuantumRange</em>, needed to apply the
+ difference amount (default 0.05).
</pre>
@@ -6025,21 +5940,21 @@
<p>Choose from these methods:</p>
<pre class="text">
- background: the area surrounding the image is the background color
- black: the area surrounding the image is black
- checker-tile: alternate squares with image and background color
- dither: non-random 32x32 dithered pattern
- edge: extend the edge pixel toward infinity
- gray: the area surrounding the image is gray
- horizontal-tile: horizontally tile the image, background color above/below
- horizontal-tile-edge: horizontally tile the image and replicate the side edge pixels
- mirror: mirror tile the image
- random: choose a random pixel from the image
- tile: tile the image (default)
- transparent: the area surrounding the image is transparent blackness
- vertical-tile: vertically tile the image, sides are background color
- vertical-tile-edge: vertically tile the image and replicate the side edge pixels
- white: the area surrounding the image is white
+ background the area surrounding the image is the background color
+ black the area surrounding the image is black
+ checker-tile alternate squares with image and background color
+ dither non-random 32x32 dithered pattern
+ edge extend the edge pixel toward infinity
+ gray the area surrounding the image is gray
+ horizontal-tile horizontally tile the image, background color above/below
+ horizontal-tile-edge horizontally tile the image and replicate the side edge pixels
+ mirror mirror tile the image
+ random choose a random pixel from the image
+ tile tile the image (default)
+ transparent the area surrounding the image is transparent blackness
+ vertical-tile vertically tile the image, sides are background color
+ vertical-tile-edge vertically tile the image and replicate the side edge pixels
+ white the area surrounding the image is white
</pre>
<p>The default value is "edge".</p>
@@ -6062,14 +5977,14 @@
<p>Choose from these visual classes:</p>
<pre class="text">
- StaticGray
- GrayScale
- StaticColor
- PseudoColor
- TrueColor
- DirectColor
- default
- visual id
+ StaticGray
+ GrayScale
+ StaticColor
+ PseudoColor
+ TrueColor
+ DirectColor
+ default
+ visual id
</pre>
<p>The X server must support the visual you choose, otherwise an error occurs. If a visual is not specified, the visual class that can display the most simultaneous colors on the default screen is chosen.</p>
diff --git a/www/command-line-processing.html b/www/command-line-processing.html
index b6c43f3..47de7bf 100644
--- a/www/command-line-processing.html
+++ b/www/command-line-processing.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Notebook Reparatur Berlin" href="http://www.notebook-reparaturen-berlin.de">Notebook Reparatur Berlin</a><!-- 2011060100025 gabi.schulze-->
+ <a title="Sponsor: Fototapete" href=" http://www.allesdruck.de/Fototapete-Tapetendruck,category,8830.html">Fototapete</a><!-- 20110701000080 a-o.de -->
</div>
</div>
</div>
diff --git a/www/command-line-tools.html b/www/command-line-tools.html
index 92ccdc7..c6bdb22 100644
--- a/www/command-line-tools.html
+++ b/www/command-line-tools.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011080100025 atlas.multimedia-->
+ <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
</div>
</div>
</div>
diff --git a/www/compare.html b/www/compare.html
index 592af40..fbcd792 100644
--- a/www/compare.html
+++ b/www/compare.html
@@ -185,7 +185,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Fototapete" href=" http://www.allesdruck.de/Fototapete-Tapetendruck,category,8830.html">Fototapete</a><!-- 20110701000080 a-o.de -->
+ <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
</div>
</div>
</div>
diff --git a/www/compose.html b/www/compose.html
index 36f639a..a02d725 100644
--- a/www/compose.html
+++ b/www/compose.html
@@ -185,7 +185,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Notebook Reparatur Berlin" href="http://www.notebook-reparaturen-berlin.de">Notebook Reparatur Berlin</a><!-- 2011060100025 gabi.schulze-->
+ <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011080100025 atlas.multimedia-->
</div>
</div>
</div>
diff --git a/www/conjure.html b/www/conjure.html
index 773c067..5566d10 100644
--- a/www/conjure.html
+++ b/www/conjure.html
@@ -185,7 +185,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
+ <a title="Sponsor: Autoteile Online Shop" href="http://www.autoteile-carparts.de">Autoteile Online Shop</a><!-- 2011070100030 autoteile-Carparts-->
</div>
</div>
</div>
diff --git a/www/convert.html b/www/convert.html
index 951acda..fe26765 100644
--- a/www/convert.html
+++ b/www/convert.html
@@ -185,7 +185,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
+ <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
</div>
</div>
</div>
diff --git a/www/display.html b/www/display.html
index d8c0f6d..6f848fd 100644
--- a/www/display.html
+++ b/www/display.html
@@ -185,7 +185,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
+ <a title="Sponsor: Notebook Reparatur Berlin" href="http://www.notebook-reparaturen-berlin.de">Notebook Reparatur Berlin</a><!-- 2011060100025 gabi.schulze-->
</div>
</div>
</div>
diff --git a/www/download.html b/www/download.html
index 8f7c20e..0a64abc 100644
--- a/www/download.html
+++ b/www/download.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011080100025 atlas.multimedia-->
+ <a title="Sponsor: Autoteile Online Shop" href="http://www.autoteile-carparts.de">Autoteile Online Shop</a><!-- 2011070100030 autoteile-Carparts-->
</div>
</div>
</div>
@@ -199,7 +199,7 @@
<h1>Download ImageMagick</h1>
<div class="doc-section">
<p>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 <a href="../www/subversion.html">Subversion</a>. Before you download, you may want to review recent <a href="../www/changelog.html">changes</a> to the ImageMagick distribution.</p>
-<p>The latest release of ImageMagick is version 6.6.9-3.</p>
+<p>The latest release of ImageMagick is version 6.6.9-4.</p>
<dl>
<dt class="doc">Australia</dt>
<dd><a href="ftp://mirror.aarnet.edu.au/pub/imagemagick/">ftp://mirror.aarnet.edu.au/pub/imagemagick/</a></dd>
diff --git a/www/escape.html b/www/escape.html
index c8b69d6..fd034c4 100644
--- a/www/escape.html
+++ b/www/escape.html
@@ -185,7 +185,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Notebook Reparatur Berlin" href="http://www.notebook-reparaturen-berlin.de">Notebook Reparatur Berlin</a><!-- 2011060100025 gabi.schulze-->
+ <a title="Sponsor: Fototapete" href=" http://www.allesdruck.de/Fototapete-Tapetendruck,category,8830.html">Fototapete</a><!-- 20110701000080 a-o.de -->
</div>
</div>
</div>
diff --git a/www/examples.html b/www/examples.html
index c81a81a..e71ce24 100644
--- a/www/examples.html
+++ b/www/examples.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Notebook Reparatur Berlin" href="http://www.notebook-reparaturen-berlin.de">Notebook Reparatur Berlin</a><!-- 2011060100025 gabi.schulze-->
+ <a title="Sponsor: Autoteile Online Shop" href="http://www.autoteile-carparts.de">Autoteile Online Shop</a><!-- 2011070100030 autoteile-Carparts-->
</div>
</div>
</div>
diff --git a/www/exception.html b/www/exception.html
index fe8390c..d3f69ed 100644
--- a/www/exception.html
+++ b/www/exception.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011080100025 atlas.multimedia-->
+ <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
</div>
</div>
</div>
diff --git a/www/export.html b/www/export.html
index 679f535..a4044dd 100644
--- a/www/export.html
+++ b/www/export.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Fototapete" href=" http://www.allesdruck.de/Fototapete-Tapetendruck,category,8830.html">Fototapete</a><!-- 20110701000080 a-o.de -->
+ <a title="Sponsor: Autoteile Online Shop" href="http://www.autoteile-carparts.de">Autoteile Online Shop</a><!-- 2011070100030 autoteile-Carparts-->
</div>
</div>
</div>
diff --git a/www/formats.html b/www/formats.html
index f87d0bd..85c5932 100644
--- a/www/formats.html
+++ b/www/formats.html
@@ -185,7 +185,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
+ <a title="Sponsor: Autoteile Online Shop" href="http://www.autoteile-carparts.de">Autoteile Online Shop</a><!-- 2011070100030 autoteile-Carparts-->
</div>
</div>
</div>
@@ -1424,7 +1424,7 @@
<tr>
<td valign="top"><a href="../images/wizard.png">WIZARD</a></td>
<td valign="top">R</td>
- <td valign="top">ImageMagick Wizard, 640x480</td>
+ <td valign="top">ImageMagick Wizard, 480x640</td>
<td valign="top"><img src="../images/wizard.jpg" width="125" height="167" alt="Logo"/></td>
</tr>
diff --git a/www/fx.html b/www/fx.html
index c673dda..66987cd 100644
--- a/www/fx.html
+++ b/www/fx.html
@@ -185,7 +185,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
+ <a title="Sponsor: Autoteile Online Shop" href="http://www.autoteile-carparts.de">Autoteile Online Shop</a><!-- 2011070100030 autoteile-Carparts-->
</div>
</div>
</div>
@@ -248,6 +248,13 @@
<p class="image">
<a href="../images/radial-gradient.png"><img src="../images/radial-gradient.png" width="70" height="70" alt="radial-gradient" /></a>
</p>
+
+<p>This FX expression adds random noise to an image:</p>
+
+<p class='crt'><span class="crtprompt"> $magick> </span><span class='crtin'>convert photo.jpg -fx 'iso=32; rone=rand(); rtwo=rand(); \<br />
+ myn=sqrt(-2*ln(rone))*cos(2*Pi*rtwo); myntwo=sqrt(-2*ln(rtwo))* \<br />
+ cos(2*Pi*rone); pnoise=sqrt(p)*myn*sqrt(iso)* \ <br />
+ channel(4.28,3.86,6.68,0)/255; max(0,p+pnoise)' noisy.png</span></p>
<p>See <a href="http://www.imagemagick.org/Usage/transform/index.html#fx">Using FX, The Special Effects Image Operator</a> for more examples.</p>
<p>The next section discusses the Fx expression language.</p>
diff --git a/www/high-dynamic-range.html b/www/high-dynamic-range.html
index 4216f7d..4790014 100644
--- a/www/high-dynamic-range.html
+++ b/www/high-dynamic-range.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
+ <a title="Sponsor: Notebook Reparatur Berlin" href="http://www.notebook-reparaturen-berlin.de">Notebook Reparatur Berlin</a><!-- 2011060100025 gabi.schulze-->
</div>
</div>
</div>
diff --git a/www/identify.html b/www/identify.html
index 6d62f5f..4287a11 100644
--- a/www/identify.html
+++ b/www/identify.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Notebook Reparatur Berlin" href="http://www.notebook-reparaturen-berlin.de">Notebook Reparatur Berlin</a><!-- 2011060100025 gabi.schulze-->
+ <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011080100025 atlas.multimedia-->
</div>
</div>
</div>
@@ -267,7 +267,7 @@
Tainted: False <br/>
Filesize: 3.97266kb <br/>
Number pixels: 3.14453kb <br/>
- Version: ImageMagick 6.6.9-3 2011-04-01 Q16 http://www.imagemagick.org</span></p>
+ Version: ImageMagick 6.6.9-4 2011-04-01 Q16 http://www.imagemagick.org</span></p>
<p>To get the print size in inches of an image at 72 DPI, use:</p>
<p class='crt'><span class="crtprompt"> $magick> </span><span class='crtin'>identify -format "%[fx:w/72] by %[fx:h/72] inches" document.png</span><span class='crtout'>8.5 x 11 inches</span></p>
diff --git a/www/import.html b/www/import.html
index 3ec554b..aef4489 100644
--- a/www/import.html
+++ b/www/import.html
@@ -185,7 +185,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Fototapete" href=" http://www.allesdruck.de/Fototapete-Tapetendruck,category,8830.html">Fototapete</a><!-- 20110701000080 a-o.de -->
+ <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
</div>
</div>
</div>
diff --git a/www/index.html b/www/index.html
index 5ef97e2..74ab81a 100644
--- a/www/index.html
+++ b/www/index.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
+ <a title="Sponsor: Autoteile Online Shop" href="http://www.autoteile-carparts.de">Autoteile Online Shop</a><!-- 2011070100030 autoteile-Carparts-->
</div>
</div>
</div>
@@ -209,7 +209,7 @@
<p>The ImageMagick development process ensures a stable API and ABI. Before each ImageMagick release, we perform a comprehensive security assessment that includes <a href="http://www.valgrind.org">memory and thread</a> error detection to prevent security vulnerabilities.</p>
-<p>The current release is ImageMagick 6.6.9-3.</p>
+<p>The current release is ImageMagick 6.6.9-4.</p>
</div>
diff --git a/www/jp2.html b/www/jp2.html
index dd7ba3d..b34aa35 100644
--- a/www/jp2.html
+++ b/www/jp2.html
@@ -185,7 +185,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Notebook Reparatur Berlin" href="http://www.notebook-reparaturen-berlin.de">Notebook Reparatur Berlin</a><!-- 2011060100025 gabi.schulze-->
+ <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
</div>
</div>
</div>
diff --git a/www/license.html b/www/license.html
index a20f5a8..1788a7d 100644
--- a/www/license.html
+++ b/www/license.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
+ <a title="Sponsor: Autoteile Online Shop" href="http://www.autoteile-carparts.de">Autoteile Online Shop</a><!-- 2011070100030 autoteile-Carparts-->
</div>
</div>
</div>
diff --git a/www/links.html b/www/links.html
index fdd93a6..dd3bbb5 100644
--- a/www/links.html
+++ b/www/links.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
+ <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011080100025 atlas.multimedia-->
</div>
</div>
</div>
diff --git a/www/magick++.html b/www/magick++.html
index 6870e61..ea931a5 100644
--- a/www/magick++.html
+++ b/www/magick++.html
@@ -185,7 +185,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Fototapete" href=" http://www.allesdruck.de/Fototapete-Tapetendruck,category,8830.html">Fototapete</a><!-- 20110701000080 a-o.de -->
+ <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
</div>
</div>
</div>
diff --git a/www/magick-core.html b/www/magick-core.html
index 82dc8c0..5dac3a8 100644
--- a/www/magick-core.html
+++ b/www/magick-core.html
@@ -185,7 +185,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
+ <a title="Sponsor: Autoteile Online Shop" href="http://www.autoteile-carparts.de">Autoteile Online Shop</a><!-- 2011070100030 autoteile-Carparts-->
</div>
</div>
</div>
diff --git a/www/magick-vector-graphics.html b/www/magick-vector-graphics.html
index 8523d06..054389d 100644
--- a/www/magick-vector-graphics.html
+++ b/www/magick-vector-graphics.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Webdesign" href="http://www.renehornig.com/">Webdesign</a><!-- 20111001000240 -->
+ <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
</div>
</div>
</div>
diff --git a/www/magick-wand.html b/www/magick-wand.html
index 96bb214..c8d91f0 100644
--- a/www/magick-wand.html
+++ b/www/magick-wand.html
@@ -185,7 +185,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
+ <a title="Sponsor: Autoteile Online Shop" href="http://www.autoteile-carparts.de">Autoteile Online Shop</a><!-- 2011070100030 autoteile-Carparts-->
</div>
</div>
</div>
diff --git a/www/mogrify.html b/www/mogrify.html
index 7528511..2567e06 100644
--- a/www/mogrify.html
+++ b/www/mogrify.html
@@ -185,7 +185,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011080100025 atlas.multimedia-->
+ <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
</div>
</div>
</div>
diff --git a/www/montage.html b/www/montage.html
index f787273..d383b2e 100644
--- a/www/montage.html
+++ b/www/montage.html
@@ -185,7 +185,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011080100025 atlas.multimedia-->
+ <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
</div>
</div>
</div>
diff --git a/www/motion-picture.html b/www/motion-picture.html
index 0678925..a9a06b5 100644
--- a/www/motion-picture.html
+++ b/www/motion-picture.html
@@ -185,7 +185,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Fototapete" href=" http://www.allesdruck.de/Fototapete-Tapetendruck,category,8830.html">Fototapete</a><!-- 20110701000080 a-o.de -->
+ <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
</div>
</div>
</div>
diff --git a/www/perl-magick.html b/www/perl-magick.html
index e63b800..b25f55e 100644
--- a/www/perl-magick.html
+++ b/www/perl-magick.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Notebook Reparatur Berlin" href="http://www.notebook-reparaturen-berlin.de">Notebook Reparatur Berlin</a><!-- 2011060100025 gabi.schulze-->
+ <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011080100025 atlas.multimedia-->
</div>
</div>
</div>
diff --git a/www/resources.html b/www/resources.html
index 5e1c559..b9da526 100644
--- a/www/resources.html
+++ b/www/resources.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Fototapete" href=" http://www.allesdruck.de/Fototapete-Tapetendruck,category,8830.html">Fototapete</a><!-- 20110701000080 a-o.de -->
+ <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011080100025 atlas.multimedia-->
</div>
</div>
</div>
@@ -307,7 +307,7 @@
<pre class="text">
$MAGICK_CONFIGURE_PATH
$PREFIX/etc/ImageMagick
- $PREFIX/share/ImageMagick-6.6.9
+ $PREFIX/share/ImageMagick-6.6.9
$HOME/.magick/
<<em>client path</em>>/etc/ImageMagick/
</pre>
@@ -319,8 +319,9 @@
<pre class="text">
$MAGICK_CONFIGURE_PATH
$MAGICK_HOME/etc/ImageMagick
- $MAGICK_HOME/share/ImageMagick-6.6.9
- $PREFIX/share/ImageMagick-6.6.9 $HOME/.magick/
+ $MAGICK_HOME/share/ImageMagick-6.6.9
+ $PREFIX/share/ImageMagick-6.6.9
+ $HOME/.magick/
<<em>client path</em>>/etc/ImageMagick/
<<em>current directory</em>>
</pre>
@@ -354,11 +355,11 @@
<h2><a id="modules"></a>Modules</h2>
<div class="doc-section">
-<p>ImageMagick's image format support is usually provided in the form of loadable modules. It searches for loadable modules in the following order and it uses the first match found:</p>
+<h4>Coders</h4>
+<p>An image coder (i.e. encoder / decoder) is responsible for registering, optionally classifying, optionally reading, optionally writing, and unregistering one image format (e.g. PNG, GIF, JPEG, etc.). ImageMagick searches for coders in the following order and it uses the first match found:</p>
<pre class="text">
$MAGICK_HOME/lib/ImageMagick-6.6.9/modules-Q16/coders/
- $HOME/.magick/
<<em>client path</em>>/../lib/ImageMagick-6.6.9/modules-Q16/coders/
$MAGICK_HOME/lib/ImageMagick-6.6.9/modules-Q16/coders
$MAGICK_HOME/share/ImageMagick-6.6.9/modules-Q16/coders
@@ -366,6 +367,17 @@
<<em>client path</em>>/lib/ImageMagick-6.6.9/modules-Q16/coders
</pre>
+<h4>Filters</h4>
+<p>ImageMagick provides a convenient mechanism for adding your own custom image processing algorithms. ImageMagick searches for filters in the following order and it uses the first match found:</p>
+<pre class="text">
+ $MAGICK_HOME/lib/ImageMagick-6.6.9/modules-Q16/filters/
+ <<em>client path</em>>/../lib/ImageMagick-6.6.9/modules-Q16/filters/
+ $MAGICK_HOME/lib/ImageMagick-6.6.9/modules-Q16/filters
+ $MAGICK_HOME/share/ImageMagick-6.6.9/modules-Q16/filters
+ $HOME/.magick/
+ <<em>client path</em>>/lib/ImageMagick-6.6.9/modules-Q16/filters
+</pre>
+
</div>
<h2><a id="fonts"></a>Fonts</h2>
diff --git a/www/search.html b/www/search.html
index 3804e12..3d4f90e 100644
--- a/www/search.html
+++ b/www/search.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
+ <a title="Sponsor: Autoteile Online Shop" href="http://www.autoteile-carparts.de">Autoteile Online Shop</a><!-- 2011070100030 autoteile-Carparts-->
</div>
</div>
</div>
diff --git a/www/sponsors.html b/www/sponsors.html
index 9238f77..7427c7b 100644
--- a/www/sponsors.html
+++ b/www/sponsors.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
+ <a title="Sponsor: Autoteile Online Shop" href="http://www.autoteile-carparts.de">Autoteile Online Shop</a><!-- 2011070100030 autoteile-Carparts-->
</div>
</div>
</div>
@@ -208,6 +208,7 @@
<dl>
<dd><a title="alaTest.com" href="http://alatest.com">alaTest.com </a></dd>
+ <dd><a title="Autoteile Online Shop" href="http://www.autoteile-carparts.de">Autoteile Online Shop </a></dd>
<dd><a title="Best Web Hosting" href="http://webhostinggeeks.com">Best Web Hosting</a></dd>
<dd><a title="Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a></dd>
<dd><a title="Druckerei" href="http://www.allesdruck.de">Druckerei</a></dd>
diff --git a/www/stream.html b/www/stream.html
index e1b5dba..c2b9dc0 100644
--- a/www/stream.html
+++ b/www/stream.html
@@ -185,7 +185,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: alaTest.com" href="http://alatest.com">alaTest.com</a><!-- 20110801000300 -->
+ <a title="Sponsor: Fernsehdienst Berlin" href="http://www.atlas-multimedia.de">Fernsehdienst Berlin</a><!-- 2011080100025 atlas.multimedia-->
</div>
</div>
</div>
diff --git a/www/subversion.html b/www/subversion.html
index 3cabba9..0b4a5bd 100644
--- a/www/subversion.html
+++ b/www/subversion.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Custom T-Shirts" href="http://www.ooshirts.com">Custom T-Shirts</a><!-- 2011050100030 ooshirts.com-->
+ <a title="Sponsor: Notebook Reparatur Berlin" href="http://www.notebook-reparaturen-berlin.de">Notebook Reparatur Berlin</a><!-- 2011060100025 gabi.schulze-->
</div>
</div>
</div>
diff --git a/www/t-shirt.html b/www/t-shirt.html
index 1e24807..0d5e020 100644
--- a/www/t-shirt.html
+++ b/www/t-shirt.html
@@ -184,7 +184,7 @@
<a title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 201110010720 -->
</div>
<div class="sponsor">
- <a title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
+ <a title="Sponsor: Autoteile Online Shop" href="http://www.autoteile-carparts.de">Autoteile Online Shop</a><!-- 2011070100030 autoteile-Carparts-->
</div>
</div>
</div>