diff --git a/config/policy.xml b/config/policy.xml index 2ed14de..808fcf6 100644 --- a/config/policy.xml +++ b/config/policy.xml @@ -57,26 +57,43 @@ --> - - - - + + + + - - + + - - + + + + + + + + + + + + + + + + + + + diff --git a/configure.ac b/configure.ac index 7963576..570d04f 100644 --- a/configure.ac +++ b/configure.ac @@ -208,9 +208,9 @@ AC_SUBST([SBIN_DIR]) eval "eval LIBEXEC_DIR=$libexecdir" AC_SUBST([LIBEXEC_DIR]) eval "eval DATA_DIR=$datadir" -AC_SUBST([DATA_DIR]) -eval "eval DOC_DIR=$datadir/doc" -AC_SUBST([DOC_DIR]) +AC_SUBST(DATA_DIR) +eval "eval DOC_DIR=$docdir" +AC_SUBST(DOC_DIR) eval "eval SYSCONF_DIR=$sysconfdir" AC_SUBST([SYSCONF_DIR]) eval "eval SHAREDSTATE_DIR=$sharedstatedir" @@ -805,7 +805,10 @@ MAGICK_ABI_SUFFIX="Q${QUANTUM_DEPTH}" if test "$enable_hdri" = 'yes'; then MAGICK_ABI_SUFFIX="Q${QUANTUM_DEPTH}${MAGICK_HDRI}" fi -AC_SUBST([MAGICK_ABI_SUFFIX]) + +AC_SUBST(MAGICK_ABI_SUFFIX) +MAGICK_ABI_SUFFIX_LC=`echo "$MAGICK_ABI_SUFFIX" | sed 's/./\L&/g'` +AC_SUBST(MAGICK_ABI_SUFFIX_LC) # Set pixel cache threshold AC_ARG_WITH([cache], @@ -3048,9 +3051,8 @@ AC_SUBST([FILTER_PATH]) # # Path to ImageMagick documentation files -DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}" -DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}" -DEFINE_DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}/" +DOCUMENTATION_PATH="${DOC_DIR}" +DEFINE_DOCUMENTATION_PATH="${DOC_DIR}" case "${build_os}" in mingw* ) DEFINE_DOCUMENTATION_PATH=`$WinPathScript "$DEFINE_DOCUMENTATION_PATH" 1` @@ -3059,6 +3061,18 @@ esac AC_DEFINE_UNQUOTED([DOCUMENTATION_PATH],["$DEFINE_DOCUMENTATION_PATH"],[Directory where ImageMagick documents live.]) AC_SUBST([DOCUMENTATION_PATH]) + +# +# Add distribution specific string for documentation +AC_ARG_WITH([extra-doc-dir], + [AC_HELP_STRING([--with-extra-doc-dir=""], + [extra documentation dir could be overriden by distribution, for instance by " (you may install the imagemagick-doc package)"])], + [extra_doc_dir="$withval"], + [extra_doc_dir=""]) +AC_DEFINE_UNQUOTED(EXTRA_DOC_DIR,"$EXTRA_DOC_DIR",[Extra documentation dir could be overriden by distribution, for instance by " (you may install th imagemagick-doc package)"]) +AC_SUBST(EXTRA_DOC_DIR,$extra_doc_dir) + + # # Enable/Disable documentation AC_ARG_ENABLE([docs], diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 45288fa..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,24 +0,0 @@ -0001-Fix-br-tag.patch -0002-Fix-api-Image-.html.patch -0003-Fix-www-api-mophologie.html.patch -0004-Fix-www-command-line-options.html.patch -0005-Use-modern-idiom-for-autoconf.patch -0006-Allow-distribution-to-custumize-the-html-pointer-to-.patch -0007-Improve-policy-in-order-to-be-safer.patch -0008-Fix-remaining-error-in-html-files.patch -0009-Improve-man-page-to-use-version-information-and-quan.patch -0010-Fix-changelog-tag-mismatch.patch -0011-Fix-html-error-in-api-Image-.html.patch -0012-Fix-www-escape.html.patch -0013-Fix-www-magick-script.html.patch -0014-Fix-www-support.html.patch -0015-Fix-instead-of-lt-and-input-form.patch -0016-Fix-another-errors-in-html-files.patch -0017-Fix-index.html.patch -0018-Fix-end-tags.patch -0019-Fix-a-few-html-error.patch -0020-Fix-a-typo-in-manpage.patch -0021-Finalize-fixing-error-in-html.patch -0022-FIx-error-in-new-upstream-html.patch -0001-https-github.com-ImageMagick-ImageMagick6-issues-145.patch -0023-disable-ghostscript-formats.patch diff --git a/debian/source/format b/debian/source/format index 163aaf8..89ae9db 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (quilt) +3.0 (native) diff --git a/index.html b/index.html index ca08420..4c61371 100644 --- a/index.html +++ b/index.html @@ -67,8 +67,8 @@ -
- + +
@@ -136,7 +136,7 @@ Use ImageMagickDelineate image features - Canny edge detection, Hough lines. + Canny edge detection, Hough lines. Discrete Fourier transform @@ -204,7 +204,7 @@ Use ImageMagickNoise and color reduction - Kuwahara Filter, mean-shift. + Kuwahara Filter, mean-shift. Perceptual hash @@ -265,7 +265,7 @@ Use ImageMagick<\/script>') + + + +
+
+
+ +

ImageMagick includes a number of ready-made interfaces. This makes it possible to modify or create images automagically and dynamically utilizing your favorite development platform.

