From 6e51a24014049be530a2427dccc4d96a9884cb2d Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 7 Jun 2015 14:41:36 +0000 Subject: [PATCH] --- index.html | 6 +- www/advanced-unix-installation.html | 6 +- www/advanced-windows-installation.html | 2 +- www/api.html | 4 +- www/architecture.html | 4 +- www/binary-releases.html | 58 +++++++------- www/changelog.html | 10 ++- www/color.html | 2 +- www/command-line-options.html | 10 +-- www/contact.html | 2 +- www/download.html | 4 +- www/formats.html | 2 +- www/index.html | 6 +- www/magick++.html | 4 +- www/magick.html | 4 +- www/porting.html | 100 ++++++++++++------------- www/support.html | 2 +- 17 files changed, 114 insertions(+), 112 deletions(-) diff --git a/index.html b/index.html index 55a121841..fe40e7e37 100644 --- a/index.html +++ b/index.html @@ -62,14 +62,14 @@ ImageMagick® is a software suite to create, edit, compose, or convert bitmap images. It can read and write images in a variety of formats (over 200) including PNG, JPEG, JPEG-2000, GIF, TIFF, DPX, EXR, WebP, Postscript, PDF, and SVG. Use ImageMagick to resize, flip, mirror, rotate, distort, shear and transform images, adjust image colors, apply various special effects, or draw text, lines, polygons, ellipses and Bézier curves.

The functionality of ImageMagick is typically utilized from the command line or you can use the features from programs written in your favorite language. Choose from these interfaces: G2F (Ada), MagickCore (C), MagickWand (C), ChMagick (Ch), ImageMagickObject (COM+), Magick++ (C++), JMagick (Java), L-Magick (Lisp), Lua, NMagick (Neko/haXe), Magick.NET (.NET), PascalMagick (Pascal), PerlMagick (Perl), MagickWand for PHP (PHP), IMagick (PHP), PythonMagick (Python), RMagick (Ruby), or TclMagick (Tcl/TK). With a language interface, use ImageMagick to modify or create images dynamically and automagically.

-

ImageMagick utiilizes multiple computational threads to increase performance and can read, process, or write mega-, giga-, or tera-pixel image sizes.

+

ImageMagick utilizes multiple computational threads to increase performance and can read, process, or write mega-, giga-, or tera-pixel image sizes.

ImageMagick is free software delivered as a ready-to-run binary distribution or as source code that you may use, copy, modify, and distribute in both open and proprietary applications. It is distributed under the Apache 2.0 license.

The ImageMagick development process ensures a stable API and ABI. Before each ImageMagick release, we perform a comprehensive security assessment that includes memory error and thread data race detection to prevent security vulnerabilities.

-

The current release is ImageMagick 6.9.1-3 available from http://www.imagemagick.org/download. It runs on Linux, Windows, Mac Os X, iOS, Android OS, and others.

+

The current release is ImageMagick 6.9.1-4 available from http://www.imagemagick.org/download. It runs on Linux, Windows, Mac Os X, iOS, Android OS, and others.

-

The authoritative ImageMagick web site is http://www.imagemagick.org.

+

The authoritative ImageMagick web site is http://www.imagemagick.org. The authoritative source code repository is https://subversion.imagemagick.org/subversion/ImageMagick/.

Features and Capabilities

Here are just a few examples of what ImageMagick can do for you:

diff --git a/www/advanced-unix-installation.html b/www/advanced-unix-installation.html index 98a74aa4d..36c8dfc57 100644 --- a/www/advanced-unix-installation.html +++ b/www/advanced-unix-installation.html @@ -77,7 +77,7 @@ tar xvzf ImageMagick.tar.gz

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:

-
 cd ImageMagick-6.9.1-3 ./configure
+
 cd ImageMagick-6.9.1-4 ./configure

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

@@ -534,7 +534,7 @@ sudo port install jpeg

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

Unpack and change into the top-level ImageMagick directory:

- 
 tar xvzf ImageMagick-6.9.1-3.tar.gz cd ImageMagick-6.9.1-3

Configure ImageMagick:

+ 
 tar xvzf ImageMagick-6.9.1-4.tar.gz cd ImageMagick-6.9.1-4

Configure ImageMagick:

 ./configure --prefix=/opt --with-quantum-depth=16 \
   --disable-dependency-tracking --with-x=yes \
