Apply Debian patches: Use modern idiom for autoconf; Fix a forgotten dir when regenerating html doc; fix HTML problems
diff --git a/Makefile.am b/Makefile.am
index a8cdedb..91f2c90 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -293,18 +293,24 @@
# Format C API documentation
html:
- $(MKDIR_P) -p $(top_builddir)/www/api
- cd config && doxygen MagickCore.dox
- cd config && doxygen MagickWand.dox
- cd config && doxygen Magick++.dox
+# copy static file
for dir in $(DOCDIRSMANUAL) ; do \
$(MKDIR_P) $(top_builddir)/$$dir ;\
for file in $$dir/*.* ; do \
if ! test -f $(top_builddir)/$$file; then \
- cp -f $(top_srcdir)/$$file $(top_builddir)/$$dir ; \
+ cp -p -f $(top_srcdir)/$$file $(top_builddir)/$$dir ; \
fi; \
done ; \
done;
+# remove old doxygen files
+ for dir in $(DOCDIRDOXYGEN) ; do \
+ rm -rf $$dir || true; \
+ done;
+# make doxygen doc
+ $(MKDIR_P) $(top_builddir)/www/api
+ cd config && doxygen MagickCore.dox
+ cd config && doxygen MagickWand.dox
+ cd config && doxygen Magick++.dox
#
# Build Windows source Zip and 7Zip balls
diff --git a/Makefile.in b/Makefile.in
index 717a6fb..eb556ca 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -11867,18 +11867,24 @@
# Format C API documentation
html:
- $(MKDIR_P) -p $(top_builddir)/www/api
- cd config && doxygen MagickCore.dox
- cd config && doxygen MagickWand.dox
- cd config && doxygen Magick++.dox
+# copy static file
for dir in $(DOCDIRSMANUAL) ; do \
$(MKDIR_P) $(top_builddir)/$$dir ;\
for file in $$dir/*.* ; do \
if ! test -f $(top_builddir)/$$file; then \
- cp -f $(top_srcdir)/$$file $(top_builddir)/$$dir ; \
+ cp -p -f $(top_srcdir)/$$file $(top_builddir)/$$dir ; \
fi; \
done ; \
done;
+# remove old doxygen files
+ for dir in $(DOCDIRDOXYGEN) ; do \
+ rm -rf $$dir || true; \
+ done;
+# make doxygen doc
+ $(MKDIR_P) $(top_builddir)/www/api
+ cd config && doxygen MagickCore.dox
+ cd config && doxygen MagickWand.dox
+ cd config && doxygen Magick++.dox
$(DIST_WINDOWS_SRC_ZIP) $(DIST_WINDOWS_SRC_7ZIP) windows-dist:
if test -d $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM) ; then \
chmod -R u+w $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM) ; \
diff --git a/PerlMagick/quantum/quantum.pm b/PerlMagick/quantum/quantum.pm
new file mode 100644
index 0000000..73b4111
--- /dev/null
+++ b/PerlMagick/quantum/quantum.pm
@@ -0,0 +1,144 @@
+package Image::Magick::Q16HDRI;
+
+# Copyright 1999-2015 ImageMagick Studio LLC, a non-profit organization
+# dedicated to making software imaging solutions freely available.
+#
+# You may not use this file except in compliance with the License. You may
+# obtain a copy of the License at
+#
+# http://www.imagemagick.org/script/license.php
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Initial version, written by Kyle Shorter.
+
+use strict;
+use Carp;
+use vars qw($VERSION @ISA @EXPORT $AUTOLOAD);
+
+require 5.002;
+require Exporter;
+require DynaLoader;
+require AutoLoader;
+
+@ISA = qw(Exporter DynaLoader);
+# Items to export into callers namespace by default. Note: do not export
+# names by default without a very good reason. Use EXPORT_OK instead.
+# Do not simply export all your public functions/methods/constants.
+@EXPORT =
+ qw(
+ Success Transparent Opaque QuantumDepth QuantumRange MaxRGB
+ WarningException ResourceLimitWarning TypeWarning OptionWarning
+ DelegateWarning MissingDelegateWarning CorruptImageWarning
+ FileOpenWarning BlobWarning StreamWarning CacheWarning CoderWarning
+ ModuleWarning DrawWarning ImageWarning XServerWarning RegistryWarning
+ ConfigureWarning ErrorException ResourceLimitError TypeError
+ OptionError DelegateError MissingDelegateError CorruptImageError
+ FileOpenError BlobError StreamError CacheError CoderError
+ ModuleError DrawError ImageError XServerError RegistryError
+ ConfigureError FatalErrorException
+ );
+
+$VERSION = '7.00';
+
+sub AUTOLOAD {
+ # This AUTOLOAD is used to 'autoload' constants from the constant()
+ # XS function. If a constant is not found then control is passed
+ # to the AUTOLOAD in AutoLoader.
+
+ my $constname;
+ ($constname = $AUTOLOAD) =~ s/.*:://;
+ die "&${AUTOLOAD} not defined. The required ImageMagick libraries are not installed or not installed properly.\n" if $constname eq 'constant';
+ my $val = constant($constname, @_ ? $_[0] : 0);
+ if ($! != 0) {
+ if ($! =~ /Invalid/) {
+ $AutoLoader::AUTOLOAD = $AUTOLOAD;
+ goto &AutoLoader::AUTOLOAD;
+ }
+ else {
+ my($pack,$file,$line) = caller;
+ die "Your vendor has not defined PerlMagick macro $pack\:\:$constname, used at $file line $line.\n";
+ }
+ }
+ eval "sub $AUTOLOAD { $val }";
+ goto &$AUTOLOAD;
+}
+
+bootstrap Image::Magick::Q16HDRI $VERSION;
+
+# Preloaded methods go here.
+
+sub new
+{
+ my $this = shift;
+ my $class = ref($this) || $this || "Image::Magick::Q16HDRI";
+ my $self = [ ];
+ bless $self, $class;
+ $self->set(@_) if @_;
+ return $self;
+}
+
+sub New
+{
+ my $this = shift;
+ my $class = ref($this) || $this || "Image::Magick::Q16HDRI";
+ my $self = [ ];
+ bless $self, $class;
+ $self->set(@_) if @_;
+ return $self;
+}
+
+# Autoload methods go after =cut, and are processed by the autosplit program.
+
+END { UNLOAD () };
+
+1;
+__END__
+
+=head1 NAME
+
+Image::Magick::Q16HDRI - objected-oriented Perl interface to ImageMagick (Q16HDRI). Use it to create, edit, compose, or convert bitmap images from within a Perl script.
+
+=head1 SYNOPSIS
+
+ use Image::Magick::Q16HDRI;
+ $p = new Image::Magick::Q16HDRI;
+ $p->Read("imagefile");
+ $p->Set(attribute => value, ...)
+ ($a, ...) = $p->Get("attribute", ...)
+ $p->routine(parameter => value, ...)
+ $p->Mogrify("Routine", parameter => value, ...)
+ $p->Write("filename");
+
+=head1 DESCRIPTION
+
+This Perl extension allows the reading, manipulation and writing of
+a large number of image file formats using the ImageMagick library.
+It was originally developed to be used by CGI scripts for Web pages.
+
+A web page has been set up for this extension. See:
+
+ file:///usr/local/share/doc/ImageMagick.7/www/perl-magick.html
+ http://www.imagemagick.org/script/perl-magick.php
+
+If you have problems, go to
+
+ http://www.imagemagick.org/discourse-server/viewforum.php?f=7
+
+=head1 AUTHOR
+
+Kyle Shorter magick-users@imagemagick.org
+
+=head1 BUGS
+
+Has all the bugs of ImageMagick and much, much more!
+
+=head1 SEE ALSO
+
+perl(1).
+
+=cut
diff --git a/config/configure.xml b/config/configure.xml
index 1a48bf4..aa63bc1 100644
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -18,7 +18,7 @@
<configure name="DEFS" value="-DHAVE_CONFIG_H"/>
<configure name="DELEGATES" value="bzlib djvu mpeg fftw fpx fontconfig freetype jbig jng jpeg lcms lzma openexr pango png ps tiff webp wmf x xml zlib"/>
<configure name="DISTCHECK_CONFIG_FLAGS" value=" --disable-deprecated --with-quantum-depth=16 --with-jemalloc=no --with-umem=no --with-autotrace=no --with-gslib=no --with-fontpath= --with-rsvg=no --with-perl=no "/>
- <configure name="DOCUMENTATION_PATH" value="/usr/local/share/doc/ImageMagick-7"/>
+ <configure name="DOCUMENTATION_PATH" value="/usr/local/share/doc/ImageMagick.7"/>
<configure name="EXEC-PREFIX" value="/usr/local"/>
<configure name="EXECUTABLE_PATH" value="/usr/local/bin"/>
<configure name="FEATURES" value="DPC HDRI Cipher OpenMP"/>
@@ -34,10 +34,10 @@
<configure name="PCFLAGS" value="-fopenmp -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16"/>
<configure name="PREFIX" value="/usr/local"/>
<configure name="QuantumDepth" value="16"/>
- <configure name="RELEASE_DATE" value="2015-09-11"/>
+ <configure name="RELEASE_DATE" value="2015-09-16"/>
<configure name="SHAREARCH_PATH" value="/usr/local/lib/ImageMagick-7.0.0/config-Q16HDRI"/>
<configure name="SHARE_PATH" value="/usr/local/share/ImageMagick-7"/>
- <configure name="GIT_REVISION" value="Unversioned" />
+ <configure name="GIT_REVISION" value="16930:a3b2030:20150916" />
<configure name="TARGET_CPU" value="x86_64"/>
<configure name="TARGET_OS" value="linux-gnu"/>
<configure name="TARGET_VENDOR" value="unknown"/>
diff --git a/configure b/configure
index 2504769..09e197f 100755
--- a/configure
+++ b/configure
@@ -589,7 +589,7 @@
# Identity of this package.
PACKAGE_NAME='ImageMagick'
-PACKAGE_TARNAME='ImageMagick'
+PACKAGE_TARNAME='ImageMagick.7'
PACKAGE_VERSION='7.0.0-0'
PACKAGE_STRING='ImageMagick 7.0.0-0'
PACKAGE_BUGREPORT='http://www.imagemagick.org'
@@ -1857,7 +1857,7 @@
--infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
- --docdir=DIR documentation root [DATAROOTDIR/doc/ImageMagick]
+ --docdir=DIR documentation root [DATAROOTDIR/doc/ImageMagick.7]
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
@@ -4180,7 +4180,7 @@
# Define the identity of the package.
- PACKAGE='ImageMagick'
+ PACKAGE='ImageMagick.7'
VERSION='7.0.0-0'
@@ -4379,7 +4379,7 @@
MAGICK_VERSION=7.0.0-0
-MAGICK_GIT_REVISION=Unversioned
+MAGICK_GIT_REVISION=16930:a3b2030:20150916
# Substitute library versioning
@@ -4555,7 +4555,7 @@
eval "eval DATA_DIR=$datadir"
-eval "eval DOC_DIR=$datadir/doc"
+eval "eval DOC_DIR=$docdir"
eval "eval SYSCONF_DIR=$sysconfdir"
@@ -32158,9 +32158,8 @@
#
# 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`
diff --git a/configure.ac b/configure.ac
index 53cd7d3..2db7ba0 100755
--- a/configure.ac
+++ b/configure.ac
@@ -30,12 +30,13 @@
m4_define([magick_patchlevel_version], [0])
m4_define([magick_version],
[magick_major_version.magick_minor_version.magick_micro_version-magick_patchlevel_version])
-m4_define([magick_git_revision], esyscmd([sh -c "(svnversion .) | awk '{ print \$1 }' | tr -d '\n'"]))
+m4_define([magick_git_revision], esyscmd([sh -c "(gitversion .) | awk '{ print \$1 }' | tr -d '\n'"]))
+m4_define([magick_tar_name],[ImageMagick.magick_major_version])
# ==============================================================================
# Initalize Automake
# ==============================================================================
-AC_INIT([ImageMagick],[magick_version],[http://www.imagemagick.org],[ImageMagick])
+AC_INIT([ImageMagick],[magick_version],[http://www.imagemagick.org],[magick_tar_name])
AC_CONFIG_SRCDIR([MagickCore/MagickCore.h])
AC_CONFIG_AUX_DIR([config])
AC_REQUIRE_AUX_FILE([tap-driver.sh])
@@ -215,7 +216,7 @@
AC_SUBST(LIBEXEC_DIR)
eval "eval DATA_DIR=$datadir"
AC_SUBST(DATA_DIR)
-eval "eval DOC_DIR=$datadir/doc"
+eval "eval DOC_DIR=$docdir"
AC_SUBST(DOC_DIR)
eval "eval SYSCONF_DIR=$sysconfdir"
AC_SUBST(SYSCONF_DIR)
@@ -2857,9 +2858,8 @@
#
# 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`
diff --git a/images/examples.jpg b/images/examples.jpg
index 9039640..239531e 100644
--- a/images/examples.jpg
+++ b/images/examples.jpg
Binary files differ
diff --git a/utilities/ImageMagick.1 b/utilities/ImageMagick.1
index 5f8cc60..d457b24 100644
--- a/utilities/ImageMagick.1
+++ b/utilities/ImageMagick.1
@@ -86,9 +86,9 @@
interprets and executes scripts written in the Magick Scripting Language (MSL).
.PP
-For more information about the ImageMagick, point your browser to file:///usr/local/share/doc/ImageMagick-7/index.html or http://www.imagemagick.org/.
+For more information about the ImageMagick, point your browser to file:///usr/local/share/doc/ImageMagick.7/index.html or http://www.imagemagick.org/.
.SH SEE ALSO
convert(1), identify(1), composite(1), montage(1), compare(1), display(1), animate(1), import(1), conjure(1), quantize(5), miff(4)
.SH COPYRIGHT
-\fBCopyright (C) 1999-2015 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2015 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick.7/www/license.html or http://www.imagemagick.org/script/license.php\fP
diff --git a/utilities/animate.1 b/utilities/animate.1
index f8549ff..cfa5de5 100644
--- a/utilities/animate.1
+++ b/utilities/animate.1
@@ -7,7 +7,7 @@
.SH OVERVIEW
The \fBanimate\fP program is a member of the ImageMagick(1) suite of tools. Use it to animate an image or image sequence on any X server.
-For more information about the animate command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/animate.html or http://www.imagemagick.org/script/animate.php.
+For more information about the animate command, point your browser to file:///usr/local/share/doc/ImageMagick.7/www/animate.html or http://www.imagemagick.org/script/animate.php.
.SH DESCRIPTION
Image Settings:
\-alpha option on, activate, off, deactivate, set, opaque, copy
@@ -98,4 +98,4 @@
.SH COPYRIGHT
-\fBCopyright (C) 1999-2015 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2015 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick.7/www/license.html or http://www.imagemagick.org/script/license.php\fP
diff --git a/utilities/compare.1 b/utilities/compare.1
index c168d69..29185c3 100644
--- a/utilities/compare.1
+++ b/utilities/compare.1
@@ -7,7 +7,7 @@
.SH OVERVIEW
The \fBcompare\fP program is a member of the ImageMagick(1) suite of tools. Use it to mathematically and visually annotate the difference between an image and its reconstruction.
-For more information about the compare command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/compare.html or http://www.imagemagick.org/script/compare.php.
+For more information about the compare command, point your browser to file:///usr/local/share/doc/ImageMagick.7/www/compare.html or http://www.imagemagick.org/script/compare.php.
.SH DESCRIPTION
Image Settings:
\-alpha option on, activate, off, deactivate, set, opaque, copy
@@ -76,4 +76,4 @@
.SH COPYRIGHT
-\fBCopyright (C) 1999-2015 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2015 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick.7/www/license.html or http://www.imagemagick.org/script/license.php\fP
diff --git a/utilities/composite.1 b/utilities/composite.1
index db0d46b..1b9974c 100644
--- a/utilities/composite.1
+++ b/utilities/composite.1
@@ -7,7 +7,7 @@
.SH OVERVIEW
The \fBcomposite\fP program is a member of the ImageMagick(1) suite of tools. Use it to overlap one image over another.
-For more information about the composite command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/composite.html or http://www.imagemagick.org/script/composite.php.
+For more information about the composite command, point your browser to file:///usr/local/share/doc/ImageMagick.7/www/composite.html or http://www.imagemagick.org/script/composite.php.
.SH DESCRIPTION
Image Settings:
\-affine matrix affine transform matrix
@@ -113,4 +113,4 @@
.SH COPYRIGHT
-\fBCopyright (C) 1999-2015 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2015 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick.7/www/license.html or http://www.imagemagick.org/script/license.php\fP
diff --git a/utilities/conjure.1 b/utilities/conjure.1
index 3a7d2f7..49ab444 100644
--- a/utilities/conjure.1
+++ b/utilities/conjure.1
@@ -7,7 +7,7 @@
.SH OVERVIEW
The \fBconjure\fP program is a member of the ImageMagick(1) suite of tools. Use it to process a Magick Scripting Language (MSL) script. The Magick scripting language (MSL) will primarily benefit those that want to accomplish custom image processing tasks but do not wish to program, or those that do not have access to a Perl interpreter or a compiler.
-For more information about the conjure command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/conjure.html or http://www.imagemagick.org/script/conjure.php.
+For more information about the conjure command, point your browser to file:///usr/local/share/doc/ImageMagick.7/www/conjure.html or http://www.imagemagick.org/script/conjure.php.
.SH DESCRIPTION
Image Settings:
\-monitor monitor progress
@@ -31,4 +31,4 @@
.SH COPYRIGHT
-\fBCopyright (C) 1999-2015 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2015 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick.7/www/license.html or http://www.imagemagick.org/script/license.php\fP
diff --git a/utilities/convert.1 b/utilities/convert.1
index 767599f..2ddffa3 100644
--- a/utilities/convert.1
+++ b/utilities/convert.1
@@ -7,7 +7,7 @@
.SH OVERVIEW
The \fBconvert\fP program is a member of the ImageMagick(1) suite of tools. Use it to convert between image formats as well as resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more.
-For more information about the convert command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/convert.html or http://www.imagemagick.org/script/convert.php.
+For more information about the convert command, point your browser to file:///usr/local/share/doc/ImageMagick.7/www/convert.html or http://www.imagemagick.org/script/convert.php.
.SH DESCRIPTION
Image Settings:
\-adjoin join images into a single multi-image file
@@ -321,4 +321,4 @@
ImageMagick(1)
.SH COPYRIGHT
-\fBCopyright (C) 1999-2015 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2015 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick.7/www/license.html or http://www.imagemagick.org/script/license.php\fP
diff --git a/utilities/display.1 b/utilities/display.1
index 11fca53..27b70df 100644
--- a/utilities/display.1
+++ b/utilities/display.1
@@ -7,7 +7,7 @@
.SH OVERVIEW
The \fBdisplay\fP program is a member of the ImageMagick(1) suite of tools. Use it to display an image or image sequence on any X server.
-For more information about the display command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/display.html or http://www.imagemagick.org/script/display.php.
+For more information about the display command, point your browser to file:///usr/local/share/doc/ImageMagick.7/www/display.html or http://www.imagemagick.org/script/display.php.
.SH DESCRIPTION
Image Settings:
\-alpha option on, activate, off, deactivate, set, opaque, copy
@@ -136,4 +136,4 @@
.SH COPYRIGHT
-\fBCopyright (C) 1999-2015 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2015 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick.7/www/license.html or http://www.imagemagick.org/script/license.php\fP
diff --git a/utilities/identify.1 b/utilities/identify.1
index 5a2e83d..b9231e5 100644
--- a/utilities/identify.1
+++ b/utilities/identify.1
@@ -7,7 +7,7 @@
.SH OVERVIEW
The \fBidentify\fP program is a member of the ImageMagick(1) suite of tools. It describes the format and characteristics of one or more image files. It also reports if an image is incomplete or corrupt. The information returned includes the image number, the file name, the width and height of the image, whether the image is colormapped or not, the number of colors in the image (by default off use \fI-define unique=true\fP option), the number of bytes in the image, the format of the image (JPEG, PNM, etc.), and finally the number of seconds it took to read and process the image. Many more attributes are available with the verbose option.
-For more information about the identify command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/identify.html or http://www.imagemagick.org/script/identify.php.
+For more information about the identify command, point your browser to file:///usr/local/share/doc/ImageMagick.7/www/identify.html or http://www.imagemagick.org/script/identify.php.
.SH DESCRIPTION
Image Settings:
\-alpha option on, activate, off, deactivate, set, opaque, copy
@@ -76,4 +76,4 @@
.SH COPYRIGHT
-\fBCopyright (C) 1999-2015 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2015 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick.7/www/license.html or http://www.imagemagick.org/script/license.php\fP
diff --git a/utilities/import.1 b/utilities/import.1
index e7394f1..2b68576 100644
--- a/utilities/import.1
+++ b/utilities/import.1
@@ -7,7 +7,7 @@
.SH OVERVIEW
The \fBimport\fP program is a member of the ImageMagick(1) suite of tools. Use it to capture some or all of an X server screen and save the image to a file.
-For more information about the import command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/import.html or http://www.imagemagick.org/script/import.php.
+For more information about the import command, point your browser to file:///usr/local/share/doc/ImageMagick.7/www/import.html or http://www.imagemagick.org/script/import.php.
.SH DESCRIPTION
Image Settings:
\-adjoin join images into a single multi-image file
@@ -96,4 +96,4 @@
.SH COPYRIGHT
-\fBCopyright (C) 1999-2015 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2015 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick.7/www/license.html or http://www.imagemagick.org/script/license.php\fP
diff --git a/utilities/mogrify.1 b/utilities/mogrify.1
index 0d165f1..d1cd940 100644
--- a/utilities/mogrify.1
+++ b/utilities/mogrify.1
@@ -7,7 +7,7 @@
.SH OVERVIEW
The \fBmogrify\fP program is a member of the ImageMagick(1) suite of tools. Use it to resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more. This tool is similar to convert(1) except the original image file is overwritten with any changes you request.
-For more information about the mogrify command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/mogrify.html or http://www.imagemagick.org/script/mogrify.php.
+For more information about the mogrify command, point your browser to file:///usr/local/share/doc/ImageMagick.7/www/mogrify.html or http://www.imagemagick.org/script/mogrify.php.
.SH DESCRIPTION
Image Settings:
\-adjoin join images into a single multi-image file
@@ -319,4 +319,4 @@
.SH COPYRIGHT
-\fBCopyright (C) 1999-2015 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2015 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick.7/www/license.html or http://www.imagemagick.org/script/license.php\fP
diff --git a/utilities/montage.1 b/utilities/montage.1
index ea20992..7227c3a 100644
--- a/utilities/montage.1
+++ b/utilities/montage.1
@@ -7,7 +7,7 @@
.SH OVERVIEW
The \fBmontage\fP program is a member of the ImageMagick(1) suite of tools. Use it to create a composite image by combining several separate images. The images are tiled on the composite image optionally adorned with a border, frame, image name, and more.
-For more information about the montage command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/montage.html or http://www.imagemagick.org/script/montage.php.
+For more information about the montage command, point your browser to file:///usr/local/share/doc/ImageMagick.7/www/montage.html or http://www.imagemagick.org/script/montage.php.
.SH DESCRIPTION
Image Settings:
\-adjoin join images into a single multi-image file
@@ -142,4 +142,4 @@
.SH COPYRIGHT
-\fBCopyright (C) 1999-2015 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2015 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick.7/www/license.html or http://www.imagemagick.org/script/license.php\fP
diff --git a/utilities/stream.1 b/utilities/stream.1
index bc33963..471f9b8 100644
--- a/utilities/stream.1
+++ b/utilities/stream.1
@@ -7,7 +7,7 @@
.SH OVERVIEW
\fBStream\fP is a lightweight tool to stream one or more pixel components of the image or portion of the image to your choice of storage formats. It writes the pixel components as they are read from the input image a row at a time making \fBstream\fP desirable when working with large images or when you require raw pixel components.
-For more information about the stream command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/stream.html or http://www.imagemagick.org/script/stream.php.
+For more information about the stream command, point your browser to file:///usr/local/share/doc/ImageMagick.7/www/stream.html or http://www.imagemagick.org/script/stream.php.
.SH DESCRIPTION
Image Settings:
\-authenticate value decrypt image with this password
@@ -56,4 +56,4 @@
.SH COPYRIGHT
-\fBCopyright (C) 1999-2015 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2015 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick.7/www/license.html or http://www.imagemagick.org/script/license.php\fP
diff --git a/www/ImageMagickObject.html b/www/ImageMagickObject.html
index 69b78b9..354cd96 100644
--- a/www/ImageMagickObject.html
+++ b/www/ImageMagickObject.html
@@ -72,7 +72,7 @@
<h2 class="magick-header"><a id="build"></a>Build ImageMagickObject From Source</h2>
-<p>The source code for ImageMagickObject is available from the ImageMagick <a href="subversion.html">subversion</a> repository, or as part of the <a href="install-source.html#windows">Windows source</a> distribution. Once the source code has been retrieved and extracted, the source for ImageMagickObject is the directory <code>ImageMagick\contrib\win32\ATL7ImageMagickObject</code>, however, ImageMagick itself must be built using the static-multithread (VisualStaticMT) build configuration. Building ImageMagickObject requires Microsoft Visual C++ 7.0 as delivered with Microsoft's Visual Studio .NET package. See the <a href="install-source.html#windows">Windows compilation instructions</a> to get ImageMagick itself built before building the ImageMagick COM+ component.</p>
+<p>The source code for ImageMagickObject is available from the ImageMagick <a href="http://git.imagemagick.org/repos/ImageMagick">GIT</a> repository, or as part of the <a href="install-source.html#windows">Windows source</a> distribution. Once the source code has been retrieved and extracted, the source for ImageMagickObject is the directory <code>ImageMagick\contrib\win32\ATL7ImageMagickObject</code>, however, ImageMagick itself must be built using the static-multithread (VisualStaticMT) build configuration. Building ImageMagickObject requires Microsoft Visual C++ 7.0 as delivered with Microsoft's Visual Studio .NET package. See the <a href="install-source.html#windows">Windows compilation instructions</a> to get ImageMagick itself built before building the ImageMagick COM+ component.</p>
<p>Once the VisualStaticMT project has been built, build the ImageMagickObject with this procedure:</p>
diff --git a/www/Magick++/Enumerations.html b/www/Magick++/Enumerations.html
index 1569254..87a0fc0 100644
--- a/www/Magick++/Enumerations.html
+++ b/www/Magick++/Enumerations.html
@@ -240,7 +240,7 @@
that quantization (color reduction and mapping) is done under or to
specify the colorspace when encoding an output image. Colorspaces are
ways of describing colors to fit the requirements of a particular
-application (e.g. Television, offset printing, color monitors).
+application (e.g. Television, offset printing, color monitors).
Color reduction, by default, takes place in the <i>RGBColorspace</i>.
Empirical evidence suggests that distances in color spaces such as
<i>YUVColorspace</i> or <i>YIQColorspace</i> correspond to perceptual
@@ -287,7 +287,7 @@
<p>GRAYColorspace</p>
</td>
<td>
- <p> Grayscale colorspace</p>
+ <p> Grayscale colorspace</p>
</td>
</tr>
<tr>
@@ -295,7 +295,7 @@
<p>HCLColorspace</p>
</td>
<td>
- <p> </p>
+ <p> </p>
</td>
</tr>
<tr>
@@ -303,7 +303,7 @@
<p>LabColorspace</p>
</td>
<td>
- <p> </p>
+ <p> </p>
</td>
</tr>
<tr>
@@ -311,7 +311,7 @@
<p>LCHabColorspace</p>
</td>
<td>
- <p> </p>
+ <p> </p>
</td>
</tr>
<tr>
@@ -319,7 +319,7 @@
<p>LuvColorspace</p>
</td>
<td>
- <p> </p>
+ <p> </p>
</td>
</tr>
<tr>
@@ -327,7 +327,7 @@
<p>OHTAColorspace</p>
</td>
<td>
- <p> </p>
+ <p> </p>
</td>
</tr>
<tr>
@@ -343,7 +343,7 @@
<p>sRGBColorspace</p>
</td>
<td>
- <p> </p>
+ <p> </p>
</td>
</tr>
<tr>
@@ -351,7 +351,7 @@
<p>scRGBColorspace</p>
</td>
<td>
- <p> </p>
+ <p> </p>
</td>
</tr>
<tr>
@@ -368,7 +368,7 @@
<p>XYZColorspace</p>
</td>
<td>
- <p> </p>
+ <p> </p>
</td>
</tr>
<tr>
@@ -376,7 +376,7 @@
<p>YCbCrColorspace</p>
</td>
<td>
- <p> </p>
+ <p> </p>
</td>
</tr>
<tr>
@@ -384,7 +384,7 @@
<p>YCCColorspace</p>
</td>
<td>
- <p> </p>
+ <p> </p>
</td>
</tr>
<tr>
@@ -392,7 +392,7 @@
<p>YIQColorspace</p>
</td>
<td>
- <p> </p>
+ <p> </p>
</td>
</tr>
<tr>
@@ -400,7 +400,7 @@
<p>YPbPrColorspace</p>
</td>
<td>
- <p> </p>
+ <p> </p>
</td>
</tr>
<tr>
@@ -504,7 +504,7 @@
<p>PlusCompositeOp</p>
</td>
<td>
- <p>The result is just the sum of the image data. Output
+ <p>The result is just the sum of the image data. Output
values are cropped to 255 (no overflow). This operation is
independent of the matte channels.</p>
</td>
@@ -552,7 +552,7 @@
<p>MultiplyCompositeOp</p>
</td>
<td>
- <p> </p>
+ <p> </p>
</td>
</tr>
<tr>
@@ -616,7 +616,7 @@
mask which represents a sort of a cookie-cutter for the image.
This is the case when matte is 255 (full coverage) for pixels
inside the shape, zero outside, and between zero and 255 on the
- boundary. For certain operations, if <i>image</i> does not
+ boundary. For certain operations, if <i>image</i> does not
have a matte channel, it is initialized with 0 for any pixel
matching in color to pixel location (0,0), otherwise 255 (to work
properly <i>borderWidth</i> must be 0).</p>
@@ -627,7 +627,7 @@
<p>ClearCompositeOp</p>
</td>
<td>
- <p> </p>
+ <p> </p>
</td>
</tr>
<tr>
@@ -635,7 +635,7 @@
<p>DissolveCompositeOp</p>
</td>
<td>
- <p> </p>
+ <p> </p>
</td>
</tr>
<tr>
@@ -643,7 +643,7 @@
<p>DisplaceCompositeOp</p>
</td>
<td>
- <p> </p>
+ <p> </p>
</td>
</tr>
<tr>
@@ -651,7 +651,7 @@
<p>ModulateCompositeOp</p>
</td>
<td>
- <p> </p>
+ <p> </p>
</td>
</tr>
<tr>
@@ -659,7 +659,7 @@
<p>ThresholdCompositeOp</p>
</td>
<td>
- <p> </p>
+ <p> </p>
</td>
</tr>
</table>
@@ -711,7 +711,7 @@
</td>
<td>
<p>BZip (Burrows-Wheeler block-sorting text compression algorithm
- and Huffman coding) as used by bzip2 utilities</p>
+ and Huffman coding) as used by bzip2 utilities</p>
</td>
</tr>
<tr>
@@ -882,7 +882,7 @@
</table>
<p style="margin-bottom: 0in"><i>FillRule</i> specifies the algorithm
which is to be used to determine what parts of the canvas are
-included inside the shape. See the documentation on SVG's <a href="http://www.w3.org/TR/SVG/painting.html#FillRuleProperty">fill-rule</a>
+included inside the shape. See the documentation on SVG's <a href="http://www.w3.org/TR/SVG/painting.html#FillRuleProperty">fill-rule</a>
property for usage details.
</p>
<p style="text-align:center;margin-bottom: 0in"><b>FillRule</b></p>
@@ -2000,7 +2000,7 @@
</td>
</tr>
</table>
-<p style="margin-bottom: 0in"><br />
+<p style="margin-bottom: 0in"><br />
</p>
<table width="100%" border="0" cellpadding="1" cellspacing="1">
<tr>
diff --git a/www/Magick++/Image.html b/www/Magick++/Image.html
index e1d1d4f..8257f8f 100644
--- a/www/Magick++/Image.html
+++ b/www/Magick++/Image.html
@@ -1260,9 +1260,9 @@
</small></td>
<td style="vertical-align: middle;"><small>Random threshold the
image. Changes the value of individual pixels based on the intensity of
-each pixel compared to a random threshold. The result is a
-low-contrast, two color image. The thresholds_ argument is a
-geometry containing LOWxHIGH thresholds. If the string contains
+each pixel compared to a random threshold. The result is a
+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.<br />
@@ -3064,7 +3064,7 @@
<td><font size="-1">Returns a pointer to the Image pixel indexes
corresponding to the pixel region requested by the last <a
href="Image.html#getConstPixels">getConstPixels</a> , <a href="Image.html#getPixels">getPixels</a>
-, or <a href="Image.html#setPixels">setPixels</a> call. </font><font
+, or <a href="Image.html#setPixels">setPixels</a> call. </font><font
size="-1">The
returned pointer remains valid until the next getPixel, getConstPixels,
or setPixels call and should never be deallocated by the user.</font><font
@@ -3073,7 +3073,7 @@
CMYKA images. The pixel indexes represent an array of type
IndexPacket, with each entry corresponding to a pixel x,y position. For
PseudoClass images, the entry's value is the offset into the colormap
-(see <a href="Image.html#colorMap">colorMap</a> ) for that pixel. For
+(see <a href="Image.html#colorMap">colorMap</a> ) for that pixel. For
CMYKA
images, the indexes are used to contain the alpha channel.</font></td>
</tr>
diff --git a/www/Magick++/Montage.html b/www/Magick++/Montage.html
index cb6ff91..b2a234a 100644
--- a/www/Magick++/Montage.html
+++ b/www/Magick++/Montage.html
@@ -11,12 +11,12 @@
<h1 align="center">Magick::Montage Class</h1>
<p>A montage is a single image which is composed of thumbnail images composed in a uniform grid. The size of the montage image is determined by the size of the individual thumbnails and the number of rows and columns in the grid.</p>
<p>The following illustration shows a montage consisting of three columns and two rows of thumbnails rendered on a gray background:</p>
-<p class="image"><img src="montage-sample-framed.jpg" name="Graphic1" align="bottom" width="378" height="238" border="0"></p>
+<p class="image"><img src="montage-sample-framed.jpg" name="Graphic1" align="bottom" width="378" height="238" border="0" /></p>
<p>Montages may be either "plain" (undecorated thumbnails) or "framed" (decorated thumbnails). In order to more easily understand the options supplied to <a href="STL.html#montageImages"><i>MontageImages()</i></a>, montage options are supplied by two different classes: <a href="Montage.html#Magick::Montage"><i>Magick::Montage</i></a> and <a href="Montage.html#Magick::MontageFramed"><i>Magick::MontageFramed</i></a>.</p>
<h3 align="center"><a name="PlainMontages"></a>Plain Montages</h3>
<p><a name="Magick::Montage"></a><i>Magick::Montage</i> is the base class to provide montage options and provides methods to set all options required to render simple (unframed) montages. See <a href="Montage.html#Magick::MontageFramed"><i>Magick::MontageFramed</i></a>if you would like to create a framed montage.</p>
<p>Unframed thumbnails consist of four components: the thumbnail image, the thumbnail border, an optional thumbnail shadow, and an optional thumbnail label area.</p>
-<p class="image"><img src="thumbnail-anatomy-plain.jpg" name="Graphic2" align="middle" width="309" height="327" border="0"></p>
+<p class="image"><img src="thumbnail-anatomy-plain.jpg" name="Graphic2" align="middle" width="309" height="327" border="0" /></p>
<p style="margin-bottom: 0cm"> </p>
<p align="center" style="margin-bottom: 0cm"><b>Montage Methods</b></p>
<ul><table width="100%" border="1" cellpadding="2" cellspacing="2">
diff --git a/www/api/effect.html b/www/api/effect.html
index 70d1b71..ed36e83 100644
--- a/www/api/effect.html
+++ b/www/api/effect.html
@@ -566,12 +566,13 @@
</dl>
<h2><a href="http://nextgen.imagemagick.org/api/MagickCore/effect_8c.html" id="SpreadImage">SpreadImage</a></h2>
-<p>SpreadImage() is a special effects method that randomly displaces each pixel in a block defined by the radius parameter.</p>
+<p>SpreadImage() is a special effects method that randomly displaces each pixel in a square area defined by the radius parameter.</p>
<p>The format of the SpreadImage method is:</p>
<pre class="text">
-Image *SpreadImage(const Image *image,const double radius,
+Image *SpreadImage(const Image *image,
+ const PixelInterpolateMethod method,const double radius,
ExceptionInfo *exception)
</pre>
@@ -586,6 +587,10 @@
<dd>the image. </dd>
<dd> </dd>
+<dt>method</dt>
+<dd> intepolation method. </dd>
+
+<dd> </dd>
<dt>radius</dt>
<dd> choose a random pixel in a neighborhood of this extent. </dd>
diff --git a/www/api/effect.php b/www/api/effect.php
index 7b92e1d..09f6b8a 100644
--- a/www/api/effect.php
+++ b/www/api/effect.php
@@ -574,12 +574,13 @@
</dl>
<h2><a href="http://nextgen.imagemagick.org/api/MagickCore/effect_8c.html" id="SpreadImage">SpreadImage</a></h2>
-<p>SpreadImage() is a special effects method that randomly displaces each pixel in a block defined by the radius parameter.</p>
+<p>SpreadImage() is a special effects method that randomly displaces each pixel in a square area defined by the radius parameter.</p>
<p>The format of the SpreadImage method is:</p>
<pre class="text">
-Image *SpreadImage(const Image *image,const double radius,
+Image *SpreadImage(const Image *image,
+ const PixelInterpolateMethod method,const double radius,
ExceptionInfo *exception)
</pre>
@@ -594,6 +595,10 @@
<dd>the image. </dd>
<dd> </dd>
+<dt>method</dt>
+<dd> intepolation method. </dd>
+
+<dd> </dd>
<dt>radius</dt>
<dd> choose a random pixel in a neighborhood of this extent. </dd>
diff --git a/www/api/magick-image.html b/www/api/magick-image.html
index 28c01bc..3d7ab56 100644
--- a/www/api/magick-image.html
+++ b/www/api/magick-image.html
@@ -7040,7 +7040,8 @@
<p>The format of the MagickSpreadImage method is:</p>
<pre class="text">
-MagickBooleanType MagickSpreadImage(MagickWand *wand,const double radius)
+MagickBooleanType MagickSpreadImage(MagickWand *wand,
+ const PixelInterpolateMethod method,const double radius)
A description of each parameter follows:
</pre>
@@ -7048,6 +7049,9 @@
<dt>wand</dt>
<p>the magick wand.</p>
+<dt>method</dt>
+<p>intepolation method.</p>
+
<dt>radius</dt>
<p>Choose a random pixel in a neighborhood of this extent.</p>
diff --git a/www/api/magick-image.php b/www/api/magick-image.php
index 807c3f0..7ca04ac 100644
--- a/www/api/magick-image.php
+++ b/www/api/magick-image.php
@@ -7048,7 +7048,8 @@
<p>The format of the MagickSpreadImage method is:</p>
<pre class="text">
-MagickBooleanType MagickSpreadImage(MagickWand *wand,const double radius)
+MagickBooleanType MagickSpreadImage(MagickWand *wand,
+ const PixelInterpolateMethod method,const double radius)
A description of each parameter follows:
</pre>
@@ -7056,6 +7057,9 @@
<dt>wand</dt>
<p>the magick wand.</p>
+<dt>method</dt>
+<p>intepolation method.</p>
+
<dt>radius</dt>
<p>Choose a random pixel in a neighborhood of this extent.</p>
diff --git a/www/binary-releases.html b/www/binary-releases.html
index 429f553..c56ef2e 100644
--- a/www/binary-releases.html
+++ b/www/binary-releases.html
@@ -73,7 +73,7 @@
<td>ImageMagick-7.0.0-0.x86_64.rpm</td>
<td><a href="http://www.imagemagick.org/download/linux/CentOS/x86_64/ImageMagick-7.0.0-0.x86_64.rpm">download</a></td>
<td><a href="ftp://ftp.imagemagick.org/pub/ImageMagick/linux/CentOS/x86_64/ImageMagick-7.0.0-0.x86_64.rpm">download</a></td>
- <td>Redhat / CentOS 5.11 x86_64 RPM</td>
+ <td>Redhat / CentOS 7.1 x86_64 RPM</td>
</tr>
<tr>
diff --git a/www/command-line-options.html b/www/command-line-options.html
index 058fc70..56c05e9 100644
--- a/www/command-line-options.html
+++ b/www/command-line-options.html
@@ -927,7 +927,7 @@
<p>While it can remove internal rows and columns of pixels, it is more
typically used with as <a href="command-line-options.html#gravity">-gravity</a> setting and zero
-offsets so as to remove a single edge from an image. Compare this to <a href="command-line-options.html#shave">-shave</a> which removes equal numbers of pixels from oppisite
+offsets so as to remove a single edge from an image. Compare this to <a href="command-line-options.html#shave">-shave</a> which removes equal numbers of pixels from opposite
sides of the image. </p>
<p>Using <a href="command-line-options.html#chop">-chop</a> effectively undoes the results of a <a href="command-line-options.html#splice">-splice</a> that was given the same <var>geometry</var> and <a href="command-line-options.html#gravity">-gravity</a> settings. </p>
@@ -1348,7 +1348,7 @@
add
conjugate
divide
-magnuitude-phase
+magnitude-phase
multiply
real-imaginary
subtract
@@ -2831,7 +2831,7 @@
<p>Note that a infinitely tiled perspective images involving the horizon can
be very slow, because of the number of pixels that are compressed to generate
each individual pixel close to the 'horizon'. You can turn off EWA
-resampling, by specifing the special <a href="command-line-options.html#filter">-filter</a> setting of
+resampling, by specifying the special <a href="command-line-options.html#filter">-filter</a> setting of
'<code>point</code>' (recommended if you plan to use super-sampling instead).
</p>
@@ -3554,7 +3554,7 @@
about HDRI go the ImageMagick <a href="http://www.imagemagick.org/Usage/basics/#hdri">Usage</a> pages, <a href="http://www.fmwconcepts.com/imagemagick/fourier_transforms/fourier.html">Fred's Fourier Processing With ImageMagick page</a> or this <a href="http://en.wikipedia.org/wiki/High_dynamic_range_imaging">Wikipedia</a>
entry. </p>
-<p>By default the FFT is normalized (and the IFT is not). Use "<code><a href="command-line-options.html#define">-define</a> fourier:normalize=forward</code> to explicityly normalize the FFT and unnormalize the IFT.</p>
+<p>By default the FFT is normalized (and the IFT is not). Use "<code><a href="command-line-options.html#define">-define</a> fourier:normalize=forward</code> to explicitly normalize the FFT and unnormalize the IFT.</p>
<div style="margin: auto;">
@@ -3642,7 +3642,7 @@
<td>-define filter:support=<var>radius</var></td>
<td>Set the filter support radius. Defines how large the filter should be and
thus directly defines how slow the filtered resampling process is. All
- filters have a default 'prefered' support size. Some filters like
+ filters have a default 'preferred' support size. Some filters like
<code>Lagrange</code> and windowed filters adjust themselves depending on
this value. With simple filters this value either does nothing (but slow
the resampling), or will clip the filter function in a detrimental way.
@@ -4433,7 +4433,7 @@
and imaginary images from the frequency domain to a single image in the normal
(spatial) domain.</p>
-<p>By default the IFT is not normalized (and the FFT is). Use "<code><a href="command-line-options.html#define">-define</a> fourier:normalize=inverse</code> to explictly normalize the IFT and unnormalize the FFT.</p>
+<p>By default the IFT is not normalized (and the FFT is). Use "<code><a href="command-line-options.html#define">-define</a> fourier:normalize=inverse</code> to explicitly normalize the IFT and unnormalize the FFT.</p>
<div style="margin: auto;">
<h3 class="magick-header"><a id="immutable"></a>-immutable</h3>
@@ -4469,7 +4469,7 @@
<p class="magick-description">method to generate intensity value from pixel.</p>
<p>ImageMagick provides a number of methods used in situations where an
-operatory needs to determine a single grayscale value for some purpose, from
+operator needs to determine a single grayscale value for some purpose, from
an image with red, green, and blue pixel components. Typically the linear
<code>Rec709Luminance</code> formula is used, which is the same formula used when
converting images to <code>-colorspace gray</code>. </p>
@@ -5659,7 +5659,7 @@
Uniform
</pre>
-<p>The amount of noise added can be controled by the <code><a href="command-line-options.html#attunuuate">-attenuate</a></code> setting. If unset the value is
+<p>The amount of noise added can be controled by the <code><a href="command-line-options.html#attenuate">-attenuate</a></code> setting. If unset the value is
equivalent to 1.0, or a maximum noise addition.</p>
<p>Note that Random will replace the image with noise rather than add noise to the image. Use Uniform, if you wish to add random noise to the image.</p>
@@ -6586,7 +6586,7 @@
Old size = 70x46 New size = 35x23
</pre>
-<p>Other well known 'properties' that are availible include:
+<p>Other well known 'properties' that are available include:
'<code>date:create</code>' and '<code>date:modify</code>' and
'<code>signature</code>'. </p>
diff --git a/www/download.html b/www/download.html
index e7dd0e9..cd633cd 100644
--- a/www/download.html
+++ b/www/download.html
@@ -44,68 +44,39 @@
</div>
<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="subversion.html">Subversion</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://subversion.imagemagick.org/subversion/ImageMagick/">http://subversion.imagemagick.org/subversion/ImageMagick/</a>.</p>
+<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.0-0.</p>
<dl class="dl-horizontal">
- <dt>Australia</dt>
- <dd><a href="http://mirrors-au.go-parts.com/mirrors/ImageMagick/">http://mirrors-au.go-parts.com/mirrors/ImageMagick/</a></dd>
- <dd><a href="ftp://mirrors-au.go-parts.com/mirrors/ImageMagick/">ftp://mirrors-au.go-parts.com/mirrors/ImageMagick/</a></dd>
- <dd><a href="ftp://mirror.aarnet.edu.au/pub/imagemagick/">ftp://mirror.aarnet.edu.au/pub/imagemagick/</a></dd>
- <dt>Austria</dt>
- <dd><a href="ftp://gd.tuwien.ac.at/pub/graphics/ImageMagick/">ftp://gd.tuwien.ac.at/pub/graphics/ImageMagick/</a></dd>
- <dt>Estonia</dt>
- <dd><a href="http://servingzone.com/mirrors/ImageMagick/">http://servingzone.com/mirrors/ImageMagick/</a></dd>
- <dt>France</dt>
- <dd><a href="http://mirrors.linsrv.net/ImageMagick/">http://mirrors.linsrv.net/ImageMagick</a></dd>
- <dd><a href="ftp://mirrors.linsrv.net/pub/ImageMagick/">ftp://mirrors.linsrv.net/pub/ImageMagick</a></dd>
<dt>Germany</dt>
<dd><a href="http://mirror.checkdomain.de/imagemagick/">http://mirror.checkdomain.de/imagemagick/</a></dd>
<dd><a href="ftp://mirror.checkdomain.de/imagemagick/">ftp://mirror.checkdomain.de/imagemagick/</a></dd>
- <dd><a href="http://image_magick.veidrodis.com/image_magick/">http://image_magick.veidrodis.com/image_magick/</a></dd>
- <dt>Israel</dt>
- <dd><a href="http://imagemagick.spd.co.il/">http://imagemagick.spd.co.il/</a></dd>
<dt>Japan</dt>
<dd><a href="ftp://ftp.kddlabs.co.jp/graphics/ImageMagick/">ftp://ftp.kddlabs.co.jp/graphics/ImageMagick/</a></dd>
<dd><a href="ftp://ftp.u-aizu.ac.jp/pub/graphics/images/ImageMagick/imagemagick.org/">ftp://ftp.u-aizu.ac.jp/pub/graphics/images/ImageMagick/imagemagick.org</a></dd>
- <dt>Latvia</dt>
- <dd><a href="http://www.champground.com/imagemagick/">http://www.champground.com/imagemagick/</a></dd>
<dt>Netherlands</dt>
<dd><a href="ftp://ftp.nluug.nl/pub/ImageMagick/">ftp://ftp.nluug.nl/pub/ImageMagick</a></dd>
- <dd><a href="http://ftp.surfnet.nl/pub/ImageMagick/">http://ftp.surfnet.nl/pub/ImageMagick/</a></dd>
- <dt>Norway</dt>
- <dd><a href="ftp://mirror.searchdaimon.com/ImageMagick">ftp://mirror.searchdaimon.com/ImageMagick</a></dd>
- <dd><a href="http://mirror.searchdaimon.com/ImageMagick/">http://mirror.searchdaimon.com/ImageMagick/</a></dd>
+ <dd><a href="http://ftp.nluug.nl/ImageMagick/">http://ftp.nluug.nl/ImageMagick/</a></dd>
<dt>Poland</dt>
<dd><a href="ftp://sunsite.icm.edu.pl/packages/ImageMagick/">ftp://sunsite.icm.edu.pl/packages/ImageMagick/</a></dd>
<dd><a href="ftp://ftp.tpnet.pl/pub/graphics/ImageMagick/">ftp://ftp.tpnet.pl/pub/graphics/ImageMagick/</a></dd>
<dd><a href="rsync://ftp.tpnet.pl/pub/graphics/ImageMagick/">rsync://ftp.tpnet.pl/pub/graphics/ImageMagick/</a></dd>
- <dt>Russia</dt>
- <dd><a href="http://mirrors-ru.go-parts.com/mirrors/ImageMagick/">http://mirrors-ru.go-parts.com/mirrors/ImageMagick/</a></dd>
- <dd><a href="ftp://mirrors-ru.go-parts.com/mirrors/ImageMagick/">ftp://mirrors-ru.go-parts.com/mirrors/ImageMagick/</a></dd>
<dt>Sweden</dt>
<dd><a href="ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/">ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick</a></dd>
<dt>South Africa</dt>
<dd><a href="http://imagemagick.afri.cc/">http://imagemagick.afri.cc/</a></dd>
- <dt>UK</dt>
- <dd><a href="http://mirrors-uk.go-parts.com/mirrors/ImageMagick/">http://mirrors-uk.go-parts.com/mirrors/ImageMagick/</a></dd>
- <dd><a href="ftp://mirrors-usa.go-parts.com/mirrors/ImageMagick/">ftp://mirrors-usa.go-parts.com/mirrors/ImageMagick/</a></dd>
<dt>United States</dt>
- <dd><a href="http://mirrors-usa.go-parts.com/mirrors/ImageMagick/">http://mirrors-usa.go-parts.com/mirrors/ImageMagick/</a></dd>
- <dd><a href="ftp://mirrors-usa.go-parts.com/mirrors/ImageMagick/">ftp://mirrors-usa.go-parts.com/mirrors/ImageMagick/</a></dd>
- <dd><a href="http://mirrors.concertpass.com/imagemagick/">http://mirrors.concertpass.com/imagemagick//</a></dd>
<dd><a href="http://www.imagemagick.org/download/">http://www.imagemagick.org/download</a></dd>
- <dd><a href="http://sourceforge.net/projects/imagemagick/">http://sourceforge.net/projects/imagemagick/</a> (legacy releases)</dd>
+ <dd><a href="http://transloadit.imagemagick.org/download">http://transloadit.imagemagick.org/download</a></dd>
+ <dd><a href="ftp://transloadit.imagemagick.org/ImageMagick">ftp://transloadit.imagemagick.org/pub/ImageMagick (ftp)</a></dd>
<dd><a href="ftp://ftp.fifi.org/pub/ImageMagick/">ftp://ftp.fifi.org/pub/ImageMagick/</a> (ftp)</dd>
- <dt>Platform Specific Binaries </dt>
+ <dt>Select Binaries </dt>
<dd><a href="http://www.macports.org/ports.html?by=name&substr=imagemagick">http://www.macports.org/ports.html?by=name&substr=imagemagick</a> (Mac OS X)</dd>
<dd><a href="http://hpux.connect.org.uk/hppd/hpux/X11/Viewers/">http://hpux.connect.org.uk/hppd/hpux/X11/Viewers/</a> (HP-UX 10.20 and 11.00)</dd>
- <dd><a href="http://www.sunfreeware.com/">http://www.sunfreeware.com/</a> (SPARC/Solaris 2.5-10 and x86/Solaris 8-10)</dd>
<dt>Rsync Mirrors </dt>
<dd><a href="rsync://rsync.is.co.za/IS-Mirror/mirror.imagemagick.org/">rsync://rsync.is.co.za/IS-Mirror/mirror.imagemagick.org/</a></dd>
<dd><a href="rsync://rsync.fifi.org/ImageMagick">rsync://rsync.fifi.org/ImageMagick</a></dd>
<dd><a href="rsync://mirror.imagemagick.org/magick_html">rsync://mirror.imagemagick.org/magick_html/</a> (Web site mirror)</dd>
<dd><a href="rsync://mirror.imagemagick.org/magick_ftp">rsync://mirror.imagemagick.org/magick_ftp/</a> (FTP mirror)</dd>
- <dd><a href="rsync://mirror.imagemagick.org/magick_svn">rsync://mirror.imagemagick.org/magick_svn/</a> (Subversion repository mirror)</dd>
</dl>
<p>If you want to add a new mirror, please <a href="http://nextgen.imagemagick.org/script/contact.php">contact us</a>.</p>
</div>
diff --git a/www/escape.html b/www/escape.html
index 9d5cc8f..7e5aed6 100644
--- a/www/escape.html
+++ b/www/escape.html
@@ -245,7 +245,7 @@
</tr>
<tr>
<td>%A</td>
- <td>image transparency channel enabled (true/false)</td>
+ <td>image transparency channel traits. No alpha channel returns Undefined. The Blend trait blends the alpha channel with the other channels. And Copy copies the alpha channel without blending.</td>
</tr>
<tr>
<td>%C</td>
diff --git a/www/formats.html b/www/formats.html
index 91ed951..be36a2c 100644
--- a/www/formats.html
+++ b/www/formats.html
@@ -1012,7 +1012,7 @@
<td><a href="http://www.libtiff.org/">TIFF</a></td>
<td>RW</td>
<td>Tagged Image File Format</td>
- <td>Also known as <code>TIF</code>. Requires <a href="http://www.libtiff.org/">tiff-v3.6.1.tar.gz</a> or later. Use <a href="command-line-options.html#define">-define</a> to specify the rows per strip (e.g. <code>-define tiff:rows-per-strip=8</code>). To define the tile geometry, use for example, <code>-define tiff:tile-geometry=128x128</code>. To specify a <var>signed</var> format, use <code>-define quantum:format=signed</code>. To specify a single-precision floating-point format, use <code>-define quantum:format=floating-point</code>. Set the depth to 64 for a double-precision floating-point format. Use <code>-define quantum:polarity=min-is-black</code> or <code>-define quantum:polarity=min-is-white</code> toggle the photometric interpretation for a bilevel image. Specify the extra samples as associated or unassociated alpha with, for example, <code>-define tiff:alpha=unassociated</code>. Set the fill order with <code>-define tiff:fill-order=msb|lsb</code>. Set the TIFF endianess with <code>-define tiff:endian=msb|lsb</code>. Use <code>-define tiff:exif-properties=false</code> to skip reading the EXIF properties. You can set a number of TIFF software attributes including document name, host computer, artist, timestamp, make, model, software, and copyright. For example, <a href="command-line-options.html#set">-set tiff:software "My Company"</a>. If you want to ignore certain TIFF tags, use this option: <code>-define tiff:ignore-tags=comma-separated-list-of-tag-IDs</code></td>
+ <td>Also known as <code>TIF</code>. Requires <a href="http://www.libtiff.org/">tiff-v3.6.1.tar.gz</a> or later. Use <a href="command-line-options.html#define">-define</a> to specify the rows per strip (e.g. <code>-define tiff:rows-per-strip=8</code>). To define the tile geometry, use for example, <code>-define tiff:tile-geometry=128x128</code>. To specify a <var>signed</var> format, use <code>-define quantum:format=signed</code>. To specify a single-precision floating-point format, use <code>-define quantum:format=floating-point</code>. Set the depth to 64 for a double-precision floating-point format. Use <code>-define quantum:polarity=min-is-black</code> or <code>-define quantum:polarity=min-is-white</code> toggle the photometric interpretation for a bilevel image. Specify the extra samples as associated or unassociated alpha with, for example, <code>-define tiff:alpha=unassociated</code>. Set the fill order with <code>-define tiff:fill-order=msb|lsb</code>. Set the TIFF endianess with <code>-define tiff:endian=msb|lsb</code>. Use <code>-define tiff:exif-properties=false</code> to skip reading the EXIF properties. You can set a number of TIFF software attributes including document name, host computer, artist, timestamp, make, model, software, and copyright. For example, <a href="command-line-options.html#set">-set tiff:software "My Company"</a>. If you want to ignore certain TIFF tags, use this option: <code>-define tiff:ignore-tags=comma-separated-list-of-tag-IDs</code>. Since version 6.9.1-4 there is support for reading photoshop layers in TIFF files, this can be disabled with <code>-define tiff:ignore-layers=true</code></td>
</tr>
<tr>
@@ -1082,7 +1082,7 @@
<td><a href="http://en.wikipedia.org/wiki/WebP">WEBP</a></td>
<td>RW</td>
<td>Weppy image format</td>
- <td>Requires the <a href="http://code.google.com/p/webp/downloads/list">WEBP</a> delegate library. Specify the encoding options with the <a href="command-line-options.html#define">-define</a> option See <a href="webp.html">WebP Encoding Options</a> for more details.</td>
+ <td>Requires the <a href="https://developers.google.com/speed/webp/download">WEBP</a> delegate library. Specify the encoding options with the <a href="command-line-options.html#define">-define</a> option See <a href="webp.html">WebP Encoding Options</a> for more details.</td>
</tr>
<tr>
diff --git a/www/jp2.html b/www/jp2.html
index 0988d1a..253319d 100644
--- a/www/jp2.html
+++ b/www/jp2.html
@@ -60,6 +60,12 @@
convert wizard.jp2 wizard.png
</pre>
+<p>Let's convert a JPEG image to a lossless JPEG-2000 image:</p>
+
+<pre>
+convert wizard.jpg -quality 0 wizard.jp2
+</pre>
+
<p>Here we extract an area from the image:</p>
<pre>
diff --git a/www/magick++.html b/www/magick++.html
index af0739b..2346dbe 100644
--- a/www/magick++.html
+++ b/www/magick++.html
@@ -158,7 +158,7 @@
</div>
<div class="sep"></div>
<div class="menu">
- <a title="Search" href="http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/script/search.php">Search</a>
+ <a title="Search" href="http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/script/search.php">Search</a>
</div>
<div class="sep"></div>
<div class="menu">
@@ -293,7 +293,7 @@
</div>
<div class="footer">
<span id="footer-west">© 1999-2015 ImageMagick Studio LLC</span>
- <span id="footer-east"> <a href="http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/script/contact.php">Contact the Wizards</a></span>
+ <span id="footer-east"> <a href="http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/script/contact.php">Contact the Wizards</a></span>
</div>
<div style="clear: both; margin: 0; width: 100%; "></div>
</body>
diff --git a/www/magick.html b/www/magick.html
index e33106e..4758c1c 100644
--- a/www/magick.html
+++ b/www/magick.html
@@ -141,7 +141,7 @@
</div>
<div class="sep"></div>
<div class="menu">
- <a title="Search" href="http://www.imagemagick.org/http://www.imagemagick.org/http://www.imagemagick.org/http://www.imagemagick.org/http://www.imagemagick.org/http://www.imagemagick.org/http://www.imagemagick.org/http://www.imagemagick.org/http://www.imagemagick.org/http://www.imagemagick.org/http://www.imagemagick.org/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/script/search.php">Search</a>
+ <a title="Search" href="http://www.imagemagick.org/http://www.imagemagick.org/http://www.imagemagick.org/http://www.imagemagick.org/http://www.imagemagick.org/http://www.imagemagick.org/http://www.imagemagick.org/http://www.imagemagick.org/http://www.imagemagick.org/http://www.imagemagick.org/http://www.imagemagick.org/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/script/search.php">Search</a>
</div>
<div class="sep"></div>
<div class="menu">
@@ -1383,7 +1383,7 @@
</div>
<div class="footer">
<span id="footer-west">© 1999-2011 ImageMagick Studio LLC</span>
- <span id="footer-east"> <a href="http://www.imagemagick.org/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/script/contact.php">Contact the Wizards</a></span>
+ <span id="footer-east"> <a href="http://www.imagemagick.org/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://www.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/script/contact.php">Contact the Wizards</a></span>
</div>
<div style="clear: both; margin: 0; width: 100%; "></div>
<script type="text/javascript">
diff --git a/www/perl-magick.html b/www/perl-magick.html
index 96b5a93..84b8203 100644
--- a/www/perl-magick.html
+++ b/www/perl-magick.html
@@ -49,7 +49,7 @@
<a id="introduction"></a>
<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="http://www.imagemagick.org/download/perl">MagickStudio</a>, or use <a href="https://www.imagemagick.org/subversion/ImageMagick/trunk/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>
+<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="http://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>
<p>You can try PerlMagick from your Web browser at the <a href="http://www.imagemagick.org/MagickStudio/scripts/MagickStudio.cgi">ImageMagick Studio</a>. Or, you can see <a href="examples.html">examples</a> of select PerlMagick functions.</p>
@@ -1547,6 +1547,12 @@
</tr>
<tr>
+ <td>mask</td>
+ <td><i>image</i></td>
+ <td>associate a mask with the image.</td>
+ </tr>
+
+ <tr>
<td>matte</td>
<td>{True, False}</td>
<td>enable the image matte channel</td>
@@ -1607,12 +1613,6 @@
</tr>
<tr>
- <td>read-mask</td>
- <td><i>image</i></td>
- <td>associate a read mask with the image.</td>
- </tr>
-
- <tr>
<td>red-primary</td>
<td><i>x-value</i>, <i>y-value</i></td>
<td>chromaticity red primary point (e.g. 0.64, 0.33)</td>
@@ -1695,13 +1695,6 @@
<td><i>x-value</i>, <i>y-value</i></td>
<td>chromaticity white point (e.g. 0.3127, 0.329)</td>
</tr>
-
- <tr>
- <td>write-mask</td>
- <td><i>image</i></td>
- <td>associate a write mask with the image.</td>
- </tr>
-
</tbody>
</table>
diff --git a/www/porting.html b/www/porting.html
index b557b13..7a89986 100644
--- a/www/porting.html
+++ b/www/porting.html
@@ -60,7 +60,7 @@
<p>With shell API overhaul other improvements are being made, including:
better reporting of which option failed, the consolidation and deprecation of
-options, and more global use of 'image properities' (more commonly known as
+options, and more global use of 'image properties' (more commonly known as
'percent escapes' in option arguments. </p>
<p>ImageMagick version 7 is available now as an <a href="http://www.imagemagick.org/download/beta/">Beta</a> release. Look for an official release around 1st Q 2016. An official ImageMagick version 7 release depends on how smoothly the Beta cycle progresses. During the Beta cycle, version 6 developers can attempt to port their software to version 7.</p>
@@ -68,7 +68,7 @@
<p>Once ImageMagick version 7 is released, we will continue to support and enhance version 6 for a minimum of 10 years.</p>
<h2 class="magick-header"><a id="hdri"></a>High Dynamic Range Imaging</h2>
-<p>ImageMagick version 7 enables <a href="high-dynamic-range.html">high dynamic range imaging</a> (HDRI) by default. HDRI accurately represents the wide range of intensity levels found in real scenes ranging from the brightest direct sunlight to the deepest darkest shadows. In addition, image processing results are more accurate. The disadvantage is it requires more memory and may result in slower processing times. If you see differences in the results of your version 6 command-line with version 7, it is likely due to HDRI. You may need to add <code>-clamp</code> to your command-line to constrain pixels to the 0 .. QuantumRange range, or disable HDRI when you build ImaegMagick version 7. To disable HDRI (recommended for smart phone builds such as iOS), simply add <code>--disable-hdri</code> to the configure script command line when building ImageMagick.</p>
+<p>ImageMagick version 7 enables <a href="high-dynamic-range.html">high dynamic range imaging</a> (HDRI) by default. HDRI accurately represents the wide range of intensity levels found in real scenes ranging from the brightest direct sunlight to the deepest darkest shadows. In addition, image processing results are more accurate. The disadvantage is it requires more memory and may result in slower processing times. If you see differences in the results of your version 6 command-line with version 7, it is likely due to HDRI. You may need to add <code>-clamp</code> to your command-line to constrain pixels to the 0 .. QuantumRange range, or disable HDRI when you build ImageMagick version 7. To disable HDRI (recommended for smart phone builds such as iOS or production sites where performance is a premium), simply add <code>--disable-hdri</code> to the configure script command line when building ImageMagick.</p>
<h2 class="magick-header"><a id="channels"></a>Pixel Channels</h2>
<p>A pixel is comprised of one or more color values, or <var>channels</var> (e.g. red pixel channel).</p>
@@ -337,8 +337,8 @@
<h2 class="magick-header"><a id="cli"></a>Shell API or Command-line Interface</h2>
<p>As mentioned the primary focus of the changes to the Shell API or Command
-Line Interface is the abstraction so that not only can <var>options</var> be read
-from command line arguments, but also from a file (script) or from a file
+Line Interface is the abstraction so that not only can <var>options</var> be
+read from command line arguments, but also from a file (script) or from a file
stream (interactive commands, or co-processing). </p>
<p>To do this the CLI parser needed to be re-written, so as to always perform
@@ -390,7 +390,7 @@
<dt>magick-script</dt>
<dd>This the same as "<code>magick</code>", (only command name is different)
- but which has an implict "<code>-script</code>" option. This allows you to
+ but which has an implicit "<code>-script</code>" option. This allows you to
use it in an "<code>env</code>" style script form. That is a magick script
starts with the 'she-bang' line of "<code>#!/usr/bin/env
magick-script</code>" allowing the script interpreter to be found anywhere
diff --git a/www/sitemap.html b/www/sitemap.html
index 1405b64..3c1edbd 100644
--- a/www/sitemap.html
+++ b/www/sitemap.html
@@ -73,7 +73,7 @@
</dl></li><li><a href="http://www.imagemagick.org/download">Unix source</a>: Unix source distributions.</li>
<li><a href="http://www.imagemagick.org/download/windows">Windows source</a>: Windows source distributions.</li>
<li><a href="http://www.imagemagick.org/download/binaries">Unix and Windows binaries</a>: Unix and Windows binary distributions.</li>
- <li><a href="subversion.html">Subversion repository</a>: stable and development source releases.</li>
+ <li><a href="http://git.imagemagick.org/repos/ImageMagick">Git repository</a>: stable and development source releases.</li>
<li><a href="http://www.magickwand.org/">MagickWand for PHP</a>: a native PHP-extension to the ImageMagick MagickWand API.</li>
<li><a href="http://www.imagemagick.org/download/delegates">Delegate libraries</a>: ImageMagick depends on a number of optional delegate libraries to extend its functionality.</li>
diff --git a/www/subversion.html b/www/subversion.html
index 77fa835..1be8019 100644
--- a/www/subversion.html
+++ b/www/subversion.html
@@ -37,7 +37,7 @@
<a class="magick-nav-item " href="command-line-options.html">Options</a>
<a class="magick-nav-item " href="resources.html">Resources</a>
<a class="magick-nav-item " href="api.html">Develop</a>
- <a class="magick-nav-item " href="http://nextgen.imagemagick.org/script/search.php">Search</a>
+ <a class="magick-nav-item " href="http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/script/search.php">Search</a>
<a class="magick-nav-item pull-right" href="http://www.imagemagick.org/discourse-server/">Community</a>
</nav>
</div>
@@ -72,7 +72,7 @@
</p>
<p><a href="subversion.html#">Back to top</a> •
<a href="http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
- <a href="http://nextgen.imagemagick.org/script/contact.php">Contact Us</a></p>
+ <a href="http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/script/contact.php">Contact Us</a></p>
<p><small>© 1999-2015 ImageMagick Studio LLC</small></p>
</footer>
</div><!-- /.container -->
diff --git a/www/t-shirt.html b/www/t-shirt.html
index 682a6fb..548a518 100644
--- a/www/t-shirt.html
+++ b/www/t-shirt.html
@@ -49,7 +49,7 @@
<a class="magick-nav-item " href="command-line-options.html">Options</a>
<a class="magick-nav-item " href="resources.html">Resources</a>
<a class="magick-nav-item " href="api.html">Develop</a>
- <a class="magick-nav-item " href="http://www.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/script/search.php">Search</a>
+ <a class="magick-nav-item " href="http://www.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/script/search.php">Search</a>
<a class="magick-nav-item pull-right" href="http://www.imagemagick.org/discourse-server/">Community</a>
</nav>
</div>
@@ -99,7 +99,7 @@
</p>
<p><a href="t-shirt.html#">Back to top</a> •
<a href="http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x89AB63D48277377A">Public Key</a> •
- <a href="http://www.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/script/contact.php">Contact Us</a></p>
+ <a href="http://www.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/www/http://nextgen.imagemagick.org/script/contact.php">Contact Us</a></p>
<p><small>© 1999-2015 ImageMagick Studio LLC</small></p>
</footer>
</div><!-- /.container -->