+ +
+
Ada
+ +
G2F implements an Ada 95 binding to a subset of the low-level MagickCore library.
+ +
C
+ +
Use MagickWand to convert, compose, and edit images from the C language. There is also the low-level MagickCore library for wizard-level developers.
+ +
Ch
+ +
ChMagick is a Ch binding to the MagickCore and MagickWand API. Ch is an embeddable C/C++ interpreter for cross-platform scripting.
+ +
COM+
+ +
Use ImageMagickObject to convert, compose, and edit images from a Windows COM+ compatible component.
+ +
C++
+ +
Magick++ provides an object-oriented C++ interface to ImageMagick. See A Gentle Introduction to Magick++ for an introductory tutorial to Magick++. We include the source if you want to correct, enhance, or expand the tutorial.
+ +
GO
+
GoImagick is a set of Go bindings to ImageMagick's MagickWand and MagickCore C APIs.
+ +
Java
+ +
JMagick provides an object-oriented Java interface to ImageMagick. Im4java is a pure-java interface to the ImageMagick command-line.
+ +
Julia
+ +
JuliaIO provides an object-oriented Julia interface to ImageMagick.
+ +
LabVIEW
+ +
LVOOP ImageMagick is an object-oriented LabVIEW interface to ImageMagick.
+ +
Lisp
+ +
CL-Magick provides a Common Lisp interface to the ImageMagick library.
+ +
Lua
+ +
Lua bindings to ImageMagick for LuaJIT using FFI.
+ +
Neko
+ +
NMagick is a port of the ImageMagick library to the haXe and Neko platforms. It provides image manipulation capabilities to both web and desktop applications using Neko.
+ +
.NET
+ +
Use Magick.NET to convert, compose, and edit images from Windows .NET.
+ +
ImageMagickApp is a .NET application written in C# that utilizes the ImageMagick command line to allow conversion of multiple image formats to different formats.
+ +
Pascal
+ +
PascalMagick a Pascal binding for the MagickWand API and also the low-level MagickCore library. It works with Free Pascal / Lazarus and Delphi.
+ +
Perl
+ +
Use PerlMagick to convert, compose, and edit images from the Perl language.
+ +
PHP
+ +
MagickWand for PHP a native PHP-extension to the ImageMagick MagickWand API.
+ +
IMagick is a native PHP extension to create and modify images using the ImageMagick API. Documentation for the extension is available here.
+ +
phMagick is a wrapper class for ImageMagick, wrapping the most common web image manipulation actions in easy to use functions, but allowing full access to ImageMagick's power by issuing system calls to it's command-line programs.
+ + +
Python
+ + +
Wand is a ctypes-based ImagedMagick binding library for Python.
+
PythonMagick is an object-oriented Python interface to ImageMagick.
+
PythonMagickWand is an object-oriented Python interface to MagickWand based on ctypes.
+
Scilab Image Processing toolbox utilizes ImageMagick to do imaging tasks such as filtering, blurring, edge detection, thresholding, histogram manipulation, segmentation, mathematical morphology, color image processing, etc..
+ +
REALbasic
+ +
The MBS Realbasic ImageMagick is a plugin that utilizes the power of ImageMagick from within the RealBasic environment.
+ +
Ruby
+ +
RMagick is an interface between the Ruby programming language and the MagickCore image processing libraries. Get started with RMagick by perusing the documentation.
+ +
MagickWand for Ruby is an interface between the Ruby programming language and the MagickWand image processing libraries. Get started with MagickWand for PHP by perusing the documentation.
+ +
MiniMagick is a Ruby wrapper for ImageMagick command line. MiniMagick gives you convenient access to all the command line options ImageMagick supports.
+ +
QuickMagick is a gem for easily accessing ImageMagick command line tools from Ruby programs.
+ +
Rust
+ +
RustWand is a MagickWand bindings for the Rust language.
+ +
Tcl/Tk
+ +
TclMagick a native Tcl-extension to the ImageMagick MagickWand API.
+ +
XML RPC
+ +
RemoteMagick is an XML-RPC web service that creates image thumbnails.
+
+
+
+
+ + + + + + diff --git a/www/api/Image++.html b/www/api/Image++.html index 569843c..6d65219 100644 --- a/www/api/Image++.html +++ b/www/api/Image++.html @@ -66,8 +66,8 @@ -
- + +
@@ -147,7 +147,7 @@ int main(int argc,char **argv) // Write the image to a file image.write( "x.gif" ); } - catch( Exception &error_ ) + catch( Exception &error_ ) { cout << "Caught exception: " << error_.what() << endl; return 1; @@ -171,8 +171,8 @@ following:
  • Write the third image to a file.
    • -#include  
-#include  
+#include <Magick++.h> 
+#include <iostream> 
 using namespace std; 
 using namespace Magick; 
 int main(int argc,char **argv) 
@@ -195,7 +195,7 @@ and the image data is never copied.
 a 100 by 100 pixel white image with a red pixel in the center and
 writes it to a file: 
    
 
    -#include  
+#include <Magick++.h> 
 using namespace std; 
 using namespace Magick; 
 int main(int argc,char **argv) 
@@ -214,7 +214,6 @@ image.quantizeColorSpace( GRAYColorspace );
 image.quantizeColors( 256 ); 
 image.quantize( );
 
    
-
    
 
    or, more simply: 
    
 
      image.type( GrayscaleType );
@@ -235,10 +234,10 @@ has been placed within a Blob, it may be read into a Magick++ Image via
 a constructor or read()
 . Likewise, a Magick++ image may be written to a Blob via  write() .
-
    An example of using Image to write to a Blob follows: 
    
+
    An example of using Image to write to a Blob follows: 
    
   
    
 
    -#include  
+#include <Magick++.h> 
 using namespace std; 
 using namespace Magick; 
 int main(int argc,char **argv) 
@@ -250,14 +249,14 @@ int main(int argc,char **argv)
   // Write to BLOB in JPEG format 
   Blob blob; 
   image.magick( "JPEG" ) // Set JPEG output format 
-  image.write( &blob );
+  image.write( &blob );
 
   [ Use BLOB data (in JPEG format) here ]
 
   return 0; 
 }
 
    
-

    
+

    
 likewise, to read an image from a Blob, you could use one of the
 following examples: 
    
 
    [ Entry condition for the following examples
@@ -286,9 +285,9 @@ image.read( blob);
 
    
 Image may be constructed in a number of ways. It may be constructed
 from a file, a URL, or an encoded image (e.g. JPEG) contained in an
-in-memory  BLOB . The available Image
-constructors are shown in the following table: 
    
-  
    
+in-memory  BLOB . The available Image
+constructors are shown in the following table: 
    
+  
    
  
 
      
@@ -349,11 +348,11 @@ const
 string &magick_
-      
      
   Image Constructors 
     
     
      const size_t width_,  
      
-      const size_t height_, 
      
-      std::string map_, 
      
-      const 
-StorageType type_, 
      
+            		const size_t width_,  
      
+      const size_t height_, 
      
+      std::string map_, 
      
+      const 
+StorageType type_, 
      
       const void *pixels_      		
       Construct a new Image based on an array of
 image pixels. The pixel data must be in scanline order top-to-bottom.
@@ -363,7 +362,7 @@ are [0..MaxRGB].  For example, to create a 640x480 image from
 unsigned red-green-blue character data, use
       
         Image image( 640, 480, "RGB",
 0, pixels ); 
      
-      
      The parameters are as follows: 
      
+      
      The parameters are as follows: 
      
  
       
@@ -419,7 +418,7 @@ image.addNoise(GaussianNoise);
 image.write("myImage.tiff");
 
 adds gaussian noise to the image file "myImage.tiff".
-
      The operations supported by Image are shown in the following table: 
      
+
      The operations supported by Image are shown in the following table: 
      
  
 
        
         
        
@@ -431,11 +430,11 @@ adds gaussian noise to the image file "myImage.tiff".
     
@@ -459,27 +458,27 @@ noiseType_
@@ -528,10 +527,10 @@ deviation of the Laplacian, in pixels.
-      
@@ -710,7 +709,7 @@ kernel to apply.
         display
        
-      
-      
+      
         extent
        
+      
@@ -813,7 +812,7 @@ vertical direction)
-      
-      
@@ -987,10 +986,10 @@ specify a header string to print above the image.
@@ -1105,17 +1104,17 @@ change).
@@ -1185,10 +1184,10 @@ valid after calling ping.
@@ -1277,7 +1276,7 @@ require the pixels to be normalized [0..1]. The other types are
 unsigned red-green-blue character data, use
          image.read( 640, 480, "RGB", CharPixel,
 pixels ); 
        
-      
        The parameters are as follows: 
        