@@ -566,7 +566,7 @@ display -display :0
 
 
Although you can download and install delegate libraries yourself, many are already available in the GnuWin32 distribution.  Download and install whichever delegate libraries you require such as JPEG, PNG, TIFF, etc.  Make sure you specify the development headers when you install a package.  Next type,

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

+
 tar jxvf ImageMagick-6.9.1-?.tar.bz2
 cd ImageMagick-6.9.1-4
 export CPPFLAGS="-Ic:/Progra~1/GnuWin32/include"
 export LDFLAGS="-Lc:/Progra~1/GnuWin32/lib"
 ./configure --without-perl
 make
 sudo make install

 
Dealing with Unexpected Problems

 
 
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

diff --git a/www/advanced-windows-installation.html b/www/advanced-windows-installation.html
index 297ee96d4..9f8623991 100644
--- a/www/advanced-windows-installation.html
+++ b/www/advanced-windows-installation.html
@@ -330,7 +330,7 @@ nmake release
 
 	
    
 	
  1. Double-click on
-	VisualMagick/bin/ImageMagick-6.9.1-3-Q16-windows-dll.exe
+	VisualMagick/bin/ImageMagick-6.9.1-4-Q16-windows-dll.exe
 	to launch the ImageMagick binary distribution.
    2. 
 	
  2. Complete the installer screens to install ImageMagick on your system.
    3. 
 	

diff --git a/www/api.html b/www/api.html
index 8a78ea0cd..862fac71a 100644
--- a/www/api.html
+++ b/www/api.html
@@ -57,7 +57,7 @@
 

 

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

+
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

@@ -139,7 +139,7 @@
 
   
Ruby

 
-
RMagick is an interface between the Ruby programming language and the MagickCore image processing libraries.  Get started with RMagick by perusing the documentation.

+
RMagick is an interface between the Ruby programming language and the MagickCore image processing libraries.  Get started with RMagick by perusing the documentation.

 
 
MagickWand for Ruby is an interface between the Ruby programming language and the MagickWand image processing libraries.  Get started with MagickWand for PHP by perusing the documentation.

 
diff --git a/www/architecture.html b/www/architecture.html
index e14e9b492..49bbcec40 100644
--- a/www/architecture.html
+++ b/www/architecture.html
@@ -134,7 +134,7 @@ if (image == (Image *) NULL)
 
 
When the pixel cache is initialized, pixels are scaled from whatever bit depth they originated from to that required by the pixel cache.  For example, a 1-channel 1-bit monochrome PBM image is scaled to a 4 channel 8-bit RGBA image, if you are using the Q8 version of ImageMagick, and 16-bit RGBA for the Q16 version.  You can determine which version you have with the ‑version option: 

 
-
 identify -versionVersion: ImageMagick 6.9.1-3 2015-03-21 Q16 http://www.imagemagick.org

+
 identify -versionVersion: ImageMagick 6.9.1-4 2015-03-21 Q16 http://www.imagemagick.org

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

 
 
Access the Pixel Cache

@@ -678,7 +678,7 @@ Performance[12]: 10i 4.525ips 0.799e 18.320u 0:02.210
 
 
 identify -version
-Features: OpenMP OpenCL
+Features: DPC Cipher Modules OpenCL OpenMP
 

 
 
If so, run this command to realize a significant speed-up for image convolution:

diff --git a/www/binary-releases.html b/www/binary-releases.html
index 18431251d..2cb1abdd3 100644
--- a/www/binary-releases.html
+++ b/www/binary-releases.html
@@ -75,16 +75,16 @@
   
 
   
-      ImageMagick-6.9.1-3.i386.rpm
-    download
-    download
+      ImageMagick-6.9.1-4.i386.rpm
+    download
+    download
     Redhat / CentOS 5.11 i386 RPM
   
 
   
-      ImageMagick-6.9.1-3.x86_64.rpm
-      download
-    download
+      ImageMagick-6.9.1-4.x86_64.rpm
+      download
+    download
     Redhat / CentOS 5.11 x86_64 RPM
   
 
@@ -121,7 +121,7 @@
 
 
ImageMagick RPM's are self-installing.  Simply type the following command and you're ready to start using ImageMagick:

 
-
 rpm -Uvh ImageMagick-6.9.1-3.i386.rpm

