...

diff --git a/MagickCore/magick.c b/MagickCore/magick.c
index dc16b72065feb962e2009c3fbf4e80e6f515bce2..e6e3acfab0bc79242d0a1a1fb8fb799172b5ed19 100644 (file)
--- a/MagickCore/magick.c
+++ b/MagickCore/magick.c
@@ -1500,6 +1500,9 @@ MagickExport void MagickCoreGenesis(const char *path,
   */
   (void) ConfigureComponentGenesis();
   (void) PolicyComponentGenesis();
+#if defined(MAGICKCORE_ZERO_CONFIGURATION_SUPPORT)
+  (void) ZeroConfigurationPolicy;
+#endif
   (void) CacheComponentGenesis();
   (void) ResourceComponentGenesis();
   (void) CoderComponentGenesis();

diff --git a/MagickCore/policy-private.h b/MagickCore/policy-private.h
index 63683b53f3540819c59bf18d3813437b585a2098..b81adec21eaedcca3f8f1cfeb6e9664472db2183 100644 (file)
--- a/MagickCore/policy-private.h
+++ b/MagickCore/policy-private.h
@@ -22,6 +22,18 @@
 extern "C" {
 #endif
 
+#if defined(MAGICKCORE_ZERO_CONFIGURATION_SUPPORT)
+/*
+  Zero configuration security policy.  Discussion @
+  https://www.imagemagick.org/script/security-policy.php.
+*/
+static const char
+  *ZeroConfigurationPolicy = \
+"<policymap> \
+  <policy domain=\"system\" name=\"precision\" value=\"6\"/> \
+</policymap>";
+#endif
+
 extern MagickPrivate MagickBooleanType
   PolicyComponentGenesis(void);
 

diff --git a/configure b/configure
index 7eff410e4d225cfaa1cb615d5fa8f9b2dde16119..76661976b8aec230b5ebcb0cf9b7d5c94f82a793 100755 (executable)
--- a/configure
+++ b/configure
@@ -4519,7 +4519,7 @@ MAGICK_PATCHLEVEL_VERSION=7
 
 MAGICK_VERSION=7.0.5-7
 
-MAGICK_GIT_REVISION=20041:16a4635:20170513
+MAGICK_GIT_REVISION=20043:448775d:20170514
 
 
 # Substitute library versioning

diff --git a/www/ImageMagickObject.html b/www/ImageMagickObject.html
index a528aa646e5b60a1f9f72dddca6c1bfb79055f65..2f79c7d3780c2c78a64e46a44c3253260fcb29da 100644 (file)
--- a/www/ImageMagickObject.html
+++ b/www/ImageMagickObject.html
@@ -130,4 +130,4 @@ regsvr32 /u /s ImageMagickObject.dll
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:54 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/advanced-unix-installation.html b/www/advanced-unix-installation.html
index 5cb34b454a6dba9bb8065ad96d1fcc393a9deb99..0b4a07806965615e86a055a49d0af3d4b035b58b 100644 (file)
--- a/www/advanced-unix-installation.html
+++ b/www/advanced-unix-installation.html
@@ -78,7 +78,7 @@ tar xvzf ImageMagick.tar.gz
 
 <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>
 
-<pre><span class="crtprompt"> </span><span class='crtin'>cd ImageMagick-7.0.5-4</span><span class='crtout'></span><span class="crtprompt"> </span><span class='crtin'>./configure</span></pre>
+<pre><span class="crtprompt"> </span><span class='crtin'>cd ImageMagick-7.0.5-6</span><span class='crtout'></span><span class="crtprompt"> </span><span class='crtin'>./configure</span></pre>
 <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>
 
@@ -534,7 +534,7 @@ sudo port install jpeg
 
          <p><a href="download.html">Download</a> the ImageMagick source distribution and verify the distribution against its <a href="https://www.imagemagick.org/download/digest.rdf">message digest</a>.</p>
          <p>Unpack and change into the top-level ImageMagick directory:</p>
-               <pre><span class="crtprompt"> </span><span class='crtin'>tar xvzf ImageMagick-7.0.5-4.tar.gz</span><span class='crtout'></span><span class="crtprompt"> </span><span class='crtin'>cd ImageMagick-7.0.5-4</span></pre>    <p>Configure ImageMagick:</p>
+               <pre><span class="crtprompt"> </span><span class='crtin'>tar xvzf ImageMagick-7.0.5-6.tar.gz</span><span class='crtout'></span><span class="crtprompt"> </span><span class='crtin'>cd ImageMagick-7.0.5-6</span></pre>    <p>Configure ImageMagick:</p>
 <pre>
 ./configure --prefix=/opt --with-quantum-depth=16 \
   --disable-dependency-tracking --with-x=yes \
@@ -566,7 +566,7 @@ display -display :0
 
 <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>
 
-<pre><span class="crtprompt"> </span><span class='crtin'>tar jxvf ImageMagick-7.0.5-?.tar.bz2</span><span class='crtout'><br/></span><span class="crtprompt"> </span><span class='crtin'>cd ImageMagick-7.0.5-4</span><span class='crtout'><br/></span><span class="crtprompt"> </span><span class='crtin'>export CPPFLAGS="-Ic:/Progra~1/GnuWin32/include"</span><span class='crtout'><br/></span><span class="crtprompt"> </span><span class='crtin'>export LDFLAGS="-Lc:/Progra~1/GnuWin32/lib"</span><span class='crtout'><br/></span><span class="crtprompt"> </span><span class='crtin'>./configure --without-perl</span><span class='crtout'><br/></span><span class="crtprompt"> </span><span class='crtin'>make</span><span class='crtout'><br/></span><span class="crtprompt"> </span><span class='crtin'>sudo make install</span></pre>
+<pre><span class="crtprompt"> </span><span class='crtin'>tar jxvf ImageMagick-7.0.5-?.tar.bz2</span><span class='crtout'><br/></span><span class="crtprompt"> </span><span class='crtin'>cd ImageMagick-7.0.5-6</span><span class='crtout'><br/></span><span class="crtprompt"> </span><span class='crtin'>export CPPFLAGS="-Ic:/Progra~1/GnuWin32/include"</span><span class='crtout'><br/></span><span class="crtprompt"> </span><span class='crtin'>export LDFLAGS="-Lc:/Progra~1/GnuWin32/lib"</span><span class='crtout'><br/></span><span class="crtprompt"> </span><span class='crtin'>./configure --without-perl</span><span class='crtout'><br/></span><span class="crtprompt"> </span><span class='crtin'>make</span><span class='crtout'><br/></span><span class="crtprompt"> </span><span class='crtin'>sudo make install</span></pre>
 <h2 class="magick-header"><a id="problems"></a>Dealing with Unexpected Problems</h2>
 
 <p>Chances are the download, configure, build, and install of ImageMagick went flawlessly as it is intended, however, certain systems and environments may cause one or more steps to fail.  We discuss a few problems we've run across and how to take corrective action to ensure you have a working release of ImageMagick</p>
@@ -636,4 +636,4 @@ identify -list format
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 16:32 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/advanced-windows-installation.html b/www/advanced-windows-installation.html
index c177f7c18e6203c54b2fce7b13cdb4551b73c273..1d365c0ed41f08e14095c76b84e9e1cf07a3bc98 100644 (file)
--- a/www/advanced-windows-installation.html
+++ b/www/advanced-windows-installation.html
@@ -331,7 +331,7 @@ dmake release
 
        <ol>
        <li>Double-click on
-       <code>VisualMagick/bin/ImageMagick-7.0.5-4-Q16-windows-dll.exe</code>
+       <code>VisualMagick/bin/ImageMagick-7.0.5-6-Q16-windows-dll.exe</code>
        to launch the ImageMagick binary distribution.</li>
        <li>Complete the installer screens to install ImageMagick on your system.</li>
        </ol>
@@ -401,4 +401,4 @@ _MAGICKMOD_
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 16:26 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/animate.html b/www/animate.html
index 6d2e9940cde72076ce1219989760ff719ae37c73..0509be8c692260ba558034b41b3d083f48d29057 100644 (file)
--- a/www/animate.html
+++ b/www/animate.html
@@ -532,4 +532,4 @@ transparent, extract, background, or shape the alpha channel</td>
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:42 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/architecture.html b/www/architecture.html
index 7b1863ad52d4f35d78dfcb29c6c60e2eaaf7c62e..a2cbad535c3937b4edb9567726cd17b5206c5ba3 100644 (file)
--- a/www/architecture.html
+++ b/www/architecture.html
@@ -135,7 +135,7 @@ if (image == (Image *) NULL)
 
 <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 8-bit gray 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="command-line-options.html#version">&#x2011;version</a> option: </p>
 
-<pre><span class="crtprompt"> </span><span class='crtin'>identify -version</span><span class='crtout'><br/></span><span class="crtprompt"> </span><span class='crtin'>Version: ImageMagick 7.0.5-4 2017-03-18 Q16 https://www.imagemagick.org</span></pre>
+<pre><span class="crtprompt"> </span><span class='crtin'>identify -version</span><span class='crtout'><br/></span><span class="crtprompt"> </span><span class='crtin'>Version: ImageMagick 7.0.5-6 2017-05-18 Q16 https://www.imagemagick.org</span></pre>
 <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 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>
 
 <h3><a id="authentic-pixels"></a>Access the Pixel Cache</h3>
@@ -1423,4 +1423,4 @@ ModuleExport size_t analyzeImage(Image **images,const int argc,const char **argv
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:47 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/changelog.html b/www/changelog.html
index 112cbef7c40c570186f8cc08fd2704d2c6a61d81..91039de6e02d51f18702d071b63d3ad0a93435da 100644 (file)
--- a/www/changelog.html
+++ b/www/changelog.html
@@ -56,7 +56,26 @@
   </div>
 </div>
 <div class="container">
-<div class="magick-header"><dl><dt>2017-03-24  7.0.5-4 Cristy  &lt;quetzlzacatenango@image...&gt;</dt>
+<div class="magick-header"><dl><dt>2017-05-12  7.0.5-6 Cristy  &lt;quetzlzacatenango@image...&gt;</dt>
+  <li> Release ImageMagick version 7.0.5-6, GIT revision 20039:9371904:20170512.</li>
+<dt>2017-05-10  7.0.5-6 John Cupitt &lt;jcupitt@gmail.com&gt;</dt>
+  <li> Revise DICOM window and rescale handling (reference     https://github.com/ImageMagick/ImageMagick/pull/484)</li>
+<dt>2017-05-06  7.0.5-6 Cristy  &lt;quetzlzacatenango@image...&gt;</dt>
+  <li> Restore the -alpha Shape option (reference    https://www.imagemagick.org/discourse-server/viewtopic.html?f=3&amp;t=31879).</li>
+  <li> Fix transient PDF bug (reference    https://github.com/ImageMagick/ImageMagick/issues/463).</li>
+  <li> The +opaque option now works on all channels (reference    https://www.imagemagick.org/discourse-server/viewtopic.html?f=3&amp;t=31862).</li>
+  <li> Ensure backwards compatibility for the -combine option (reference    https://www.imagemagick.org/discourse-server/viewtopic.html?f=3&amp;t=31855).</li>
+  <li> Check for EOF conditions for RLE image format.</li>
+  <li> Reset histogram page geometry (reference    https://www.imagemagick.org/discourse-server/viewtopic.html?f=3&amp;t=31920).</li>
+<dt>2017-04-24  7.0.5-5 Cristy  &lt;quetzlzacatenango@image...&gt;</dt>
+  <li> Release ImageMagick version 7.0.5-5, GIT revision 19915:12eec43:20170424.</li>
+<dt>2017-03-26  7.0.5-5 Cristy  &lt;quetzlzacatenango@image...&gt;</dt>
+  <li> Minimize buffer copies to improve OpenCL performance.</li>
+  <li> Morphology thinning is no longer a no-op (reference    https://www.imagemagick.org/discourse-server/viewtopic.html?f=3&amp;t=31650).</li>
+  <li> Patch two PCD writer problems, corrupt output and dark pixels (reference    https://www.imagemagick.org/discourse-server/viewtopic.html?f=3&amp;t=3164).</li>
+  <li> Support ICC based PDF's (reference    https://github.com/ImageMagick/ImageMagick/issues/417).</li>
+  <li> Fix improper EPS clip path rendering (reference    http://www.imagemagick.org/discourse-server/viewtopic.html?f=3&amp;t=31722).</li>
+<dt>2017-03-24  7.0.5-4 Cristy  &lt;quetzlzacatenango@image...&gt;</dt>
   <li> Release ImageMagick version 7.0.5-4, GIT revision 19754:350fff3:20170324.</li>
 <dt>2017-03-21  7.0.5-4 Cristy  &lt;quetzlzacatenango@image...&gt;</dt>
   <li> Respect -loop option for animate -window (reference    https://www.imagemagick.org/discourse-server/viewtopic.html?f=3&amp;t=31619).</li>
@@ -64,7 +83,7 @@
   <li> Release ImageMagick version 7.0.5-3, GIT revision 19741:070c3fb:20170317.</li>
 <dt>2017-03-14  7.0.5-3 Cristy  &lt;quetzlzacatenango@image...&gt;</dt>
   <li> Support namespaces for the security policy.</li>
-  <li> Support the -authenticate option for PDF (reference    Counting objects: 7, done.g/discourse-server/viewtopic.html?f=3&amp;t=31530).</li>
+  <li> Support the -authenticate option for PDF (reference    https://www.imagemagick.org/discourse-server/viewtopic.html?f=3&amp;t=31530).</li>
 <dt>2017-03-11  7.0.5-2 Cristy  &lt;quetzlzacatenango@image...&gt;</dt>
   <li> Release ImageMagick version 7.0.5-2, GIT revision 19696:da91a7c:20170311.</li>
 <dt>2017-03-06  7.0.5-2 Cristy  &lt;quetzlzacatenango@image...&gt;</dt>
@@ -375,4 +394,4 @@
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:33 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/cipher.html b/www/cipher.html
index bff28c529b20afe371ea459e3695b631b9da67a1..83d25403bf6cb1eede6c780ca9b60bda7a5412b8 100644 (file)
--- a/www/cipher.html
+++ b/www/cipher.html
@@ -140,4 +140,4 @@ Examples <a href="https://www.imagemagick.org/Usage/transform/#encipher"
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:47 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/color-management.html b/www/color-management.html
index a8357f99c975a95a3e1a79cad3a3caad36344788..6ce1862c394b4697dd761a5ba076e147440bdc22 100644 (file)
--- a/www/color-management.html
+++ b/www/color-management.html
@@ -150,4 +150,4 @@ convert myimage_channels_*.png -set colorspace HSL -combine -colorspace RGB -set
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:47 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/color.html b/www/color.html
index 9c95c0c753daa4748eb9f2ec37e2596c297ca941..02ee0473141f54a988533539ab52659c62ca7d00 100644 (file)
--- a/www/color.html
+++ b/www/color.html
@@ -4951,4 +4951,4 @@ device-cmyk(0.11, 0.48, 0.83, 0.00)
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:42 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/command-line-options.html b/www/command-line-options.html
index c51ff66b06fedb5b170c2c194236c8b29720086a..bd6ec4dccd813521f1d3c811f93ff27d111f627e 100644 (file)
--- a/www/command-line-options.html
+++ b/www/command-line-options.html
@@ -1330,6 +1330,7 @@ YIQ          YPbPr        YUV          Undefined
 
 <div style="margin: auto;">
   <h3 class="magick-header"><a id="combine"></a>-combine</h3>
+  <h3 class="magick-header">+combine <var>colorspace</var></h3>
 </div>
 
 <p class="magick-description">Combine one or more images into a single image.</p>
@@ -8094,4 +8095,4 @@ but with strict boolean masking. </p>
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:32 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/command-line-processing.html b/www/command-line-processing.html
index 44316f14b88d13099466630932222339a6b57609..ac3b1925d5eb6c9180f455df930cd85c643402d1 100644 (file)
--- a/www/command-line-processing.html
+++ b/www/command-line-processing.html
@@ -688,4 +688,4 @@ magick -define stream:buffer-size=0 logo: gif:- | display gif:-
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:35 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/command-line-tools.html b/www/command-line-tools.html
index 2bff4a32b9c503efda6ca28b7e478f53b4dad2cf..2601f663bd4762eed8b139e06fd2a1d060b50263 100644 (file)
--- a/www/command-line-tools.html
+++ b/www/command-line-tools.html
@@ -107,4 +107,4 @@ magick convert logo: logo.jpg
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:36 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/compare.html b/www/compare.html
index 7265d1508a7934ed9ae652e52c661b667e7780ed..e0bffaf690f283da866cdb56fd5b2037fcba5c99 100644 (file)
--- a/www/compare.html
+++ b/www/compare.html
@@ -365,4 +365,4 @@ transparent, extract, background, or shape the alpha channel</td>
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:56 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/compose.html b/www/compose.html
index 86068e5bb17563ccaaba030954fe6be84bdf1c27..925feceafd6d979f3f1312f72272521d4e16176c 100644 (file)
--- a/www/compose.html
+++ b/www/compose.html
@@ -644,4 +644,3 @@ href="https://www.imagemagick.org/script/command-line-options.html#list">-list c
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:59 -->
\ No newline at end of file

diff --git a/www/composite.html b/www/composite.html
index ac5c8e7df60e04a6d36323a77fb4f68ebc6d5c89..268e4fae6fa10fae5e582c0becfa97a68b0775f4 100644 (file)
--- a/www/composite.html
+++ b/www/composite.html
@@ -526,4 +526,4 @@ transparent, extract, background, or shape the alpha channel</td>
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:47 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/conjure.html b/www/conjure.html
index 87f149dcf8bfc0e81f58d732725ed6284cc1aed0..195c92218eff36133588b756dbaf113a49d5230f 100644 (file)
--- a/www/conjure.html
+++ b/www/conjure.html
@@ -1138,4 +1138,4 @@ fill="color name", channel="All, Default, Alpha, Black, Blue, CMYK, Cyan, Gray,
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 18:20 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/connected-components.html b/www/connected-components.html
index 262c33a7a8f585f3413b90bcceeccf84318ac0f0..0dfb001a52194cadcca3e5438323a3fe5bec0109 100644 (file)
--- a/www/connected-components.html
+++ b/www/connected-components.html
@@ -121,4 +121,4 @@ Objects (id: bounding-box centroid area mean-color):
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:47 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/convert.html b/www/convert.html
index 55b65644e923889e503abb04f0a613dd469a96ef..954f6972cf637ffa44eb7cd0460c81079c054d17 100644 (file)
--- a/www/convert.html
+++ b/www/convert.html
@@ -1322,4 +1322,4 @@ transparent, extract, background, or shape the alpha channel</td>
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:34 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:19 -->
\ No newline at end of file

diff --git a/www/develop.html b/www/develop.html
index 936255c668ea2ffd9b4279a463bbe566e5d9b1ed..2ad74cc8a386d4df8de15499d5ed6a2312f56086 100644 (file)
--- a/www/develop.html
+++ b/www/develop.html
@@ -103,6 +103,7 @@
   <dt><a id="lua"></a>Lua</dt>
 
 <dd><a href="https://github.com/leafo/magick">Lua</a> bindings to ImageMagick for LuaJIT using FFI.</dd>
+<dd><a href="https://github.com/isage/lua-imagick">Lua</a> bindings to ImageMagick for Lua using pure-C.</dd>
 
   <dt><a id="neko"></a>Neko</dt>
 
@@ -185,4 +186,4 @@
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:36 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/display.html b/www/display.html
index 006b22ff0eaf1796c28c30cc0584152ba15a6e4f..03475e582ff1873351632fc0909227d88e74c083 100644 (file)
--- a/www/display.html
+++ b/www/display.html
@@ -569,4 +569,4 @@ transparent, extract, background, or shape the alpha channel</td>
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:49 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/distribute-pixel-cache.html b/www/distribute-pixel-cache.html
index 6be1855653f79665cc832ac6ffd3442a4e55a206..2654de407161597fa0ee8640578dd7b9d1416422 100644 (file)
--- a/www/distribute-pixel-cache.html
+++ b/www/distribute-pixel-cache.html
@@ -89,4 +89,4 @@ convert -limit memory 1GiB -limit map 2GiB -limit disk 4GiB \
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:47 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/download.html b/www/download.html
index 55af15b943dad890dc0c7e679e024b467c4cb985..b028344abeac877a8582a170bae05ed5a16d819c 100644 (file)
--- a/www/download.html
+++ b/www/download.html
@@ -76,16 +76,16 @@
   </tr>
 
   <tr>
-      <td>ImageMagick-7.0.5-4.x86_64.rpm</td>
-      <td><a href= "https://www.imagemagick.org/download/linux/CentOS/x86_64/ImageMagick-7.0.5-4.x86_64.rpm">download</a></td>
-    <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/linux/CentOS/x86_64/ImageMagick-7.0.5-4.x86_64.rpm">download</a></td>
+      <td>ImageMagick-7.0.5-6.x86_64.rpm</td>
+      <td><a href= "https://www.imagemagick.org/download/linux/CentOS/x86_64/ImageMagick-7.0.5-6.x86_64.rpm">download</a></td>
+    <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/linux/CentOS/x86_64/ImageMagick-7.0.5-6.x86_64.rpm">download</a></td>
     <td>Redhat / CentOS 7.1 x86_64 RPM</td>
   </tr>
 
   <tr>
-      <td>ImageMagick-libs-7.0.5-4.x86_64.rpm</td>
-      <td><a href= "https://www.imagemagick.org/download/linux/CentOS/x86_64/ImageMagick-libs-7.0.5-4.x86_64.rpm">download</a></td>
-    <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/linux/CentOS/x86_64/ImageMagick-libs-7.0.5-4.x86_64.rpm">download</a></td>
+      <td>ImageMagick-libs-7.0.5-6.x86_64.rpm</td>
+      <td><a href= "https://www.imagemagick.org/download/linux/CentOS/x86_64/ImageMagick-libs-7.0.5-6.x86_64.rpm">download</a></td>
+    <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/linux/CentOS/x86_64/ImageMagick-libs-7.0.5-6.x86_64.rpm">download</a></td>
     <td>Redhat / CentOS 7.1 x86_64 RPM</td>
   </tr>
 
@@ -122,8 +122,8 @@
 
 <p>ImageMagick RPM's are self-installing.  Simply type the following command and you're ready to start using ImageMagick:</p>
 
-<pre><span class="crtprompt"> </span><span class='crtin'>rpm -Uvh ImageMagick-7.0.5-4.x86_64.rpm</span></pre><p>You'll need the libraries as well:</p>
-<pre><span class="crtprompt"> </span><span class='crtin'>rpm -Uvh ImageMagick-libs-7.0.5-4.x86_64.rpm</span></pre>
+<pre><span class="crtprompt"> </span><span class='crtin'>rpm -Uvh ImageMagick-7.0.5-6.x86_64.rpm</span></pre><p>You'll need the libraries as well:</p>
+<pre><span class="crtprompt"> </span><span class='crtin'>rpm -Uvh ImageMagick-libs-7.0.5-6.x86_64.rpm</span></pre>
 <p>For other systems, create (or choose) a directory to install the package into and change to that directory, for example:</p>
 
 <pre>
@@ -258,7 +258,7 @@ display logo.gif
 <pre>
 ./imagemagick_compile.sh <var>VERSION</var>
 </pre>
-<p>where <var>VERSION</var> is the version of ImageMagick you want to compile (i.e.: 7.0.5-4, svn, ...)</p>
+<p>where <var>VERSION</var> is the version of ImageMagick you want to compile (i.e.: 7.0.5-6, svn, ...)</p>
 
 <p>This script compiles ImageMagick as a static library to be included in iOS projects and adds support for</p>
 <ul>
@@ -307,9 +307,9 @@ display logo.gif
   </tr>
 
   <tr>
-        <td>ImageMagick-7.0.5-4-Q16-x64-dll.exe</td>
-        <td><a href= "https://www.imagemagick.org/download/binaries/ImageMagick-7.0.5-4-Q16-x64-dll.exe">download</a></td>
-      <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.5-4-Q16-x64-dll.exe">download</a></td>
+        <td>ImageMagick-7.0.5-6-Q16-x64-dll.exe</td>
+        <td><a href= "https://www.imagemagick.org/download/binaries/ImageMagick-7.0.5-6-Q16-x64-dll.exe">download</a></td>
+      <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.5-6-Q16-x64-dll.exe">download</a></td>
     <td>Win64 dynamic at 16 bits-per-pixel component</td>
   </tr>
 </table></div>
@@ -327,93 +327,93 @@ display logo.gif
   </tr>
 
   <tr>
-        <td>ImageMagick-7.0.5-4-Q16-x64-static.exe</td>
-        <td><a href= "https://www.imagemagick.org/download/binaries/ImageMagick-7.0.5-4-Q16-x64-static.exe">download</a></td>
-      <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.5-4-Q16-x64-static.exe">download</a></td>
+        <td>ImageMagick-7.0.5-6-Q16-x64-static.exe</td>
+        <td><a href= "https://www.imagemagick.org/download/binaries/ImageMagick-7.0.5-6-Q16-x64-static.exe">download</a></td>
+      <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.5-6-Q16-x64-static.exe">download</a></td>
    <td>Win64 static at 16 bits-per-pixel component</td>
   </tr>
 
   <tr>
-        <td>ImageMagick-7.0.5-4-Q8-x64-dll.exe</td>
-        <td><a href= "https://www.imagemagick.org/download/binaries/ImageMagick-7.0.5-4-Q8-x64-dll.exe">download</a></td>
-      <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.5-4-Q8-x64-dll.exe">download</a></td>
+        <td>ImageMagick-7.0.5-6-Q8-x64-dll.exe</td>
+        <td><a href= "https://www.imagemagick.org/download/binaries/ImageMagick-7.0.5-6-Q8-x64-dll.exe">download</a></td>
+      <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.5-6-Q8-x64-dll.exe">download</a></td>
    <td>Win64 dynamic at 8 bits-per-pixel component</td>
   </tr>
 
   <tr>
-        <td>ImageMagick-7.0.5-4-Q8-x64-static.exe</td>
-        <td><a href= "https://www.imagemagick.org/download/binaries/ImageMagick-7.0.5-4-Q8-x64-static.exe">download</a></td>
-      <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.5-4-Q8-x64-static.exe">download</a></td>
+        <td>ImageMagick-7.0.5-6-Q8-x64-static.exe</td>
+        <td><a href= "https://www.imagemagick.org/download/binaries/ImageMagick-7.0.5-6-Q8-x64-static.exe">download</a></td>
+      <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.5-6-Q8-x64-static.exe">download</a></td>
     <td>Win64 static at 8 bits-per-pixel component</td>
   </tr>
 
   <tr>
-        <td>ImageMagick-7.0.5-4-Q16-HDRI-x64-dll.exe</td>
-        <td><a href= "https://www.imagemagick.org/download/binaries/ImageMagick-7.0.5-4-Q16-HDRI-x64-dll.exe">download</a></td>
-      <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.5-4-Q16-HDRI-x64-dll.exe">download</a></td>
+        <td>ImageMagick-7.0.5-6-Q16-HDRI-x64-dll.exe</td>
+        <td><a href= "https://www.imagemagick.org/download/binaries/ImageMagick-7.0.5-6-Q16-HDRI-x64-dll.exe">download</a></td>
+      <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.5-6-Q16-HDRI-x64-dll.exe">download</a></td>
     <td>Win64 dynamic at 16 bits-per-pixel component with <a href="high-dynamic-range.html">high dynamic-range imaging</a> enabled</td>
   </tr>
 
   <tr>
-        <td>ImageMagick-7.0.5-4-Q16-HDRI-x64-static.exe</td>
-        <td><a href= "https://www.imagemagick.org/download/binaries/ImageMagick-7.0.5-4-Q16-HDRI-x64-static.exe">download</a></td>
-      <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.5-4-Q16-HDRI-x64-static.exe">download</a></td>
+        <td>ImageMagick-7.0.5-6-Q16-HDRI-x64-static.exe</td>
+        <td><a href= "https://www.imagemagick.org/download/binaries/ImageMagick-7.0.5-6-Q16-HDRI-x64-static.exe">download</a></td>
+      <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.5-6-Q16-HDRI-x64-static.exe">download</a></td>
     <td>Win64 static at 16 bits-per-pixel component with <a href="high-dynamic-range.html">high dynamic-range imaging</a> enabled</td>
   </tr>
 
   <tr>
-        <td>ImageMagick-7.0.5-4-Q16-x86-dll.exe</td>
-        <td><a href= "https://www.imagemagick.org/download/binaries/ImageMagick-7.0.5-4-Q16-x86-dll.exe">download</a></td>
-      <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.5-4-Q16-x86-dll.exe">download</a></td>
+        <td>ImageMagick-7.0.5-6-Q16-x86-dll.exe</td>
+        <td><a href= "https://www.imagemagick.org/download/binaries/ImageMagick-7.0.5-6-Q16-x86-dll.exe">download</a></td>
+      <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.5-6-Q16-x86-dll.exe">download</a></td>
     <td>Win32 dynamic at 16 bits-per-pixel component</td>
   </tr>
 
   <tr>
-        <td>ImageMagick-7.0.5-4-Q16-x86-static.exe</td>
-        <td><a href= "https://www.imagemagick.org/download/binaries/ImageMagick-7.0.5-4-Q16-x86-static.exe">download</a></td>
-      <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.5-4-Q16-x86-static.exe">download</a></td>
+        <td>ImageMagick-7.0.5-6-Q16-x86-static.exe</td>
+        <td><a href= "https://www.imagemagick.org/download/binaries/ImageMagick-7.0.5-6-Q16-x86-static.exe">download</a></td>
+      <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.5-6-Q16-x86-static.exe">download</a></td>
     <td>Win32 static at 16 bits-per-pixel component</td>
   </tr>
 
   <tr>
-        <td>ImageMagick-7.0.5-4-Q8-x86-dll.exe</td>
-        <td><a href= "https://www.imagemagick.org/download/binaries/ImageMagick-7.0.5-4-Q8-x86-dll.exe">download</a></td>
-      <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.5-4-Q8-x86-dll.exe">download</a></td>
+        <td>ImageMagick-7.0.5-6-Q8-x86-dll.exe</td>
+        <td><a href= "https://www.imagemagick.org/download/binaries/ImageMagick-7.0.5-6-Q8-x86-dll.exe">download</a></td>
+      <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.5-6-Q8-x86-dll.exe">download</a></td>
     <td>Win32 dynamic at 8 bits-per-pixel component</td>
   </tr>
 
   <tr>
-        <td>ImageMagick-7.0.5-4-Q8-x86-static.exe</td>
-        <td><a href= "https://www.imagemagick.org/download/binaries/ImageMagick-7.0.5-4-Q8-x86-static.exe">download</a></td>
-      <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.5-4-Q8-x86-static.exe">download</a></td>
+        <td>ImageMagick-7.0.5-6-Q8-x86-static.exe</td>
+        <td><a href= "https://www.imagemagick.org/download/binaries/ImageMagick-7.0.5-6-Q8-x86-static.exe">download</a></td>
+      <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.5-6-Q8-x86-static.exe">download</a></td>
     <td>Win32 static at 8 bits-per-pixel component</td>
   </tr>
 
   <tr>
-        <td>ImageMagick-7.0.5-4-Q16-HDRI-x86-dll.exe</td>
-        <td><a href= "https://www.imagemagick.org/download/binaries/ImageMagick-7.0.5-4-Q16-HDRI-x86-dll.exe">download</a></td>
-      <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.5-4-Q16-HDRI-x86-dll.exe">download</a></td>
+        <td>ImageMagick-7.0.5-6-Q16-HDRI-x86-dll.exe</td>
+        <td><a href= "https://www.imagemagick.org/download/binaries/ImageMagick-7.0.5-6-Q16-HDRI-x86-dll.exe">download</a></td>
+      <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.5-6-Q16-HDRI-x86-dll.exe">download</a></td>
     <td>Win32 dynamic at 16 bits-per-pixel component with <a href="high-dynamic-range.html">high dynamic-range imaging</a> enabled</td>
   </tr>
 
   <tr>
-        <td>ImageMagick-7.0.5-4-Q16-HDRI-x86-static.exe</td>
-        <td><a href= "https://www.imagemagick.org/download/binaries/ImageMagick-7.0.5-4-Q16-HDRI-x86-static.exe">download</a></td>
-      <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.5-4-Q16-HDRI-x86-static.exe">download</a></td>
+        <td>ImageMagick-7.0.5-6-Q16-HDRI-x86-static.exe</td>
+        <td><a href= "https://www.imagemagick.org/download/binaries/ImageMagick-7.0.5-6-Q16-HDRI-x86-static.exe">download</a></td>
+      <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.5-6-Q16-HDRI-x86-static.exe">download</a></td>
     <td>Win32 static at 16 bits-per-pixel component with <a href="high-dynamic-range.html">high dynamic-range imaging</a> enabled</td>
   </tr>
 
   <tr>
-        <td>ImageMagick-7.0.5-4-portable-Q16-x86.zip</td>
-        <td><a href= "https://www.imagemagick.org/download/binaries/ImageMagick-7.0.5-4-portable-Q16-x86.zip">download</a></td>
-      <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.5-4-portable-Q16-x86.zip">download</a></td>
+        <td>ImageMagick-7.0.5-6-portable-Q16-x86.zip</td>
+        <td><a href= "https://www.imagemagick.org/download/binaries/ImageMagick-7.0.5-6-portable-Q16-x86.zip">download</a></td>
+      <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.5-6-portable-Q16-x86.zip">download</a></td>
     <td>Portable Win32 static at 16 bits-per-pixel component.  Just copy to your host and run (no installer, no Windows registry entries).</td>
   </tr>
 
   <tr>
-        <td>ImageMagick-7.0.5-4-portable-Q16-x64.zip</td>
-        <td><a href= "https://www.imagemagick.org/download/binaries/ImageMagick-7.0.5-4-portable-Q16-x64.zip">download</a></td>
-      <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.5-4-portable-Q16-x64.zip">download</a></td>
+        <td>ImageMagick-7.0.5-6-portable-Q16-x64.zip</td>
+        <td><a href= "https://www.imagemagick.org/download/binaries/ImageMagick-7.0.5-6-portable-Q16-x64.zip">download</a></td>
+      <td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.5-6-portable-Q16-x64.zip">download</a></td>
     <td>Portable Win64 static at 16 bits-per-pixel component.  Just copy to your host and run (no installer, no Windows registry entries).</td>
   </tr>
 </table></div>
@@ -464,4 +464,4 @@ objShell.Exec("magick ""e:/myimages/image.png"" ""e:/myimages/image.jpg""")
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:34 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:19 -->
\ No newline at end of file

diff --git a/www/escape.html b/www/escape.html
index 5753c6b5d8e1c63c49a42d5b3996fa9581338c8d..a80b9b99990dff25f1da1a06b650e86f2a878340 100644 (file)
--- a/www/escape.html
+++ b/www/escape.html
@@ -887,4 +887,4 @@ Post ObjectData Descriptor Record
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:46 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/examples.html b/www/examples.html
index 46b80f0bf301427a7487a0d11086b9afda84baca..30a17b3b7e96650beb8fd1d8d1e171556e30e66d 100644 (file)
--- a/www/examples.html
+++ b/www/examples.html
@@ -80,4 +80,4 @@
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:46 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/exception.html b/www/exception.html
index 1c0a7ae11645cfc5d659d5d1c055006549043bf1..c60489c7037466721eae5ba17802b6d0d6940ffa 100644 (file)
--- a/www/exception.html
+++ b/www/exception.html
@@ -269,4 +269,4 @@
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:41 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/export.html b/www/export.html
index ad09d518845bc03613bc2703e3256ef140cc624b..e8b4452bf572ee5de1a165a2c3a4ae63849c87fc 100644 (file)
--- a/www/export.html
+++ b/www/export.html
@@ -80,4 +80,4 @@
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 18:26 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/formats.html b/www/formats.html
index 70ac81c66b25c6582bf95d4e336bfca379d51078..347bc65f775b24c01952fa20764e9f522709aa02 100644 (file)
--- a/www/formats.html
+++ b/www/formats.html
@@ -1032,7 +1032,7 @@ convert \( -size 15x15 canvas:black canvas:white -append \) \
     <td><a href="http://www.w3.org/Graphics/SVG">SVG</a></td>
     <td>RW</td>
     <td>Scalable Vector Graphics</td>
-    <td>ImageMagick utilizes <a href="http://www.inkscape.org/">inkscape</a> if its in your execution path otherwise <a href="http://developer.gnome.org/rsvg/">RSVG</a>. If neither are available, ImageMagick reverts to its internal SVG renderer. The default resolution is 90 DPI. Use <a href="command-line-options.html#size">-size</a> command line option to specify the maximum width and height.</td>
+    <td>ImageMagick utilizes <a href="http://www.inkscape.org/">inkscape</a> if its in your execution path otherwise <a href="http://developer.gnome.org/rsvg/">RSVG</a>. If neither are available, ImageMagick reverts to its internal SVG renderer. The default resolution is 96 DPI. Use <a href="command-line-options.html#size">-size</a> command line option to specify the maximum width and height.</td>
   </tr>
 
   <tr>
@@ -1967,4 +1967,4 @@ convert \( -size 15x15 canvas:black canvas:white -append \) \
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:32 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/fx.html b/www/fx.html
index b3e8474834e2793fae2649359e0fe3c6dc829cdf..eb094fc25f63ecda7bcf564df73b1206e78fb87a 100644 (file)
--- a/www/fx.html
+++ b/www/fx.html
@@ -420,4 +420,4 @@ convert rose: -duplicate 29 -virtual-pixel Gray -distort SRT '%[fx:360.0*t/n]' \
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:47 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/gradient.html b/www/gradient.html
index c6cfb1051643303fd5c9264c2565d8dfc63e723e..809356ad0c68efc56883a0979fbea7e6d7b56433 100644 (file)
--- a/www/gradient.html
+++ b/www/gradient.html
@@ -241,4 +241,4 @@ convert -size 256x256 -define gradient:radii=128,64 -define gradient:angle=45 ra
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:47 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/high-dynamic-range.html b/www/high-dynamic-range.html
index 14c488fb8980728c2a8f71846d21f3aa589e74c4..ecd3060f239d6212733c6cc55df4d3a60e2b0647 100644 (file)
--- a/www/high-dynamic-range.html
+++ b/www/high-dynamic-range.html
@@ -107,4 +107,4 @@ Features: HDRI
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:46 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/history.html b/www/history.html
index e415a73045bb340ff2421e76ca5241a2e99a1ed1..9d698cae81797bfc61a2a36a12fcca395d5c9c5b 100644 (file)
--- a/www/history.html
+++ b/www/history.html
@@ -97,4 +97,4 @@ I swear by my life and my love of it that I will never live for the sake of anot
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 18:26 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/identify.html b/www/identify.html
index 4dd5d6d4ec20dfadfedb87fc4714f41ed2320013..76600c80178dc07941ae1dd37bbfd114ac95642c 100644 (file)
--- a/www/identify.html
+++ b/www/identify.html
@@ -429,4 +429,4 @@ transparent, extract, background, or shape the alpha channel</td>
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:37 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:19 -->
\ No newline at end of file

diff --git a/www/import.html b/www/import.html
index 5d2f138b47cc33f429af8c6295b7284178763551..e96dc1a686b3481c2cb2195df0a8e89959177e38 100644 (file)
--- a/www/import.html
+++ b/www/import.html
@@ -427,4 +427,4 @@ import -window root screen.ps
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:47 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/index.html b/www/index.html
index 93d1c814cf2ba41e16dd57665382df7baafcc422..47bdfaf7d67390131089a5222ddba7845ddeb1f3 100644 (file)
--- a/www/index.html
+++ b/www/index.html
@@ -68,7 +68,7 @@ Use ImageMagick<sup><a href="http://tarr.uspto.gov/servlet/tarr?regser=serial&am
 
 <p>The ImageMagick development process ensures a stable API and <a href="http://abi-laboratory.pro/tracker/timeline/imagemagick/">ABI</a>. Before each ImageMagick release, we perform a comprehensive security assessment that includes <a href="https://github.com/google/sanitizers/wiki/AddressSanitizer">memory error</a> and <a href="https://github.com/google/sanitizers/wiki/ThreadSanitizer">thread data race</a> detection to prevent security vulnerabilities.</p>
 
-<p>The current release is ImageMagick <a href="https://www.imagemagick.org/script/download.html">7.0.5-4</a>.  It runs on <a href="https://www.imagemagick.org/script/download.html#unix">Linux</a>, <a href="https://www.imagemagick.org/script/download.html#windows">Windows</a>, <a href="https://www.imagemagick.org/script/download.html#macosx">Mac Os X</a>, <a href="https://www.imagemagick.org/script/download.html#iOS">iOS</a>, Android OS, and others.</p>
+<p>The current release is ImageMagick <a href="https://www.imagemagick.org/script/download.html">7.0.5-6</a>.  It runs on <a href="https://www.imagemagick.org/script/download.html#unix">Linux</a>, <a href="https://www.imagemagick.org/script/download.html#windows">Windows</a>, <a href="https://www.imagemagick.org/script/download.html#macosx">Mac Os X</a>, <a href="https://www.imagemagick.org/script/download.html#iOS">iOS</a>, Android OS, and others.</p>
 
 <p>The authoritative ImageMagick web site is <a href="https://www.imagemagick.org/">https://www.imagemagick.org</a>. The authoritative source code repository is <a href="http://git.imagemagick.org/repos/ImageMagick">http://git.imagemagick.org/repos/ImageMagick</a>.  We maintain a source code mirror at <a href="https://gitlab.com/ImageMagick/ImageMagick">GitLab</a> and <a href="https://github.com/ImageMagick/ImageMagick">GitHub</a>.</p>
 
@@ -239,4 +239,4 @@ Use ImageMagick<sup><a href="http://tarr.uspto.gov/servlet/tarr?regser=serial&am
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:32 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:19 -->
\ No newline at end of file

diff --git a/www/install-source.html b/www/install-source.html
index 2bad9370104f7a0c790903cf2a3e58c4c12d7dd3..b52bbc199f629b973c399a8e0acf963a161bb8c0 100644 (file)
--- a/www/install-source.html
+++ b/www/install-source.html
@@ -162,4 +162,4 @@ validate
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:34 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/jp2.html b/www/jp2.html
index e5ed762755eac2242502fc00272cba7185701745..b11a781212419b792c7f8c519e39cdf4f622f9f9 100644 (file)
--- a/www/jp2.html
+++ b/www/jp2.html
@@ -164,4 +164,4 @@ convert wizard.png -resize 4096x2160! -depth 12 wizard.jp2
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 16:35 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/license.html b/www/license.html
index 5d4efefc06a0775a0fdf5eb10bf3fe4a914020e4..63266542c42b6536448da499010b21db2906aa79 100644 (file)
--- a/www/license.html
+++ b/www/license.html
@@ -203,4 +203,4 @@
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 16:05 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/links.html b/www/links.html
index 3067fb6388b924917ed877394a07049d61034d3c..5f33507fb6299532557ba8b5b90db48587b5c7af 100644 (file)
--- a/www/links.html
+++ b/www/links.html
@@ -163,4 +163,4 @@
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:48 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/magick++.html b/www/magick++.html
index 953dbf3ee5e9cbae21649e2579996151b7e3040c..8737f315be5e40fc550429e4a4d721fdd13a9de0 100644 (file)
--- a/www/magick++.html
+++ b/www/magick++.html
@@ -88,7 +88,7 @@ functions which comprise the API.  See a <a href="https://www.imagemagick.org/Ma
 <h2 class="magick-header">Obtaining Magick++</h2>
 <a id="get"></a>
 <p>Magick++ is included as part of <a href="../index.html">ImageMagick</a>
-source releases and may be retrieved via <a href="https://www.imagemagick.org/script/mirror.html">ftp</a>
+source releases and may be retrieved via <a href="https://www.imagemagick.org/script/download.html">ftp</a>
 or <a href="http://git.imagemagick.org/repos/ImageMagick/Magick++">GIT</a>.
 </p>
 <h2 class="magick-header">Installation</h2>
@@ -187,4 +187,4 @@ int main(int argc,char **argv)
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 18:21 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/magick-core.html b/www/magick-core.html
index a37e156e81fa5138840db441f5438447d3803c71..d8e6950120f13c94fbdc8d1e367773669afa47b1 100644 (file)
--- a/www/magick-core.html
+++ b/www/magick-core.html
@@ -337,4 +337,4 @@ int main(int argc,char **argv)
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:43 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/magick-script.html b/www/magick-script.html
index 6a30bceb9660e6ae840fc31f59b2e988c0efd9e2..637b18ad9dfc34994ec717539da2f760e0b6593e 100644 (file)
--- a/www/magick-script.html
+++ b/www/magick-script.html
@@ -1282,4 +1282,4 @@ transparent, extract, background, or shape the alpha channel</td>
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 17:02 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/magick-vector-graphics.html b/www/magick-vector-graphics.html
index 31f349baad5991b1b4f50c42b8ed5d5e1d0f86b6..c91f478ed0c016c98108c66f58eeb4ae7a0a70df 100644 (file)
--- a/www/magick-vector-graphics.html
+++ b/www/magick-vector-graphics.html
@@ -881,4 +881,4 @@ round</pre></td>
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 16:17 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/magick-wand.html b/www/magick-wand.html
index bedc29ad18751e8417e8456b0a840c8eb4816832..932666bfcd9ccc663e39993da833b57d94940637 100644 (file)
--- a/www/magick-wand.html
+++ b/www/magick-wand.html
@@ -362,7 +362,7 @@ int main(int argc,char **argv)
   return(0);
 }
 </pre>
-<p><a href="http://members.shaw.ca/el.supremo/MagickWand/">MagickWand Examples in C</a> illustrates how to use the ImageMagick MagickWand API. Each example is presented as a C function, complete with headers, so that it can be copied to a file and then included in your own C project.</p>
+<p><a href="../MagickWand/index.html">MagickWand Examples in C</a> illustrates how to use the ImageMagick MagickWand API. Each example is presented as a C function, complete with headers, so that it can be copied to a file and then included in your own C project.</p>
 </div>
   <footer class="magick-footer">
     <p><a href="support.html">Donate</a> •
@@ -383,4 +383,4 @@ int main(int argc,char **argv)
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:42 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/magick.html b/www/magick.html
index 0a6834bbcea765b9c03e8194bbdbeca9bdee84dd..3cec1ac52a090837e7b77c7aa0d2ea3ff47ada60 100644 (file)
--- a/www/magick.html
+++ b/www/magick.html
@@ -1324,4 +1324,4 @@ transparent, extract, background, or shape the alpha channel</td>
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:52 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/miff.html b/www/miff.html
index 92f357fcad93a50497ffbb9de63bc6bbe2c94c50..c0abab8e959ef5af160f71d5d26c05b6318eca43 100644 (file)
--- a/www/miff.html
+++ b/www/miff.html
@@ -245,4 +245,4 @@ or fewer colors in the image, each byte of image data contains an index value. I
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 18:07 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/mirror.html b/www/mirror.html
index d6e61cfbf84717bf38f7d5b102da1c6182d6788c..0da3cc7dc410c8901ca7af1fa415a4a7de4bc245 100644 (file)
--- a/www/mirror.html
+++ b/www/mirror.html
@@ -58,7 +58,7 @@
 <div class="container">
 <div class="magick-header">
 <p class="lead magick-description">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="http://git.imagemagick.org/repos/ImageMagick">Git</a>.  Before you download, you may want to review recent <a href="changelog.html">changes</a> to the ImageMagick distribution.  The authoritative source code repository is <a href="http://git.imagemagick.org/repos/ImageMagick">http://git.imagemagick.org/repos/ImageMagick</a>.</p>
-<p>The latest release of ImageMagick is version 7.0.5-4.</p>
+<p>The latest release of ImageMagick is version 7.0.5-6.</p>
 <dl class="dl-horizontal">
   <dt>Germany</dt>
     <dd><a href="http://mirror.checkdomain.de/imagemagick/">http://mirror.checkdomain.de/imagemagick/</a></dd>
@@ -115,4 +115,4 @@
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:49 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/mogrify.html b/www/mogrify.html
index b4b55059ee1641b091000fe493f1ed9888a8c923..09179d57e04814d403a23ae02039b2172895d3c6 100644 (file)
--- a/www/mogrify.html
+++ b/www/mogrify.html
@@ -1297,4 +1297,4 @@ transparent, extract, background, or shape the alpha channel</td>
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:41 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/montage.html b/www/montage.html
index 16691698b62ef2f0deda457708d735fd4066e8d5..588c5e2e3f8b1d89685f7de12a2299cbf745d2a6 100644 (file)
--- a/www/montage.html
+++ b/www/montage.html
@@ -638,4 +638,4 @@ transparent, extract, background, or shape the alpha channel</td>
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:47 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/motion-picture.html b/www/motion-picture.html
index 4b1619cc4483ad9ba74137b475436a019ea3d4f8..487b7f9626fd1a889e90ae38036ab87877e074f5 100644 (file)
--- a/www/motion-picture.html
+++ b/www/motion-picture.html
@@ -194,4 +194,4 @@ convert bluebells.dpx -define dpx:television.time.code=10:00:02:15 bluebells-001
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:46 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/opencl.html b/www/opencl.html
index f31dd0f8f7b50431418d3a20cf41bf8345f76c71..ea8913a92d85182fea08ddd36159023a79c6e806 100644 (file)
--- a/www/opencl.html
+++ b/www/opencl.html
@@ -122,4 +122,4 @@ InitImageMagickOpenCL(MAGICK_OPENCL_DEVICE_SELECT_USER, (void*)(myDevices+2), NU
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:47 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/openmp.html b/www/openmp.html
index 18179e5f3d83b9c84b3f068b3a1ce8042c7ced05..03a3b005502280e415812e378c62383e440ae2a1 100644 (file)
--- a/www/openmp.html
+++ b/www/openmp.html
@@ -101,4 +101,4 @@ Performance[8]: 40i 4.831ips 0.872e 15.680u 0:02.070
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:47 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/perl-magick.html b/www/perl-magick.html
index e4a5fd738d31ce56747c3235eb3fed0ba2d71953..89dfa84353cf2425d6d719ea30ce6dd6a410d9e8 100644 (file)
--- a/www/perl-magick.html
+++ b/www/perl-magick.html
@@ -60,7 +60,7 @@
 <p class="text-center"><a href="perl-magick.html#installation">Installation</a> • <a href="perl-magick.html#overview">Overview</a> • <a href="perl-magick.html#example">Example Script</a> • <a href="perl-magick.html#read">Read or Write an Image</a> • <a href="perl-magick.html#manipulate">Manipulate an Image</a> • <a href="perl-magick.html#set-attribute">Set an Image Attribute</a> • <a href="perl-magick.html#get-attribute">Get an Image Attribute</a> • <a href="perl-magick.html#compare">Compare an Image to its Reconstruction</a> • <a href="perl-magick.html#montage">Create an Image Montage</a> • <a href="perl-magick.html#blobs">Working with Blobs</a> • <a href="perl-magick.html#direct-access">Direct-access to Image Pixels</a> • <a href="perl-magick.html#miscellaneous">Miscellaneous Methods</a> • <a href="perl-magick.html#exceptions">Handling Exceptions</a>• <a href="perl-magick.html#constants">Constant</a> </p>
 
 <a id="introduction"></a>
-<p class="lead magick-description"><a href="mirror.html">PerlMagick</a> is an objected-oriented <a href="http://www.perl.com/perl/">Perl</a> interface to ImageMagick. Use the module to read, manipulate, or write an image or image sequence from within a Perl script. This makes it very suitable for Web CGI scripts. You must have ImageMagick 6.5.5 or above and Perl version 5.005_02 or greater installed on your system for PerlMagick to build properly.</p>
+<p class="lead magick-description"><a href="download.html">PerlMagick</a> is an objected-oriented <a href="http://www.perl.com/perl/">Perl</a> interface to ImageMagick. Use the module to read, manipulate, or write an image or image sequence from within a Perl script. This makes it very suitable for Web CGI scripts. You must have ImageMagick 6.5.5 or above and Perl version 5.005_02 or greater installed on your system for PerlMagick to build properly.</p>
 
 <p>There are a number of useful scripts available to show you the value of PerlMagick. You can do Web based image manipulation and conversion with <a href="https://www.imagemagick.org/download/perl">MagickStudio</a>, or use <a href="http://git.imagemagick.org/repos/ImageMagick/PerlMagick/demo">L-systems</a> to create images of plants using mathematical constructs, and finally navigate through collections of thumbnail images and select the image to view with the <a href="http://webmagick.sourceforge.net/">WebMagick Image Navigator</a>.</p>
 
@@ -110,7 +110,7 @@ perl -MImage::Magick -le 'print Image::Magick->QuantumDepth'
 
 <p><b>Windows XP / Windows 2000</b></p>
 
-<p>ImageMagick must already be installed on your system. Also, the ImageMagick source distribution for <a href="mirror.html">Windows 2000</a> is required. You must also have the <code>nmake</code> from the Visual C++ or J++ development environment. Copy <code>\bin\IMagick.dll</code> and <code>\bin\X11.dll</code> to a directory in your dynamic load path such as <code>c:\perl\site\5.00502</code>.</p>
+<p>ImageMagick must already be installed on your system. Also, the ImageMagick source distribution for <a href="download.html">Windows 2000</a> is required. You must also have the <code>nmake</code> from the Visual C++ or J++ development environment. Copy <code>\bin\IMagick.dll</code> and <code>\bin\X11.dll</code> to a directory in your dynamic load path such as <code>c:\perl\site\5.00502</code>.</p>
 
 <p>Next, type</p>
 
@@ -581,8 +581,7 @@ $image-&gt;[$x]-&gt;Frame("100x200");
   <tr>
     <td>ConnectedComponents</td>
     <td>connectivity=&gt;<i>integer</i>,</td>
-    <td>connected-components uniquely labeled, choose from 4 or 8 w
-ay connectivity.</td>
+    <td>connected-components uniquely labeled, choose from 4 or 8 way connectivity.</td>
   </tr>
 
   <tr>
@@ -609,13 +608,6 @@ ay connectivity.</td>
     <td>copy pixels from the image as defined by the <code>width</code>x<code>height</code>+<code>x</code>+<code>y</code> to image at offset +<code>dx</code>,+<code>dy</code>.</td>
   </tr>
 
-  <tr>
-    <td>ConnectedComponents</td>
-    <td>connectivity=&gt;<i>integer</i>,</td>
-    <td>connected-components uniquely labeled, choose from 4 or 8 w
-ay connectivity.</td>
-  </tr>
-
   <tr>
     <td>Crop</td>
     <td>geometry=&gt;<i>geometry</i>, width=&gt;<i>integer</i>, height=&gt;<i>integer</i>, x=&gt;<i>integer</i>, y=&gt;<i>integer</i>, fuzz=&gt;<i>double</i>, gravity=&gt;{NorthWest, North, NorthEast, West, Center, East, SouthWest, South, SouthEast}</td>
@@ -2611,4 +2603,4 @@ Image::Magick-&gt;QuantumDepth
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:49 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/porting.html b/www/porting.html
index 432d636152839205e8e56344b058f52d5b0322f3..5418c80ef7de324189fda7dd0a9c626393cbc4da 100644 (file)
--- a/www/porting.html
+++ b/www/porting.html
@@ -664,4 +664,4 @@ example "+annotate", "+resize", "+clut", and "+draw" .</p>
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:48 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/quantize.html b/www/quantize.html
index 6d1a2a895ee63348fd1b576f9687a621d153e9b4..911bb59516b6cb6f01b437ed6092616b39860139 100644 (file)
--- a/www/quantize.html
+++ b/www/quantize.html
@@ -202,4 +202,3 @@ while number of nodes with (n2 > 0) > required maximum number of colors
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 18:27 -->
\ No newline at end of file

diff --git a/www/resources.html b/www/resources.html
index a3f6f12148dc4aed2e44ca55f92c14e097166b09..5c1aeb44cbc3f99757645693b118b23ef9bafc10 100644 (file)
--- a/www/resources.html
+++ b/www/resources.html
@@ -383,4 +383,4 @@ $MAGICK_FONT_PATH
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:46 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/security-policy.html b/www/security-policy.html
index cb89b9cf1be584a37be1f91ef62d12adc5fda097..34c3425582cbf612571eab91a6e55d565d699590 100644 (file)
--- a/www/security-policy.html
+++ b/www/security-policy.html
@@ -57,12 +57,12 @@
 </div>
 <div class="container">
 <div class="magick-header">
-<p class="text-center"><a href="security-policy.html#policy">Security Policy </a> • <a href="security-policy.html#other">Other Security Considerations</a></p>
+<p class="text-center"><a href="security-policy.html#policy">Security Policy </a> • <a href="security-policy.html#zero-configuration">Zero Configuration Security Policy</a> • <a href="security-policy.html#other">Other Security Considerations</a></p>
 
 
-<p class="lead magick-description">ImageMagick includes a security policy configuration file, <code>policy.xml</code>. It is useful for limiting the resources consumed by ImageMagick and can help prevent a denial-of-service or other exploits.</p>
+<p class="lead magick-description">ImageMagick includes a security policy configuration file, <a href="https://www.imagemagick.org/source/policy.xml">policy.xml</a>. It is useful for limiting the resources consumed by ImageMagick and can help prevent a denial-of-service or other exploits.</p>
 
-<p>As an example, suppose you download an image from the internet and unbeknownst to you its been crafted to generate a 20000 by 20000 pixel image. ImageMagick attempts to allocate enough resources (memory, disk) and your system will likely deny the resource request and exit. However, its also possible that your computer might be temporarily sluggish or unavailable or ImageMagick may abort. To prevent such a scenario, you can set limits in the <code>policy.xml</code> configuration file. You may ask why ImageMagick does not already include reasonable limits? Simply because what is reasonable in your environment, might not be reasonable to someone else. For example, one user has access to a host with 1TB of memory whereas another user is running ImageMagick on an iPhone. By policy, permitting giga-pixel image processing on the large memory host makes sense, not so much for the resource constrained iPhone. If you utilize ImageMagick from a public website, you may want to increase security by preventing usage of the MVG or HTTPS coders. Only you can decide what are reasonable limits taking in consideration your environment. We provide this policy with reasonable limits and encourage you to modify it to suit your local environment:</p>
+<p>As an example, suppose you download an image from the internet and unbeknownst to you its been crafted to generate a 20000 by 20000 pixel image. ImageMagick attempts to allocate enough resources (memory, disk) and your system will likely deny the resource request and exit. However, its also possible that your computer might be temporarily sluggish or unavailable or ImageMagick may abort. To prevent such a scenario, you can set limits in the <code>policy.xml</code> configuration file. You may ask why ImageMagick does not already include reasonable limits? Simply because what is reasonable in your environment, might not be reasonable to someone else. For example, you may have ImageMagick sandboxed where security is not a concern, whereas another user may use ImageMagick to process images on their publically accessible website.  Or ImageMagick is running on a host with 1TB of memory whereas another ImageMagick instance is running on an iPhone. By policy, permitting giga-pixel image processing on the large memory host makes sense, not so much for the resource constrained iPhone. If you utilize ImageMagick from a public website, you may want to increase security by preventing usage of the MVG or HTTPS coders. Only you can decide what are reasonable limits taking in consideration your environment. We provide this policy with reasonable limits and encourage you to modify it to suit your local environment:</p>
 
 <pre class="pre-scrollable">
 &lt;policymap>
@@ -101,11 +101,12 @@ convert: no images defined `wizard.jpg'
 <pre>
   &lt;policy domain="delegate" rights="none" pattern="*" />
   &lt;policy domain="coder" rights="none" pattern="*" />
-  &lt;policy domain="coder" rights="read|write" pattern="{GIF,JPEG,PNG,WEBP}" />
+  &lt;policy domain="coder" rights="read | write" pattern="{GIF,JPEG,PNG,WEBP}" />
 </pre>
 
-<p>As of ImageMagick 7.0.5-4, you can allocate the pixel cache with anonymous memory mapping rather than from heap.  As a consequence, the pixels are initialized to zero.  You can also shred any temporary files for increased security.  The value is the number of times to shred a temporary file.  For example,</p>
+<p>As of ImageMagick 7.0.5-5, you can allocate the pixel cache and some internal buffers with anonymous memory mapping rather than from heap.  As a consequence, the pixels are initialized to zero.  You can also securely delete any temporary files for increased security.  The value is the number of times to shred (replace its content with random data before deleting) a temporary file.  For example,</p>
 <pre>
+  &lt;policy domain="system" name="memory-map" value="anonymous"/>
   &lt;policy domain="cache" name="memory-map" value="anonymous"/>
   &lt;policy domain="system" name="shred" value="1"/>
 </pre>
@@ -163,6 +164,18 @@ Path: [built-in]
 
 <p>For additional details about resource limits and the policy configuration file, read <a href="resources.html">Resources</a> and <a href="architecture.html">Architecture</a>.</p>
 
+<h2 class="magick-header"><a id="zero-configuration"></a>Zero Configuration Security Policy</h2>
+
+<p>A zero configuration build of ImageMagick does not permit external configuration files.  To define your security policy, you must instead edit the <code>MagickCore/policy-private.h</code> source module, add your policy statements, and then build the ImageMagick distribution.  Here is an example zero configuration security policy:</p>
+
+<pre>
+static const char
+  *ZeroConfigurationPolicy = \
+"&lt;policymap> \
+  &lt;policy domain=\"coder\" rights=\"none\" pattern=\"MVG\"/> \
+&lt;/policymap>";
+</pre>
+
 <h2 class="magick-header"><a id="other"></a>Other Security Considerations</h2>
 
 <p>If you spot a security flaw in ImageMagick, <a href="https://www.imagemagick.org/script/contact.php">contact us</a> and select Security Issue as the issue.  Alternatively, post your concern to <a href="https://github.com/ImageMagick/ImageMagick/issues">GitHub</a>.  Be sure to include how to reproduce the security flaw and a link to any images needed to reproduce the flaw.</p>
@@ -196,4 +209,4 @@ Path: [built-in]
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:48 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/sitemap.html b/www/sitemap.html
index 69def95358f656edf3c53146f80b94dedbfe107d..518377f963aa1547c683bc464d5266698f519953 100644 (file)
--- a/www/sitemap.html
+++ b/www/sitemap.html
@@ -235,4 +235,4 @@
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:48 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/stream.html b/www/stream.html
index 1e862628b2032e287e1e81ef2fc571ca20c8592b..0f43b23050eb6996b3a39b9d41aac272527ce065 100644 (file)
--- a/www/stream.html
+++ b/www/stream.html
@@ -272,4 +272,4 @@ stream -map i -storage-type double 'image.tif[100x100+30+40]' gray.raw
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 16:07 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/subversion.html b/www/subversion.html
index 3f91b7a956405d0192c80dc3e38fbccdaf7a7333..dbed130fd9e75307a9a694124be815afb3f4559b 100644 (file)
--- a/www/subversion.html
+++ b/www/subversion.html
@@ -96,4 +96,4 @@ svn update
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 17:58 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/support.html b/www/support.html
index 9e167798adf40efb0a8446826bd446b81a6b1d8d..add745019519765cb2497d2febac61ac32ed9519 100644 (file)
--- a/www/support.html
+++ b/www/support.html
@@ -68,7 +68,7 @@
   <dt><a href="http://www.networkredux.com"> <img class="clearfix" src="../images/networkredux.png" width="140" height="31" alt="[Network Redux]" /></a>   We manage everything so you don't have to</dt><br/>
   <dt><a href="http://www.amd.com"> <img class="clearfix" src="../images/amd.png" width="132" height="31" alt="[AMD]" /></a> Enabling today. Inspiring tomorrow.</dt><br/>
   <dt><a href="http://www.transloadit.com"> <img class="clearfix" src="../images/transloadit.png" width="205" height="52" alt="[TransloadIt]" /></a>   The world's most versatile file uploading and processing service</dt><br/>
-  <dt><a href="http://nutrition.report"> <img class="clearfix" src="../images/nutrition.png" width="299" height="59" alt="[Nutrition Report]" /></a>The world's most most advanced nutrition &amp; health database</dt><br/>
+  <dt><a href="http://boundforhealth.com"> <img class="clearfix" src="../images/boundforhealth.png" width="342" height="105" alt="[Bound for Health]" /></a>  BoundForHealth &#8211; Change Course.  Cure disease.  Be well.</dt><br/>
 </dl>
 
 <h2 class="magick-header"><a id="contribute"></a>Contribute a Bug Fix or Enhancement</h2>
@@ -155,4 +155,4 @@ USA
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 15:48 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file

diff --git a/www/webp.html b/www/webp.html
index 724ce2be06f415df6a44294546e3da3988265c81..6a045be84c9e6e77324b72aed54adf028c398a5d 100644 (file)
--- a/www/webp.html
+++ b/www/webp.html
@@ -182,4 +182,4 @@ convert wizard.png -quality 50 -define webp:lossless=true wizard.webp
 </div>
 </body>
 </html>
-<!-- Magick Cache 26th March 2017 16:38 -->
\ No newline at end of file
+<!-- Magick Cache 14th May 2017 12:20 -->
\ No newline at end of file