+      
        The parameters are as follows: 
        
  
       
        
   Image Image Manipulation Methods 
        
       
       
         adaptiveThreshold
        
+ size="-1">adaptiveThreshold
        
       
        
               		
       size_t width, size_t
-height, size_t offset = 0
        
+height, size_t offset = 0
        
               		
       Apply adaptive thresholding to
 the image. Adaptive thresholding is useful if the ideal threshold level
@@ -446,7 +445,7 @@ across the image. Adaptive thresholding works by evaluating the mean
 and using the mean as the thresholding value. In order to remove
 residual noise from the background, the threshold may be adjusted by
 subtracting a constant offset (default zero) from the mean to
-compute the threshold.
        
+compute the threshold.
        
               		
     
        
     
        
     
        
     
        
       addNoiseChannel
        
+ name="addNoiseChannel">addNoiseChannel
        
               		
       const ChannelType
-channel_, const NoiseType noiseType_
        
+channel_, const NoiseType noiseType_
        
               		
       Add noise to an image
 channel with the specified noise type. The channel_ parameter specifies the
 channel to add noise to.  The noiseType_ parameter
-specifies the type of noise.
        
+specifies the type of noise.
        
               		
     
        
     
        
       affineTransform
        
+ name="affineTransform">affineTransform
        
               		
       const DrawableAffine
-&affine
        
+&affine
        
               		
       Transform image by
-specified affine (or free transform) matrix.
        
+specified affine (or free transform) matrix.
        
               		
     
        
     
        
     
        
     
        
       blurChannel
        
+ name="blurChannel">blurChannel
        
               		
       const ChannelType
-channel_, const double radius_ = 0.0, const double sigma_ = 1.0
        
+channel_, const double radius_ = 0.0, const double sigma_ = 1.0
        
               		
       Blur an image
 channel. The channel_
@@ -619,9 +618,9 @@ width, height, or other  image  attributes by embedding 
     
        
        compare
        
+ name="compare"> compare
        
               		const Image &reference_
        
+              		const Image &reference_
        
               		
       Compare current image with
 another image. Sets meanErrorPerPixel
@@ -630,7 +629,7 @@ another image. Sets meanErrorPerPixel
        
+matte differ from the current image.
        
               		
     
        
     
        
       
       
       voidDisplay image on screen. 
        
+              		Display image on screen. 
        
       Caution:  if
 an image format is is not compatible with the display visual (e.g.
 JPEG on a colormapped display) then the original image will be
@@ -784,8 +783,8 @@ background color.        		
     
        
     
        
       
-      
         extent
        		const  Geometry &geometry_const  Geometry &geometry_
       extends the image as defined by the geometry, gravity, and image background color.
     
        
     
        
     
        
       
       
         floodFill-
-      
        
+      
        
       Color
        
               		
       ssize_t x_, ssize_t y_, const 
     
        
       
       
         floodFill-
-      
        
+      
        
       Texture
        
               		
       ssize_t x_, ssize_t y_,  const
@@ -933,10 +932,10 @@ specified by 'sigma_'.
     
        
     
        
       gaussianBlurChannel
        
+ name="gaussianBlurChannel">gaussianBlurChannel
        
               		
       const ChannelType
-channel_, const double radius_ = 0.0, const double sigma_ = 1.0
        
+channel_, const double radius_ = 0.0, const double sigma_ = 1.0
        
               		
       Gaussian blur
 an image channel. The 
     
        
     
        
        haldClut
        
+ name="haldClut"> haldClut
        
               		const Image &reference_
        
+              		const Image &reference_
        
               		apply a Hald color lookup table to the image.
        
+              		apply a Hald color lookup table to the image.
        
               		
     
        
     
        
     
        
     
        
       level
        
+ name="level">level
        
               		
       const double black_point,
-const double white_point, const double mid_point=1.0
        
+const double white_point, const double mid_point=1.0
        
               		
       Level image. Adjust the
 levels of the image by scaling the colors falling between specified
@@ -1002,16 +1001,16 @@ specifies a gamma correction to apply to the image. White point
 specifies the lightest color in the image.  Colors brighter than
 the white point are set to the maximum quantum value. The black and
 white point have the valid range 0 to MaxRGB while mid (gamma) has a
-useful range of 0 to ten.
        
+useful range of 0 to ten.
        
               		
     
        
     
        
       levelChannel
        
+ name="levelChannel">levelChannel
        
               		
       const ChannelType
 channel, const double black_point, const double white_point, const
-double mid_point=1.0
        
+double mid_point=1.0
        
               		
       Level image channel.
 Adjust the levels of the image channel by scaling the values falling
@@ -1023,7 +1022,7 @@ specifies a gamma correction to apply to the image. White point
 specifies the lightest color in the image. Colors brighter than the
 white point are set to the maximum quantum value. The black and white
 point have the valid range 0 to MaxRGB while mid (gamma) has a useful
-range of 0 to ten.
        
+range of 0 to ten.
        
               		
     
        
     
        
     
        
     
        
       motionBlur
        
+ name="motionBlur">motionBlur
        
               		
       const double radius_,
-const double sigma_, const double angle_
        
+const double sigma_, const double angle_
        
               		
       Motion blur image with
 specified blur factor. The radius_ parameter specifies the radius of
 the Gaussian, in pixels, not counting the center pixel.  The
 sigma_ parameter specifies the standard deviation of the Laplacian, in
 pixels. The angle_ parameter specifies the angle the object appears to
-be coming from (zero degrees is from the right).
        
+be coming from (zero degrees is from the right).
        
               		
     
        
     
        
     
        
     
        
       process
        
+ name="process">process
        
               		
       std::string name_,
-const ssize_t argc_, char **argv_
        
+const ssize_t argc_, char **argv_
        
               		
       Execute the named
 process module, passing any arguments via an argument vector, with
@@ -1196,7 +1195,7 @@ argc_
 specifying the number of arguments in the vector, and argv_ passing the
 address of an array of null-terminated C strings which constitute the
 argument vector. An exception is thrown if the requested process module
-does not exist, fails to load, or fails during execution.
        
+does not exist, fails to load, or fails during execution.
        
               		
     
        
     
        
       
        
@@ -1322,10 +1321,10 @@ values and type_ parameters.
@@ -1385,7 +1384,7 @@ number of degrees.
-      
         shade
        
  href="http://www.imagemagick.org/Magick++/Blob.html"> BLOB stored in blob_. The magick_
 parameter specifies the image format to write (defaults to magick ). The depth_ parameter species the image
-depth (defaults to  depth ).
        
+depth (defaults to  depth ).
        Caution:  if
 an image format is selected which is capable of supporting fewer
 colors than the original image or quantization has been requested, the
@@ -1669,7 +1668,7 @@ want to extract scanline 1 of a 640x480 image as character data in
 red-green-blue order:
          image.write(0,0,640,1,"RGB",0,pixels);
       
        
-      
        The parameters are as follows: 
        
+      
        The parameters are as follows: 
        
  
       
        
         
     
     
        
       randomThreshold
        
+ name="randomThreshold">randomThreshold
        
               		
       const Geometry
-&thresholds_
        
+&thresholds_
        
               		
       Random threshold the
 image. Changes the value of individual pixels based on the intensity of