+
 rpm -Uvh ImageMagick-6.9.1-4.i386.rpm

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

 
 
@@ -256,7 +256,7 @@ display logo.gif
 
 ./imagemagick_compile.sh VERSION
 

-
where VERSION is the version of ImageMagick you want to compile (i.e.: 6.9.1-3, svn, ...)

+
where VERSION is the version of ImageMagick you want to compile (i.e.: 6.9.1-4, svn, ...)

 
 
This script compiles ImageMagick as a static library to be included in iOS projects and adds support for

 
    
@@ -305,9 +305,9 @@ display logo.gif
   
 
   
-        ImageMagick-6.9.1-3-Q16-x64-dll.exe
-        download
-      download
+        ImageMagick-6.9.1-4-Q16-x64-dll.exe
+        download
+      download
     Win64 dynamic at 16 bits-per-pixel
   
 

@@ -325,44 +325,44 @@ display logo.gif
   
 
   
-        ImageMagick-6.9.1-3-Q16-x64-static.exe
-        download
-      download
+        ImageMagick-6.9.1-4-Q16-x64-static.exe
+        download
+      download
    Win64 static at 16 bits-per-pixel
   
 
   
-        ImageMagick-6.9.1-3-Q8-x64-dll.exe
-        download
-      download
+        ImageMagick-6.9.1-4-Q8-x64-dll.exe
+        download
+      download
    Win64 dynamic at 8 bits-per-pixel
   
 
   
-        ImageMagick-6.9.1-3-Q8-x64-static.exe
-        download
-      download
+        ImageMagick-6.9.1-4-Q8-x64-static.exe
+        download
+      download
     Win64 static at 8 bits-per-pixel
   
 
   
-        ImageMagick-6.9.1-3-Q16-x86-dll.exe
-        download
-      download
+        ImageMagick-6.9.1-4-Q16-x86-dll.exe
+        download
+      download
     Win32 dynamic at 16 bits-per-pixel
   
 
   
-        ImageMagick-6.9.1-3-Q16-x86-static.exe
-        download
-      download
+        ImageMagick-6.9.1-4-Q16-x86-static.exe
+        download
+      download
     Win32 static at 16 bits-per-pixel
   
 
   
-        ImageMagick-6.9.1-3-Q16-x86-windows.zip
-        download
-      download
+        ImageMagick-6.9.1-4-Q16-x86-windows.zip
+        download
+      download
     Portable Win32 static at 16 bits-per-pixel.  Just copy to your host and run (no installer, no Windows registry entries).
   
 

diff --git a/www/changelog.html b/www/changelog.html
index cc20db6ec..f84d655a2 100644
--- a/www/changelog.html
+++ b/www/changelog.html
@@ -55,8 +55,14 @@
   
 
 

-
2015-05-24  6.9.1-3 Cristy  <quetzlzacatenango@image...>

-  
  •  New version 6.9.1-3, SVN revision 18623.
    • 
+
    2015-06-01  6.9.1-4 Cristy  <quetzlzacatenango@image...>
    
+  
  •  New version 6.9.1-4, SVN revision 18697.
    • 
+
    2015-06-01  6.9.1-4 Cristy  <quetzlzacatenango@image...>
    
+  
  •  Support 'restrict' keyword under Windows.
    • 
+
    2015-05-25  6.9.1-4 Dirk Lemstra <dirk@lem.....org>
    
+  
  •  Added support for reading a user supplied layer mask in PSD files.
    • 
+
    2015-05-24  6.9.1-3 Cristy  <quetzlzacatenango@image...>
    