@@ -1334,19 +1333,19 @@ low-contrast, two color image.  The thresholds_ argument is a
 geometry containing LOWxHIGH thresholds.  If the string contains
 2x2, 3x3, or 4x4, then an ordered dither of order 2, 3, or 4 will be
 performed instead. This is a very fast alternative to 'quantize' based
-dithering.
        
+dithering.
        
               		
     
        
     
        
       randomThresholdChannel
        
+ name="randomThresholdChannel">randomThresholdChannel
        
               		
       const Geometry
-&thresholds_, const ChannelType channel_
        
+&thresholds_, const ChannelType channel_
        
               		
       Random threshold an
 image channel. Similar to randomThreshold()
-but restricted to the specified channel.
        
+but restricted to the specified channel.
        
               		
     
        
     
        
       
       
         segment
        
               		double clusterThreshold_ = 1.0, 
        
+              		double clusterThreshold_ = 1.0, 
        
       double smoothingThreshold_ = 1.5        		
       Segment (coalesce similar image components)
 by analyzing the histograms of the color components and identifying
@@ -1405,7 +1404,7 @@ second derivative.  The default is 1.5.
       
       
       double azimuth_ = 30, double elevation_ = 30,
-      
        
+      
        
       bool colorShading_ = false        		
       Shade image using distant light source.
 Specify  azimuth_ and elevation_ as the 
@@ -1435,10 +1434,10 @@ standard deviation of the Laplacian, in pixels.
     
        
     
        
       sharpenChannel
        
+ name="sharpenChannel">sharpenChannel
        
               		
       const ChannelType
-channel_, const double radius_ = 0.0, const double sigma_ = 1.0
        
+channel_, const double radius_ = 0.0, const double sigma_ = 1.0
        
               		
       Sharpen pixel
 quantums in an image channel  The 
     
        
     
        
       unsharpmaskChannel
        
+ name="unsharpmaskChannel">unsharpmaskChannel
        
               		
       const ChannelType
 channel_, const double radius_, const double sigma_, const double
-amount_, const double threshold_
        
+amount_, const double threshold_
        
               		
       Sharpen an image
 channel using the unsharp mask algorithm. The 
       
       const string &imageSpec_
       Write image to a file using filename imageSpec_
-. 
        
+. 
        
       Caution:  if
 an image format is selected which is capable of supporting fewer
 colors than the original image or quantization has been requested, the
@@ -1643,7 +1642,7 @@ original if this is a problem.        		  
       
       
        
@@ -1747,7 +1746,7 @@ image.density(Geometry(150,150));   // could also use image.density("150x150")
 image.write(filename)
 
 The supported image attributes and the method arguments required to
-obtain them are shown in the following table: 
        
+obtain them are shown in the following table: 
          
         
  
 
          
@@ -1790,7 +1789,7 @@ and Postscript or TrueType fonts. Enabled by default.
@@ -1804,7 +1803,7 @@ sequence  of GIF images within Netscape.
@@ -1815,12 +1814,12 @@ sequence  of GIF images within Netscape.
-      
@@ -1829,13 +1828,13 @@ image attribute. Any number of named attributes may be attached to the
 image. For example, the image comment is a named image attribute with
 the name "comment". EXIF tags are attached to the image as named
 attributes. Use the syntax "EXIF:<tag>" to request an EXIF tag
-similar to "EXIF:DateTime".
          
+similar to "EXIF:DateTime".
          
@@ -1847,7 +1846,7 @@ similar to "EXIF:DateTime".
          
@@ -1926,16 +1925,16 @@ shared by all Image objects.
@@ -1967,7 +1966,7 @@ y=0.06)
@@ -1979,7 +1978,7 @@ y=0.6)
@@ -1991,7 +1990,7 @@ y=0.33)
@@ -2051,14 +2050,14 @@ are close to the target color in RGB space.
-      
-      
-      
@@ -2117,7 +2116,7 @@ composition is implicitly used (such as for image flattening).
-      
-      
@@ -2371,14 +2370,14 @@ color  difference.
-      
@@ -2403,7 +2402,7 @@ International Color Consortium for the format of ICC color profiles.<
     
@@ -2490,16 +2489,16 @@ to true and the image has just been quantized.
@@ -2523,7 +2522,7 @@ using this method.
          
@@ -2535,7 +2534,7 @@ Only valid for montage images.
@@ -2548,7 +2547,7 @@ is set to true and the image has just been quantized.
@@ -2560,18 +2559,18 @@ is set to true and the image has just been quantized.
-      
+      
@@ -2582,7 +2581,7 @@ turning the right way up.
          
@@ -2625,19 +2624,19 @@ image (such as for a scene in an animation)
          
-      
-      
@@ -2652,7 +2651,7 @@ profile. Valid names include "*",
     
@@ -2666,7 +2665,7 @@ option will have any duplicate or unused colors removed.
     
@@ -2702,7 +2701,7 @@ be set for this option to take effect.
     
@@ -2716,7 +2715,7 @@ may be used to manually adjust the tree depth.
     
-      
-      
-      
@@ -3040,7 +3039,7 @@ modified, the Image's modifyImage() metho
 should be invoked to reduce the reference count on the underlying image
 to one. If this is not done, then it is possible for a previous
 generation of the image to be modified due to the use of reference
-counting when copying or constructing an Image.
          
+counting when copying or constructing an Image.
          
 
          
 
          Depending on the capabilities of the operating system, and the
 relationship of the window to the image, the pixel cache may be a copy
@@ -3054,7 +3053,7 @@ supports copying the pixels in the cache to a foreign pixel
 representation according to the format specified by QuantumTypes.
          
 
          The pixel region is effectively a small image in which the pixels
 may be accessed, addressed, and updated, as shown in the following
-example:
+example:
          
 
           
          
 Image image("cow.png"); 
@@ -3075,8 +3074,7 @@ image.syncPixels();
   // Save updated image to file.
 image.write("horse.png");
 
          
-
          
-
          The image cache supports the following methods: 
          
+
          The image cache supports the following methods: 
          
  
 
            
   Image Attributes 
     
            
       
       
             animation-
-      
            
+      
            
       Delay
            
                   		
       size_t (0 to 65535)
     
            
       
       
             animation-
-      
            
+      
            
       Iterations
            
                   		
       size_t
     
            
     
            
       attribute
            
+ name="attribute">attribute
            
                   		string
            
+                  		string
            
                   		
       const
-std::string name_
            
+std::string name_
            
                   		
       const
 std::string name_, const std::string value_
       
     
            
     
            
       
       
             background-
-      
            
+      
            
       Color
            
                   		
       Color 
     
            
       
       
             background-
-      
            
+      
            
       Texture
            
                   		
       string
     
            
     
            
       channelDepth
            
+ name="channelDepth">channelDepth
            
                   		
       size_t
-
            
+
            
                   		
       const
-ChannelType channel_
            
+ChannelType channel_
            
                   		
       const ChannelType
-channel_, const size_t depth_
            
+channel_, const size_t depth_
            
                   		
       Channel modulus depth.
 The channel modulus depth represents the minimum number of bits
@@ -1949,13 +1948,13 @@ not altered. There is no attribute associated with the modulus depth so
 the current modulus depth is obtained by inspecting the pixels. As a
 result, the depth returned may be less than the most recently set
 channel depth. Subsequent image processing may result in increasing the
-channel depth.
            
+channel depth.
            
                   		
     
            
     
            
       
       
             chroma-
-      
            
+      
            
       BluePrimary
            
                   		
       double x & y
     
            
       
       
             chroma-
-      
            
+      
            
       GreenPrimary
            
                   		
       double x & y
     
            
       
       
             chroma-
-      
            
+      
            
       RedPrimary
            
                   		
       double x & y
     
            
       
       
             chroma-
-      
            
+      
            
       WhitePoint
            
                   		
       double x & y
     
            
     
            
       
-      
             colorMapSize
            
+      
             colorMapSize
            
       
            
       
            		size_t
            
+                  		size_t
            
                   		void
            
+                  		void
            
                   		size_t entries_
            
+                  		size_t entries_
            
                   		
       Number of entries in the
 colormap. Setting the colormap size may extend or truncate the
@@ -2067,7 +2066,7 @@ The maximum number of supported entries is specified by the MaxColormapSize
            
+ensure that the image colormap indexes reference valid colormap entries.
            
                   		
     
            
     
            
     
            
       
       
             compress-
-      
            
+      
            
       Type
            
                   		
       CompressionType
@@ -2141,16 +2140,16 @@ from ImageMagick as it executes.
     
            
     
            
       defineValue
            
+ name="defineValue">defineValue
            
                   		string
            
+                  		string
            
                   		
       const std::string
-&magick_, const std::string &key_
            
+&magick_, const std::string &key_
            
                   		
       const std::string
 &magick_, const std::string &key_,  const std::string
-&value_
            
+&value_
            
                   		
       Set or obtain a
 definition string to applied when encoding or decoding the specified
@@ -2159,20 +2158,20 @@ is designated by the magick_
 argument, the format-specific key is designated by key_, and the associated value is
 specified by value_. See the
-defineSet() method if the key must be removed entirely.
            
+defineSet() method if the key must be removed entirely.
            
                   		
     
            
     
            
       defineSet
            
+ name="defineSet">defineSet
            
                   		bool
            
+                  		bool
            
                   		
       const std::string
-&magick_, const std::string &key_
            
+&magick_, const std::string &key_
            
                   		
       const std::string
-&magick_, const std::string &key_, bool flag_
            
+&magick_, const std::string &key_, bool flag_
            
                   		
       Set or obtain a
 definition flag to applied when encoding or decoding the specified
@@ -2183,7 +2182,7 @@ creates a value-less define with that format and key. Passing the flag_
 value 'false' removes any existing matching definition. The method
 returns 'true' if a matching key exists, and 'false' if no matching key
-exists.
            
+exists.
            
                   		
     
            
     
            
     
            
       
       
             gifDispose-
-      
            
+      
            
       Method
            
                   		size_t 
            