+  
  •  New version 6.9.1-3, SVN revision 18623.
    • 
 
    2015-05-03  6.9.1-3 Dirk Lemstra <dirk@lem.....org>
    
   
  •  Fixed transparency issue with 16-bit tga files (reference    http://www.imagemagick.org/discourse-server/viewtopic.html?f=3&t=27469).
    • 
   
  •  Fixed writing label and comment in tiff images (reference    http://www.imagemagick.org/discourse-server/viewtopic.html?f=3&t=25516).
    • 
diff --git a/www/color.html b/www/color.html
index 9ba43daaa..7136cd001 100644
--- a/www/color.html
+++ b/www/color.html
@@ -174,7 +174,7 @@ hsla(120, 255,  127.5,  1.0)       the same, with an alpha value of 1.0
 
     cielab(62.253188, 23.950124, 48.410653)
 
    
-
    Note, the a and b components of any Lab color you specify are biased by 50% to ensure it fits in the quantum range (typically 0 to 65535).
    
+
    Note, the a and b components of any Lab color you specify are biased by 50% to ensure it fits in the quantum range (typically 0 to 65535).  The bias is retained when writing to the TIFF and MIFF image formats.  However, the TXT format supports negative pixel values so the bias is removed when writing to this format (e.g. convert xc:cyan -colorspace LAB txt:).
    
 
 
    Or specify colors generically with the icc-color keyword, for example:
    
 
    diff --git a/www/command-line-options.html b/www/command-line-options.html
index 069a15b2a..26262ccd1 100644
--- a/www/command-line-options.html
+++ b/www/command-line-options.html
@@ -3241,10 +3241,10 @@ calculations, to the full range by multiplying by QuantumRange.)
    
     Exponential              base-e exponential function
     LeftShift        Shift the pixel values left by value bits (i.e., multiply pixels by 2value).
     Log              Apply scaled logarithm to normalized pixels.
-    Max              Clip pixels at upper bound value.
+    Max              Set pixels to maximum of value and current pixel value (i.e. set any pixels currently less than value to value).
     Mean              Add the value and divide by 2.
     Median            Choose the median value from an image sequence.
-    Min              Clip pixels at lower bound value.
+    Min              Set pixels to minimum of value and current pixel value (i.e. set any pixels currently greater than value to value).
     Multiply         Multiply pixels by value.
     Or               Binary OR of pixels with value.
     Pow              Raise normalized pixels to the power value.
@@ -6072,10 +6072,6 @@ chroma channels are not downsampled.
 Use the -sampling-factor option to specify the
 factors for chroma downsampling.
    
 
-
    For the MIFF image format, quality/10 is the zlib compression level, which
-is 0 (worst but fastest compression) to 9 (best but slowest). It has no effect
-on the image appearance, since the compression is always lossless.
    
-
 
    For the JPEG-2000 image format, quality is mapped using a non-linear
 equation to the compression ratio required by the Jasper library. This
 non-linear equation is intended to loosely approximate the quality provided by
@@ -6135,6 +6131,8 @@ over values from the -quality option.
    
 
    For further information, see
 the PNG specification.
    
 
+
    For the MIFF and TIFF image formats, quality/10 is the Zip/BZip compression level, which is 0 (worst but fastest compression) to 9 (best but slowest). It has no effect on the image appearance, since the compression is always lossless.
    
+
 
    
   
    -quantize colorspace
    
 
    
diff --git a/www/contact.html b/www/contact.html
index 673b59c80..34bc5fa58 100644
--- a/www/contact.html
+++ b/www/contact.html
@@ -61,7 +61,7 @@
   
    
   
    Contact the Wizards
    
 	
    Enter this code, 
-63294a, in the Authenticate field and fill in the remaining fields.  Press Send to forward your message to the ImageMagick wizards:
    
+040d70, in the Authenticate field and fill in the remaining fields.  Press Send to forward your message to the ImageMagick wizards:
    
   
    
   
    
   
    
diff --git a/www/download.html b/www/download.html
index cf4405cf1..697fe764f 100644
--- a/www/download.html
+++ b/www/download.html
@@ -56,8 +56,8 @@
 
    
 
    
 
    
-
    ImageMagick source and binary distributions are available from a variety of FTP and Web mirrors around the world listed below.  ImageMagick stable and development source releases are also available from Subversion.  Before you download, you may want to review recent changes to the ImageMagick distribution.
    
-
    The latest release of ImageMagick is version 6.9.1-3.
    
+
    ImageMagick source and binary distributions are available from a variety of FTP and Web mirrors around the world listed below.  ImageMagick stable and development source releases are also available from Subversion.  Before you download, you may want to review recent changes to the ImageMagick distribution.  The authoritative source code repository is http://subversion.imagemagick.org/subversion/ImageMagick/.
    
+
    The latest release of ImageMagick is version 6.9.1-4.
    
 
    
   
    Australia
    
     
    http://mirrors-au.go-parts.com/mirrors/ImageMagick/
    
diff --git a/www/formats.html b/www/formats.html
index 940481eaa..6dd4c8ad5 100644
--- a/www/formats.html
+++ b/www/formats.html
@@ -376,7 +376,7 @@ the supported image formats.
    
     EXR
     RW
     High dynamic-range (HDR) file format developed by Industrial Light & Magic
-    See High Dynamic-Range Images for details on this image format. Requires the OpenEXR delegate library.
+    See High Dynamic-Range Images for details on this image format. To specify the output color type, use -define exr:color-type={RGB,RGBA,YC,YCA,Y,YA,R,G,B,A}. Use -sampling-factor to specify the sampling rate for YC(A) (e.g. 2x2 or 4:2:0). Requires the OpenEXR delegate library.
   
 
   
diff --git a/www/index.html b/www/index.html
index dbd75bc85..94d5e6261 100644
--- a/www/index.html
+++ b/www/index.html
@@ -62,14 +62,14 @@
 ImageMagick® is a software suite to create, edit, compose, or convert bitmap images.  It can read and write images in a variety of formats (over 200) including PNG, JPEG, JPEG-2000, GIF, TIFF, DPX, EXR, WebP, Postscript, PDF, and SVG.  Use ImageMagick to resize, flip, mirror, rotate, distort, shear and transform images, adjust image colors, apply various special effects, or draw text, lines, polygons, ellipses and Bézier curves.
    
 
 
    The functionality of ImageMagick is typically utilized from the command line or you can use the features from programs written in your favorite language. Choose from these interfaces: G2F (Ada), MagickCore (C), MagickWand (C), ChMagick (Ch), ImageMagickObject (COM+), Magick++ (C++), JMagick (Java), L-Magick (Lisp), Lua, NMagick (Neko/haXe), Magick.NET (.NET), PascalMagick (Pascal),  PerlMagick (Perl), MagickWand for PHP (PHP),  IMagick (PHP), PythonMagick (Python), RMagick (Ruby), or TclMagick (Tcl/TK). With a language interface, use ImageMagick to modify or create images dynamically and automagically.
    
-
    ImageMagick utiilizes multiple computational threads to increase performance and can read, process, or write mega-, giga-, or tera-pixel image sizes.
    
+
    ImageMagick utilizes multiple computational threads to increase performance and can read, process, or write mega-, giga-, or tera-pixel image sizes.
    
 
    ImageMagick is free software delivered as a ready-to-run binary distribution or as source code that you may use, copy, modify, and distribute in both open and proprietary applications. It is distributed under the Apache 2.0 license.
    
 
 
    The ImageMagick development process ensures a stable API and ABI. Before each ImageMagick release, we perform a comprehensive security assessment that includes memory error and thread data race detection to prevent security vulnerabilities.
    
 
-
    The current release is ImageMagick 6.9.1-3 available from http://www.imagemagick.org/download.  It runs on Linux, Windows, Mac Os X, iOS, Android OS, and others.
    
+
    The current release is ImageMagick 6.9.1-4 available from http://www.imagemagick.org/download.  It runs on Linux, Windows, Mac Os X, iOS, Android OS, and others.
    
 
-
    The authoritative ImageMagick web site is http://www.imagemagick.org.
    
+
    The authoritative ImageMagick web site is http://www.imagemagick.org. The authoritative source code repository is https://subversion.imagemagick.org/subversion/ImageMagick/.
    
 
 
    Features and Capabilities
    
 
    Here are just a few examples of what ImageMagick can do for you:
    
diff --git a/www/magick++.html b/www/magick++.html
index 6618a9233..7b1780d43 100644
--- a/www/magick++.html
+++ b/www/magick++.html
@@ -158,7 +158,7 @@
 
    
 
    
 
    
-  Search
+  Search
 
    
 
    
 
    
@@ -293,7 +293,7 @@ of installing ImageMagick in a known location.
 
    
 
    
   ©  1999-2015 ImageMagick Studio LLC
-   Contact the Wizards
+   Contact the Wizards
 
    
 
    
 
diff --git a/www/magick.html b/www/magick.html
index e381498bc..b98c6b798 100644
--- a/www/magick.html
+++ b/www/magick.html
@@ -141,7 +141,7 @@
 
    
 
    
 
    
-  Search
+  Search
 
    
 
    
 
    
@@ -1383,7 +1383,7 @@ transparent, extract, background, or shape the alpha channel
   
    
   
    
     ©  1999-2011 ImageMagick Studio LLC
-     Contact the Wizards
+     Contact the Wizards