-      { 0 = Disposal not specified, 
            
-      1 = Do not dispose of graphic, 
            
+                  		size_t 
            
+      { 0 = Disposal not specified, 
            
+      1 = Do not dispose of graphic, 
            
       3 = Overwrite graphic with background color,
-      
            
+      
            
       4 = Overwrite graphic with previous graphic. }            		
       void
       size_t disposeMethod_
            
       
       
             interlace-
-      
            
+      
            
       Type
            
                   		
       InterlaceType
@@ -2478,7 +2477,7 @@ an opaque one.
     
            
       
       
             meanError-
-      
            
+      
            
       PerPixel
            
                   		
       double
     
            
     
            
       modulusDepth
            
+ size="-1">modulusDepth
            
                   		
       size_t
-
            
+
            
                   		
       void
            
+ size="-1">void
            
                   		
       size_t
-depth_
            
+depth_
            
                   		
       Image
 modulus depth (minimum number of bits required to support
@@ -2508,7 +2507,7 @@ depth may be decreased by supplying a value which is less than the
 current value, updating the pixels (reducing accuracy) to the new
 depth.
 The pixel modulus depth can not be increased over the current value
-using this method.
            
+using this method.
            
                   		
     
            
     
            
     
            
       
       
             montage-
-      
            
+      
            
       Geometry
            
                   		
       Geometry 
     
            
       
       
             normalized-
-      
            
+      
            
       MaxError
            
                   		
       double
     
            
       
       
             normalized-
-      
            
+      
            
       MeanError
            
                   		
       double
     
            
     
            
       orientation
            
+ name="orientation">orientation
            
                   		
       OrientationTypevoid
            
+ href="https://www.imagemagick.org/Magick++/Enumerations.html#OrientationType">OrientationType            		void
            
                   		
       OrientationType
 orientation_
       Image orientation.
  Supported by some file formats such as DPX and TIFF. Useful for
-turning the right way up.
            
+turning the right way up.
            
                   		
     
            
     
            
       void
        
       The number of runlength-encoded packets in
-      
            
+      
            
       the image            		
     
            
     
            
     
            
     
            
       
-      
             profile
            
+      
             profile
            
       
            
       
            		 Blob
            
+                  		 Blob
            
                                		const std::string name_
            
+                  		const std::string name_
            
                   		
       const std::string name_, const Blob
-&colorProfile_
            
+&colorProfile_
            
                   		
       Get/set/remove  a named
 profile. Valid names include "*",
-"8BIM", "ICM", "IPTC", or a user/format-defined profile name. 
            
+"8BIM", "ICM", "IPTC", or a user/format-defined profile name. 
            
                   		
     
            
     
            
       
       
             quantize-
-      
            
+      
            
       Colors
            
                   		
       size_t
            
       
       
             quantize-
-      
            
+      
            
       ColorSpace
            
                   		
       ColorspaceType
@@ -2683,7 +2682,7 @@ results when color reducing an image.
     
            
       
       
             quantize-
-      
            
+      
            
       Dither
            
                   		
       bool
            
       
       
             quantize-
-      
            
+      
            
       TreeDepth
            
                   		
       size_t 
            
       
       
             rendering-
-      
            
+      
            
       Intent
            
                   		
       RenderingIntent
@@ -2729,7 +2728,7 @@ render_
     
            
       
       
             resolution-
-      
            
+      
            
       Units
            
                   		
       ResolutionType
@@ -2908,14 +2907,14 @@ stroke (outlines).
     
            
     
            
       
-      
             textEncoding
            
+      
             textEncoding
            
       
            
       
            		string
            
+                  		string
            
                   		void
            
+                  		void
            
                   		const std::string &encoding_
            
+                  		const std::string &encoding_
            
                   		
       Specify the code set to use for text
 annotations. The only character encoding which may be specified at
@@ -2923,7 +2922,7 @@ this time is "UTF-8" for representing  Unicode  as a
 sequence of bytes. Specify an empty string to use the default ASCII
 encoding. Successful text annotation using Unicode may require fonts
-designed to support Unicode.
            
+designed to support Unicode.
            
                   		
     
            
     
            
@@ -3215,7 +3213,6 @@ the region set by a preceding getPixels or getConstPixels call.
 
            
 
 
-    
   
   
            
     
            Security •
@@ -3238,8 +3235,8 @@ the region set by a preceding getPixels or getConstPixels call.
   
            
 
   
-  
-  
+  
 
 
-
\ No newline at end of file
+
diff --git a/www/api/animate.html b/www/api/animate.html
index 0c819d2..a3d04b0 100644
--- a/www/api/animate.html
+++ b/www/api/animate.html
@@ -66,8 +66,8 @@
       
     
     
-    
            
-      
+    
+      
       
     
   
@@ -114,8 +114,7 @@
   
 
   
-  
-  
+   
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+  
-  
+      
+    
+  
+  
+  
            
+    
            
+
            
+
            Unix Binary Release • Mac OS X Binary Release • iOS Binary Release • Windows Binary Release
            
+
+
            You can install ImageMagick from source.  However, if you don't have a proper development environment or if you're anxious to get started, download a ready-to-run Unix or Windows executable.  Before you download, you may want to review recent changes to the ImageMagick distribution.
            
+
+
            Unix Binary Release
            
+
+
            These are the Unix variations that we support.  If your system is not on the list, try installing from source. Although ImageMagick runs fine on a single core computer, it automagically runs in parallel on dual and quad-core systems reducing run times considerably.
            
+
+
            
+
            
   Image Cache Methods 
            
+  +  
+    
+    
+    
+    
+  
+
+  
+      
+      
+    
+    
+  
+
+  
+      
+      
+    
+    
+  
+
+  
+    
+    
+    
+    
+  
+
+  
+    
+    
+    
+    
+  
+
+  
+    
+    
+    
+    
+  
+
+  
+    
+    
+    
+    
+  
+
               

            VersionHTTPFTPDescription
            ImageMagick-6.9.9-45.x86_64.rpmdownloaddownloadRedhat / CentOS 7.1 x86_64 RPM
            ImageMagick-libs-6.9.9-45.x86_64.rpmdownloaddownloadRedhat / CentOS 7.1 x86_64 RPM
            ImageMagick RPM'sdownloaddownloadDevelopment, Perl, C++, and documentation RPM's.
            ImageMagick-i386-pc-solaris2.11.tar.gzdownloaddownloadSolaris Sparc 2.11
            ImageMagick-i686-pc-cygwin.tar.gzdownloaddownloadCygwin
            ImageMagick-i686-pc-mingw32.tar.gzdownloaddownloadMinGW
            
+
+
            Verify its message digest.
            
+
+
            ImageMagick RPM's are self-installing.  Simply type the following command and you're ready to start using ImageMagick:
            
+
+
            $ rpm -Uvh ImageMagick-6.9.9-45.x86_64.rpm
            
+
            You'll need to install the requisite libraries:
            
+
+
            $ rpm -Uvh ImageMagick-libs-6.9.9-45.x86_64.rpm
            
+
            For other systems, create (or choose) a directory to install the package into and change to that directory, for example:
            
+
+
            +cd $HOME
+
            
+
+
            Next, extract the contents of the package.  For example:
            
+
+
            +tar xvzf ImageMagick.tar.gz
+
            
+
+
            Set the MAGICK_HOME environment variable to the path where you extracted the ImageMagick files. For example:
            
+
+
            $ export MAGICK_HOME="$HOME/ImageMagick-6.9.9"
            
+
            If the bin subdirectory of the extracted package is not already in your executable search path, add it to your PATH environment variable. For example:
            
+
+
            +export PATH="$MAGICK_HOME/bin:$PATH
+
            
+
+
+
            On Linux and Solaris machines add $MAGICK_HOME/lib to the LD_LIBRARY_PATH environment variable:
            
+
+
            +LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$MAGICK_HOME/lib
+export LD_LIBRARY_PATH
+
            
+
+
            Finally, to verify ImageMagick is working properly, type the following on the command line:
            
+
+
            +convert logo: logo.gif
+identify logo.gif
+display logo.gif
+
            
+
+
            Congratulations, you have a working ImageMagick distribution under Unix or Linux and you are ready to use ImageMagick to convert, compose, or edit your images or perhaps you'll want to use one of the Application Program Interfaces for C, C++, Perl, and others.
            
+
+
            Mac OS X Binary Release
            
+
+
            We recommend MacPorts which custom builds ImageMagick in your environment (some users prefer Homebrew).  Download MacPorts and type:
            
+
+
            +sudo port install ImageMagick
+
            
+
+
            The port command downloads ImageMagick and many of its delegate libraries (e.g. JPEG, PNG, Freetype, etc.) and configures, builds, and installs ImageMagick automagically.  Alternatively, you can download the ImageMagick Mac OS X distribution we provide:
            
+
+
            
+
+  +  
+    
+    
+    
+    
+  
+
+  
+    
+    
+    
+    
+  
+
               

            VersionHTTPFTPDescription
            ImageMagick-x86_64-apple-darwin15.6.0.tar.gzdownloaddownloadMac OS X El Capitan
            
+
+
            Verify its message digest.
            
+
+
            Create (or choose) a directory to install the package into and change to that directory, for example:
            
+
+
            +cd $HOME
+
            
+
+
            Next, extract the contents of the package.  For example:
            
+
+
            +tar xvzf ImageMagick-x86_64-apple-darwin15.2.0.tar.gz
+
            
+
+
            Set the MAGICK_HOME environment variable to the path where you extracted the ImageMagick files. For example:
            
+
+
            $ export MAGICK_HOME="$HOME/ImageMagick-6.9.9"
            
+
            If the bin subdirectory of the extracted package is not already in your executable search path, add it to your PATH environment variable. For example:
            
+
+
            +export PATH="$MAGICK_HOME/bin:$PATH"
+
            
+
+
+
            Set the DYLD_LIBRARY_PATH environment variable:
            
+
+
            +export DYLD_LIBRARY_PATH="$MAGICK_HOME/lib/"
+
            
+
+
            Finally, to verify ImageMagick is working properly, type the following on the command line:
            
+
+
            +convert logo: logo.gif
+identify logo.gif
+display logo.gif
+
            
+
+
            Note, the display program requires the X11 server available on your Mac OS X installation DVD. Once that is installed, you will also need to export DISPLAY=:0.
            
+
+
            The best way to deal with all the exports is to put them at the end of your .profile file
            
+
+
            Congratulations, you have a working ImageMagick distribution under Mac OS X and you are ready to use ImageMagick to convert, compose, or edit your images or perhaps you'll want to use one of the Application Program Interfaces for C, C++, Perl, and others.
            
+
+
            iOS Binary Release
            
+
+
            ~Claudio provides iOS builds of ImageMagick.
            
+
+
            Download iOS Distribution
            
+
+
            You can download the iOS distribution directly from ImageMagick's repository.
            
+
+
            There are always 2 packages for the compiled ImageMagick:
            
+
+
              
+
            • iOSMagick-VERSION-libs.zip
              • 
+
            • iOSMagick-VERSION.zip
              • 
+
            
+
+
            The first one includes headers and compiled libraries that have been used to compile ImageMagick. Most users would need this one.
            
+
+
            ImageMagick compiling script for iOS OS and iOS Simulator
            
+
+
            To run the script:
            
+
            +./imagemagick_compile.sh VERSION
+
            
+
            where VERSION is the version of ImageMagick you want to compile (i.e.: 6.9.9-45, svn, ...)
            
+
+
            This script compiles ImageMagick as a static library to be included in iOS projects and adds support for
            
+
              
+
            • png
              • 
+
            • jpeg
              • 
+
            • tiff
              • 
+
            
+
+
            Upon successful compilation a folder called IMPORT_ME is created on your ~/Desktop. You can import it into your XCode project.
            
+
+
            XCode project settings
            
+
+
            After including everything into XCode please also make sure to have these settings (Build tab of the project information):
            
+
              
+
            • Other Linker Flags: -lMagickCore-Q16 -lMagickWand-Q16 -ljpeg -lpng -lbz2 -lz
              • 
+
            • Header Search Paths: $(SRCROOT) - make it Recursive
              • 
+
            • Library Search Paths: $(SRCROOT) - make it Recursive
              • 
+
            
+
+
            On the lower left click on the small-wheel and select: Add User-Defined Setting
            
+
              
+
            • Key: OTHER_CFLAGS
              • 
+
            • Value: -Dmacintosh=1
              • 
+
            
+
+
            Sample project
            
+
+
            A sample project  is available for download. It is not updated too often, but it does give an idea of all the settings and some ways to play around with ImageMagick in an iOS application.
            
+
+
            Windows Binary Release
            
+
+
            ImageMagick runs on Windows 10 (x86 & x64), Windows 8 (x86 & x64), Windows 7 (x86 & x64), Windows Server 2012, Windows XP (x86) with Service Pack 3, Windows Vista (x86 & x64) with Service Pack 2, Windows Server 2003 (x86 & x64) with Service Pack 2 (verify MSXML6 is present), Windows Server 2003 R2 (x86 & x64), Windows Server 2008 (x86 & x64) with Service Pack 2, and Windows Server 2008 R2 (x64).
            
+
+
            The amount of memory can be an important factor, especially if you intend to work on large images.  A minimum of 512 MB of RAM is recommended, but the more RAM the better.  Although ImageMagick runs well on a single core computer, it automagically runs in parallel on multi-core systems reducing run times considerably.
            
+
+
            The Windows version of ImageMagick is self-installing.  Simply click on the appropriate version below and it will launch itself and ask you a few installation questions.  Versions with Q8 in the name are 8 bits-per-pixel component (e.g. 8-bit red, 8-bit green, etc.), whereas,  Q16 in the filename are 16 bits-per-pixel component. A Q16 version permits you to read or write 16-bit images without losing precision but requires twice as much resources as the Q8 version.  Versions with dll in the filename include ImageMagick libraries as dynamic link libraries. Unless you have a Windows 32-bit OS, we recommend this version of ImageMagick for 64-bit Windows:
            
+
+
            
+
+  +  
+    
+    
+    
+    
+  
+
+  
+        
+        
+      
+    
+  
+
               

            VersionHTTPFTPDescription
            ImageMagick-6.9.9-45-Q16-x64-dll.exedownloaddownloadWin64 dynamic at 16 bits-per-pixel component
            
+
+
            Or choose from these alternate Windows binary distributions:
            
+
+
            
+
+  +  
+    
+    
+    
+    
+  
+
+  
+        
+        
+      
+   
+  
+
+  
+        
+        
+      
+   
+  
+
+  
+        
+        
+      
+    
+  
+
+  
+        
+        
+      
+    
+  
+
+  
+        
+        
+      
+    
+  
+
+  
+        
+        
+      
+    
+  
+
+  
+        
+        
+      
+    
+  
+
+  
+        
+        
+      
+    
+  
+
+  
+        
+        
+      
+    
+  
+
+  
+        
+        
+      
+    
+  
+
+  
+        
+        
+      
+    
+  
+
+  
+        
+        
+      
+    
+  
+
+  
+        
+        
+      
+    
+  
+
               

            VersionHTTPFTPDescription
            ImageMagick-6.9.9-45-Q16-x64-static.exedownloaddownloadWin64 static at 16 bits-per-pixel component
            ImageMagick-6.9.9-45-Q8-x64-dll.exedownloaddownloadWin64 dynamic at 8 bits-per-pixel component
            ImageMagick-6.9.9-45-Q8-x64-static.exedownloaddownloadWin64 static at 8 bits-per-pixel component
            ImageMagick-6.9.9-45-Q16-HDRI-x64-dll.exedownloaddownloadWin64 dynamic at 16 bits-per-pixel component with high dynamic-range imaging enabled
            ImageMagick-6.9.9-45-Q16-HDRI-x64-static.exedownloaddownloadWin64 static at 16 bits-per-pixel component with high dynamic-range imaging enabled
            ImageMagick-6.9.9-45-Q16-x86-dll.exedownloaddownloadWin32 dynamic at 16 bits-per-pixel component
            ImageMagick-6.9.9-45-Q16-x86-static.exedownloaddownloadWin32 static at 16 bits-per-pixel component
            ImageMagick-6.9.9-45-Q8-x86-dll.exedownloaddownloadWin32 dynamic at 8 bits-per-pixel component
            ImageMagick-6.9.9-45-Q8-x86-static.exedownloaddownloadWin32 static at 8 bits-per-pixel component
            ImageMagick-6.9.9-45-Q16-HDRI-x86-dll.exedownloaddownloadWin32 dynamic at 16 bits-per-pixel component with high dynamic-range imaging enabled
            ImageMagick-6.9.9-45-Q16-HDRI-x86-static.exedownloaddownloadWin32 static at 16 bits-per-pixel component with high dynamic-range imaging enabled
            ImageMagick-6.9.9-45-portable-Q16-x86.zipdownloaddownloadPortable Win32 static at 16 bits-per-pixel component.  Just copy to your host and run (no installer, no Windows registry entries).
            ImageMagick-6.9.9-45-portable-Q16-x64.zipdownloaddownloadPortable Win64 static at 16 bits-per-pixel component.  Just copy to your host and run (no installer, no Windows registry entries).
            
+
+
            Verify its message digest.
            
+
+
            To verify ImageMagick is working properly, type the following in an Command Prompt window:
            
+
+
            +convert logo: logo.gif
+identify logo.gif
+imdisplay logo.gif
+
            
+
+
            If you have any problems, you likely need vcomp120.dll.  To install it, download Visual C++ 2013 Redistributable Package.
            
+
+
            Note, use a double quote (") rather than a single quote (') for the ImageMagick command line under Windows:
            
+
+
            +convert "e:/myimages/image.png" "e:/myimages/image.jpg"
+
            
+
            Use two double quotes for VBScript scripts:
            
+
            +Set objShell = wscript.createobject("wscript.shell")
+objShell.Exec("convert ""e:/myimages/image.png"" ""e:/myimages/image.jpg""")
+
            
+
+
            Congratulations, you have a working ImageMagick distribution under Windows and you are ready to use ImageMagick to convert, compose, or edit your images or perhaps you'll want to use one of the Application Program Interfaces for C, C++, Perl, and others.
            
+
+
+
+    
+  
+  
+
+  
+  
+
+
diff --git a/www/changelog.html b/www/changelog.html
index 284960b..d45b76b 100644
--- a/www/changelog.html
+++ b/www/changelog.html
@@ -67,8 +67,8 @@
       
     
     
-    
            
-      
+    
+      
       
     
            
   
@@ -418,13 +418,14 @@
 
            2020-01-07  6.9.10-85 Cristy  <quetzlzacatenango@image...>
            
   
          •  Support Fx do() iterator.
            • 
   
          •  `magick -size 100x100 xc:black black.pnm` no longer creates a white image    (reference https://github.com/ImageMagick/ImageMagick/issues/1817).
            • 
-  
          •  setjmp/longjmp in jpeg.c no longer trigger undefind behavior (reference
            		https://imagemagick.org/discourse-server//viewtopic.html?f=3&t=37379).
            
-  
          •  Permit compositing in the CMYK colorspace (reference    https://imagemagick.org/discourse-server//viewtopic.html?f=3&t=37368).
            • 
+  
          •  setjmp/longjmp in jpeg.c no longer trigger undefind behavior (reference		https://imagemagick.org/discourse-server/viewtopic.html?f=3&t=37379).
            • 
+  
          •  Permit compositing in the CMYK colorspace (reference    https://imagemagick.org/discourse-server/viewtopic.html?f=3&t=37368).
            • 
 
            2020-01-04  6.9.10-84 Cristy  <quetzlzacatenango@image...>
            
   
          •  Release ImageMagick version 6.9.10-84, GIT revision 15212:a45335c:20200104.
            • 
 
            2020-01-01  6.9.10-84 Cristy  <quetzlzacatenango@image...>
            
   
          •  Support extended Fx assignment operators (e.g. *=, /=, ++, --, etc.)
            • 
-  
          •  Support Fx for() iterator.
            	* Optimize Fx performance.
            
+  
          •  Support Fx for() iterator. 
            • 
+  
          •  * Optimize Fx performance.
            • 
   
          • 	* Ensure circle.rb renders the same for IMv6 and IMv7 (reference    https://github.com/rmagick/rmagick/issues/905).
            • 
 
            2019-12-30  6.9.10-83 Cristy  <quetzlzacatenango@image...>
            
   
          •  Release ImageMagick version 6.9.10-83, GIT revision 15184:9f64323:20191230.
            • 
@@ -492,7 +493,8 @@
 
            2019-10-27  6.9.10-70 Cristy  <quetzlzacatenango@image...>
            
   
          •  Release ImageMagick version 6.9.10-70, GIT revision 14970:4200095:20191027.
            • 
 
            2019-10-27  6.9.10-70 Cristy  <quetzlzacatenango@image...>
            
-  
          •  Fixed numerous issues  posted to GitHub (reference    https://github.com/ImageMagick/ImageMagick/issues).
            2019-10-27  6.9.10-70 Cristy  <quetzlzacatenango@image...>
            
+
          •  Fixed numerous issues  posted to GitHub (reference    https://github.com/ImageMagick/ImageMagick/issues).
            • 
+
            2019-10-27  6.9.10-70 Cristy  <quetzlzacatenango@image...>
            
   
          •  Release ImageMagick version 6.9.10-70, GIT revision 14970:4200095:20191027.
            • 
 
            2019-10-27  6.9.10-70 Cristy  <quetzlzacatenango@image...>
            
   
          •  Fixed numerous issues  posted to GitHub (reference    https://github.com/ImageMagick/ImageMagick/issues).
            • 
@@ -794,7 +796,7 @@
   
          •  Release ImageMagick version 6.9.10-1, GIT revision 13595:dafb03062:20180616.
            • 
 
            2018-06-16  6.9.10-1 Cristy  <quetzlzacatenango@image...>
            
   
          •  Fixed numerous use of uninitialized values, integer overflow, memory    exceeded, and timeouts (credit to OSS Fuzz).
            • 
-  
          •  Fixed an issue with stroke and label: (reference
            • 
+  
          •  Fixed an issue with stroke and label
            • 
 
            2018-06-12  6.9.10-0 Cristy  <quetzlzacatenango@image...>
            
   
          •  Release ImageMagick version 6.9.10-0, GIT revision 13585:82d7dbe0b:20180612.
            • 
 
            2018-06-11  6.9.10-0 Cristy  <quetzlzacatenango@image...>
            
@@ -1064,7 +1066,7 @@
 
            2017-05-26  6.9.8-7 Cristy  <quetzlzacatenango@image...>
            
   
          •  Release ImageMagick version 6.9.8-7, GIT revision 11598:07d1dee:20170526.
            • 
 
            2017-05-23  6.9.8-7 Cristy  <quetzlzacatenango@image...>
            
-  
          •  Improper allocation of memory for IM instances without threads (reference
            	  https://github.com/ImageMagick/ImageMagick/issues/497).
            
+  
          •  Improper allocation of memory for IM instances without threads (reference    	  https://github.com/ImageMagick/ImageMagick/issues/497).
            • 
   
          •  Delete corrupt image from list (reference    https://github.com/ImageMagick/ImageMagick/issues/500).
            • 
 
            2017-05-19  6.9.8-6 Cristy  <quetzlzacatenango@image...>
            
   
          •  Release ImageMagick version 6.9.8-6, GIT revision 11590:7ce2d38:20170519.
            • 
@@ -1224,10 +1226,10 @@
 
            2016-08-27  6.9.5-8 Dirk Lemstra <dirk@lem.....org>
            
   
          •  Added define 'psd:additional-info' to preserve the additional information    in a PSD file.
            • 
 
            2016-08-15  6.9.5-8 Cristy  <quetzlzacatenango@image...>
            
-  
          •  Prevent buffer overflow in BMP & SGI coders (bug report from
            	  pwchen&rayzhong of tencent).
            
+  
          •  Prevent buffer overflow in BMP & SGI coders (bug report from    	  pwchen&rayzhong of tencent).
            • 
   
          •  Fix MSVG regression (reference    https://github.com/ImageMagick/ImageMagick/issues/252).
            • 
-  
          •  Prevent buffer overflow and other problems in SIXEL, PDB, MAP, TIFF, and
            	  CALS coders (bug report from Donghai Zhu).
            
-  
          • 2016-08-14  6.9.5-7 Cristy  <quetzlzacatenango@image...>
            
+  
          •  Prevent buffer overflow and other problems in SIXEL, PDB, MAP, TIFF, and	  CALS coders (bug report from Donghai Zhu).
            • 
+
            2016-08-14  6.9.5-7 Cristy  <quetzlzacatenango@image...>
            
   
          •  Release ImageMagick version 6.9.5-7, GIT revision 10993:7d2fd25:20160814.
            • 
 
            2016-08-14  6.9.5-7 Cristy  <quetzlzacatenango@image...>
            
   
          •  Eliminate compiler warning.
            • 
@@ -5138,6 +5140,7 @@
   
 
   
-  
-  
+  
-  
+  
-
 
     
   
@@ -148,6 +147,6 @@
   
 
   
-