From 45dbd32b989cbbb4bf50a001f8e32c43a2240985 Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 27 Mar 2011 16:40:38 +0000 Subject: [PATCH] --- ImageMagick.spec | 4 +- Magick++/bin/Magick++-config | 2 +- Magick++/lib/ImageMagick++.pc | 2 +- PerlMagick/Magick.pm | 4 +- PerlMagick/Makefile.PL | 2 +- config/ImageMagick.rdf | 2 +- config/configure.xml | 22 ++++---- configure | 70 +++++++++++++------------- configure.ac | 2 +- index.html | 12 ++--- libtool | 2 +- magick/ImageMagick.pc | 2 +- magick/Magick-config | 2 +- magick/magick-config.h | 30 +++++------ magick/version.h | 12 ++--- utilities/ImageMagick.1 | 4 +- utilities/animate.1 | 4 +- utilities/compare.1 | 4 +- utilities/composite.1 | 4 +- utilities/conjure.1 | 4 +- utilities/convert.1 | 4 +- utilities/display.1 | 4 +- utilities/identify.1 | 4 +- utilities/import.1 | 4 +- utilities/mogrify.1 | 4 +- utilities/montage.1 | 4 +- utilities/stream.1 | 4 +- version.sh | 8 +-- wand/Wand-config | 2 +- wand/Wand.pc | 2 +- www/ImageMagickObject.html | 10 ++-- www/advanced-unix-installation.html | 16 +++--- www/advanced-windows-installation.html | 12 ++--- www/animate.html | 10 ++-- www/api.html | 8 +-- www/api/animate.html | 10 ++-- www/api/annotate.html | 10 ++-- www/api/attribute.html | 10 ++-- www/api/blob.html | 10 ++-- www/api/cache-view.html | 10 ++-- www/api/cache.html | 10 ++-- www/api/cipher.html | 10 ++-- www/api/color.html | 10 ++-- www/api/colormap.html | 10 ++-- www/api/compare.html | 10 ++-- www/api/composite.html | 10 ++-- www/api/constitute.html | 10 ++-- www/api/decorate.html | 10 ++-- www/api/deprecate.html | 10 ++-- www/api/display.html | 10 ++-- www/api/distort.html | 10 ++-- www/api/draw.html | 8 +-- www/api/drawing-wand.html | 10 ++-- www/api/effect.html | 10 ++-- www/api/enhance.html | 10 ++-- www/api/exception.html | 10 ++-- www/api/feature.html | 10 ++-- www/api/fourier.html | 10 ++-- www/api/fx.html | 10 ++-- www/api/histogram.html | 8 +-- www/api/image-view.html | 10 ++-- www/api/image.html | 10 ++-- www/api/layer.html | 10 ++-- www/api/list.html | 40 +++++++++++---- www/api/magick-deprecate.html | 10 ++-- www/api/magick-image.html | 10 ++-- www/api/magick-property.html | 10 ++-- www/api/magick-wand.html | 10 ++-- www/api/magick.html | 10 ++-- www/api/memory.html | 10 ++-- www/api/module.html | 8 +-- www/api/mogrify.html | 22 +++++--- www/api/monitor.html | 10 ++-- www/api/montage.html | 10 ++-- www/api/morphology.html | 10 ++-- www/api/paint.html | 10 ++-- www/api/pixel-iterator.html | 8 +-- www/api/pixel-wand.html | 8 +-- www/api/profile.html | 10 ++-- www/api/property.html | 10 ++-- www/api/quantize.html | 10 ++-- www/api/registry.html | 10 ++-- www/api/resize.html | 8 +-- www/api/resource.html | 10 ++-- www/api/segment.html | 10 ++-- www/api/shear.html | 10 ++-- www/api/signature.html | 10 ++-- www/api/statistic.html | 10 ++-- www/api/stream.html | 10 ++-- www/api/transform.html | 10 ++-- www/api/version.html | 10 ++-- www/api/wand-view.html | 10 ++-- www/architecture.html | 12 ++--- www/binary-releases.html | 66 ++++++++++++------------ www/changelog.html | 17 ++++--- www/cipher.html | 10 ++-- www/color.html | 8 +-- www/command-line-options.html | 10 ++-- www/command-line-processing.html | 10 ++-- www/command-line-tools.html | 10 ++-- www/compare.html | 10 ++-- www/compose.html | 10 ++-- www/composite.html | 10 ++-- www/conjure.html | 10 ++-- www/contact.html | 10 ++-- www/convert.html | 10 ++-- www/display.html | 10 ++-- www/download.html | 12 ++--- www/escape.html | 10 ++-- www/examples.html | 10 ++-- www/exception.html | 10 ++-- www/export.html | 10 ++-- www/formats.html | 10 ++-- www/fx.html | 10 ++-- www/high-dynamic-range.html | 8 +-- www/identify.html | 10 ++-- www/import.html | 10 ++-- www/index.html | 12 ++--- www/install-source.html | 10 ++-- www/jp2.html | 10 ++-- www/license.html | 10 ++-- www/links.html | 10 ++-- www/magick++.html | 8 +-- www/magick-core.html | 10 ++-- www/magick-vector-graphics.html | 8 +-- www/magick-wand.html | 10 ++-- www/miff.html | 10 ++-- www/mogrify.html | 10 ++-- www/montage.html | 10 ++-- www/motion-picture.html | 10 ++-- www/perl-magick.html | 10 ++-- www/quantize.html | 10 ++-- www/resources.html | 10 ++-- www/search.html | 8 +-- www/sitemap.html | 10 ++-- www/sponsors.html | 10 ++-- www/stream.html | 10 ++-- www/subversion.html | 10 ++-- www/t-shirt.html | 10 ++-- 139 files changed, 726 insertions(+), 689 deletions(-) diff --git a/ImageMagick.spec b/ImageMagick.spec index 0842bbed6..e67f67921 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,5 +1,5 @@ -%global VERSION 6.6.8 -%global Patchlevel 10 +%global VERSION 6.6.9 +%global Patchlevel 0 Name: ImageMagick Version: %{VERSION} diff --git a/Magick++/bin/Magick++-config b/Magick++/bin/Magick++-config index 931b975b6..fa4a26ecc 100755 --- a/Magick++/bin/Magick++-config +++ b/Magick++/bin/Magick++-config @@ -40,7 +40,7 @@ while test $# -gt 0; do echo $exec_prefix ;; --version) - echo '6.6.8 Q16 ' + echo '6.6.9 Q16 ' ;; --cflags) echo "-I${includedir} -fopenmp" diff --git a/Magick++/lib/ImageMagick++.pc b/Magick++/lib/ImageMagick++.pc index 045164c0d..9dd51a27c 100644 --- a/Magick++/lib/ImageMagick++.pc +++ b/Magick++/lib/ImageMagick++.pc @@ -5,7 +5,7 @@ includedir=${prefix}/include/ImageMagick Name: ImageMagick++ -Version: 6.6.8 +Version: 6.6.9 Description: Magick++ - C++ API for ImageMagick Requires: ImageMagick Libs: -L${libdir} -lMagick++ diff --git a/PerlMagick/Magick.pm b/PerlMagick/Magick.pm index 21bcc9d32..eb7a7496e 100644 --- a/PerlMagick/Magick.pm +++ b/PerlMagick/Magick.pm @@ -30,7 +30,7 @@ require AutoLoader; ConfigureError FatalErrorException ); -$VERSION = '6.6.8'; +$VERSION = '6.6.9'; sub AUTOLOAD { # This AUTOLOAD is used to 'autoload' constants from the constant() @@ -109,7 +109,7 @@ 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-6.6.8//www/perl-magick.html + file:///usr/local/share/doc/ImageMagick-6.6.9//www/perl-magick.html http://www.imagemagick.org/script/perl-magick.php If you have problems, go to diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL index 285f9df87..41a41bf8e 100644 --- a/PerlMagick/Makefile.PL +++ b/PerlMagick/Makefile.PL @@ -189,7 +189,7 @@ WriteMakefile 'AUTHOR' => 'ImageMagick Studio LLC', # Module version - 'VERSION' => '6.6.8', + 'VERSION' => '6.6.9', # Preprocessor defines 'DEFINE' => ' -D_LARGE_FILES=1 -DHAVE_CONFIG_H', # e.g., '-DHAVE_SOMETHING' diff --git a/config/ImageMagick.rdf b/config/ImageMagick.rdf index 68f44094f..b06e16e81 100644 --- a/config/ImageMagick.rdf +++ b/config/ImageMagick.rdf @@ -97,7 +97,7 @@ stable 2010-12-01 - 6.6.8 + 6.6.9 diff --git a/config/configure.xml b/config/configure.xml index 1c741e3d0..8c6cb08e4 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -7,21 +7,21 @@ ]> - - - - + + + + - - - + + + - - - - + + + + diff --git a/configure b/configure index c04ae77ab..7bb5f0eb6 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for ImageMagick 6.6.8. +# Generated by GNU Autoconf 2.68 for ImageMagick 6.6.9. # # Report bugs to . # @@ -573,9 +573,9 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ImageMagick' -PACKAGE_TARNAME='ImageMagick-6.6.8' -PACKAGE_VERSION='6.6.8' -PACKAGE_STRING='ImageMagick 6.6.8' +PACKAGE_TARNAME='ImageMagick-6.6.9' +PACKAGE_VERSION='6.6.9' +PACKAGE_STRING='ImageMagick 6.6.9' PACKAGE_BUGREPORT='http://www.imagemagick.org' PACKAGE_URL='' @@ -722,11 +722,11 @@ BZIPDelegate BlenderDecodeDelegate AutotraceDecodeDelegate SHARE_CONFIGURE_PATH +CONFIGURE_PATH SHARE_PATH DOCUMENTATION_PATH FILTER_PATH CODER_PATH -CONFIGURE_PATH LIBRARY_PATH EXECUTABLE_PATH PERLMAINCC @@ -1709,7 +1709,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ImageMagick 6.6.8 to adapt to many kinds of systems. +\`configure' configures ImageMagick 6.6.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1758,7 +1758,7 @@ Fine tuning of the installation directories: --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] --docdir=DIR documentation root - [DATAROOTDIR/doc/ImageMagick-6.6.8] + [DATAROOTDIR/doc/ImageMagick-6.6.9] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1785,7 +1785,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ImageMagick 6.6.8:";; + short | recursive ) echo "Configuration of ImageMagick 6.6.9:";; esac cat <<\_ACEOF @@ -1994,7 +1994,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ImageMagick configure 6.6.8 +ImageMagick configure 6.6.9 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2910,7 +2910,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ImageMagick $as_me 6.6.8, which was +It was created by ImageMagick $as_me 6.6.9, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -30379,27 +30379,6 @@ _ACEOF -# Subdirectory to place ImageMagick configuration files -CONFIGURE_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}" - -cat >>confdefs.h <<_ACEOF -#define CONFIGURE_RELATIVE_PATH "$CONFIGURE_RELATIVE_PATH" -_ACEOF - -CONFIGURE_PATH="${DATA_DIR}/${CONFIGURE_RELATIVE_PATH}/" -DEFINE_CONFIGURE_PATH="${DATA_DIR}/${CONFIGURE_RELATIVE_PATH}/" -case "${build_os}" in - mingw* ) - DEFINE_CONFIGURE_PATH=`$WinPathScript "$DEFINE_CONFIGURE_PATH" 1` - ;; -esac - -cat >>confdefs.h <<_ACEOF -#define CONFIGURE_PATH "$DEFINE_CONFIGURE_PATH" -_ACEOF - - - # # Subdirectory under lib to place ImageMagick coder module files CODER_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}/modules-Q${QUANTUM_DEPTH}/coders" @@ -30478,6 +30457,27 @@ _ACEOF +# Subdirectory to place ImageMagick configuration files +CONFIGURE_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}" + +cat >>confdefs.h <<_ACEOF +#define CONFIGURE_RELATIVE_PATH "$CONFIGURE_RELATIVE_PATH" +_ACEOF + +CONFIGURE_PATH="${SYSCONF_DIR}/${CONFIGURE_RELATIVE_PATH}/" +DEFINE_CONFIGURE_PATH="${SYSCONF_DIR}/${CONFIGURE_RELATIVE_PATH}/" +case "${build_os}" in + mingw* ) + DEFINE_CONFIGURE_PATH=`$WinPathScript "$DEFINE_CONFIGURE_PATH" 1` + ;; +esac + +cat >>confdefs.h <<_ACEOF +#define CONFIGURE_PATH "$DEFINE_CONFIGURE_PATH" +_ACEOF + + + # Subdirectory to place ImageMagick configuration files SHARE_CONFIGURE_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}" @@ -30485,8 +30485,8 @@ cat >>confdefs.h <<_ACEOF #define SHARE_CONFIGURE_RELATIVE_PATH "$SHARE_CONFIGURE_RELATIVE_PATH" _ACEOF -SHARE_CONFIGURE_PATH="${SYSCONF_DIR}/${SHARE_CONFIGURE_RELATIVE_PATH}" -DEFINE_SHARE_CONFIGURE_PATH="${SYSCONF_DIR}/${SHARE_CONFIGURE_RELATIVE_PATH}/" +SHARE_CONFIGURE_PATH="${DATA_DIR}/${SHARE_CONFIGURE_RELATIVE_PATH}" +DEFINE_SHARE_CONFIGURE_PATH="${DATA_DIR}/${SHARE_CONFIGURE_RELATIVE_PATH}/" case "${build_os}" in mingw* ) DEFINE_SHARE_CONFIGURE_PATH=`$WinPathScript "$DEFINE_SHARE_CONFIGURE_PATH" 1` @@ -34268,7 +34268,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ImageMagick $as_me 6.6.8, which was +This file was extended by ImageMagick $as_me 6.6.9, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -34334,7 +34334,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ImageMagick config.status 6.6.8 +ImageMagick config.status 6.6.9 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 0b70163b1..66778f661 100755 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ AC_PREREQ(2.64) m4_define([magick_major_version], [6]) m4_define([magick_minor_version], [6]) -m4_define([magick_micro_version], [8]) +m4_define([magick_micro_version], [9]) m4_define([magick_version], [magick_major_version.magick_minor_version.magick_micro_version]) diff --git a/index.html b/index.html index 3f6880ade..8b0a4028a 100644 --- a/index.html +++ b/index.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
@@ -209,7 +209,7 @@

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

-

The current release is ImageMagick 6.6.8-9.

+

The current release is ImageMagick 6.6.8-10.

diff --git a/libtool b/libtool index 4aca3ff78..abec97ddf 100755 --- a/libtool +++ b/libtool @@ -1,7 +1,7 @@ #! /bin/sh # libtool - Provide generalized library-building support services. -# Generated automatically by config.status (ImageMagick) 6.6.8-10 +# Generated automatically by config.status (ImageMagick) 6.6.9-0 # Libtool was configured on host magick.imagemagick.org: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # diff --git a/magick/ImageMagick.pc b/magick/ImageMagick.pc index 51909fa83..4c4172a21 100644 --- a/magick/ImageMagick.pc +++ b/magick/ImageMagick.pc @@ -5,6 +5,6 @@ includedir=${prefix}/include/ImageMagick Name: ImageMagick Description: ImageMagick - Convert, Edit, and Compose Images -Version: 6.6.8 +Version: 6.6.9 Libs: -L${libdir} -lMagickCore Cflags: -I${includedir} -fopenmp diff --git a/magick/Magick-config b/magick/Magick-config index 4f5a42798..ef6408ca0 100755 --- a/magick/Magick-config +++ b/magick/Magick-config @@ -37,7 +37,7 @@ while test $# -gt 0; do echo $exec_prefix ;; --version) - echo '6.6.8 Q16 ' + echo '6.6.9 Q16 ' ;; --cflags) echo "-I${includedir} -fopenmp" diff --git a/magick/magick-config.h b/magick/magick-config.h index 41f3d2a48..e24bf2e09 100644 --- a/magick/magick-config.h +++ b/magick/magick-config.h @@ -34,23 +34,23 @@ /* Location of coder modules */ #ifndef MAGICKCORE_CODER_PATH -#define MAGICKCORE_CODER_PATH "/usr/local/lib/ImageMagick-6.6.8/modules-Q16/coders/" +#define MAGICKCORE_CODER_PATH "/usr/local/lib/ImageMagick-6.6.9/modules-Q16/coders/" #endif /* Subdirectory of lib where coder modules are installed */ #ifndef MAGICKCORE_CODER_RELATIVE_PATH -#define MAGICKCORE_CODER_RELATIVE_PATH "ImageMagick-6.6.8/modules-Q16/coders" +#define MAGICKCORE_CODER_RELATIVE_PATH "ImageMagick-6.6.9/modules-Q16/coders" #endif /* Directory where architecture-dependent configuration files live. */ #ifndef MAGICKCORE_CONFIGURE_PATH -#define MAGICKCORE_CONFIGURE_PATH "/usr/local/share/ImageMagick-6.6.8/" +#define MAGICKCORE_CONFIGURE_PATH "/usr/local/etc/ImageMagick-6.6.9/" #endif /* Subdirectory of lib where architecture-dependent configuration files live. */ #ifndef MAGICKCORE_CONFIGURE_RELATIVE_PATH -#define MAGICKCORE_CONFIGURE_RELATIVE_PATH "ImageMagick-6.6.8" +#define MAGICKCORE_CONFIGURE_RELATIVE_PATH "ImageMagick-6.6.9" #endif /* Define if you have DJVU library */ @@ -58,7 +58,7 @@ /* Directory where ImageMagick documents live. */ #ifndef MAGICKCORE_DOCUMENTATION_PATH -#define MAGICKCORE_DOCUMENTATION_PATH "/usr/local/share/doc/ImageMagick-6.6.8//" +#define MAGICKCORE_DOCUMENTATION_PATH "/usr/local/share/doc/ImageMagick-6.6.9//" #endif /* Define if you have Display Postscript */ @@ -80,12 +80,12 @@ /* Location of filter modules */ #ifndef MAGICKCORE_FILTER_PATH -#define MAGICKCORE_FILTER_PATH "/usr/local/lib/ImageMagick-6.6.8/modules-Q16/filters/" +#define MAGICKCORE_FILTER_PATH "/usr/local/lib/ImageMagick-6.6.9/modules-Q16/filters/" #endif /* Subdirectory of lib where filter modules are installed */ #ifndef MAGICKCORE_FILTER_RELATIVE_PATH -#define MAGICKCORE_FILTER_RELATIVE_PATH "ImageMagick-6.6.8/modules-Q16/filters" +#define MAGICKCORE_FILTER_RELATIVE_PATH "ImageMagick-6.6.9/modules-Q16/filters" #endif /* Define if you have FONTCONFIG library */ @@ -1089,13 +1089,13 @@ /* Directory where architecture-dependent files live. */ #ifndef MAGICKCORE_LIBRARY_PATH -#define MAGICKCORE_LIBRARY_PATH "/usr/local/lib/ImageMagick-6.6.8/" +#define MAGICKCORE_LIBRARY_PATH "/usr/local/lib/ImageMagick-6.6.9/" #endif /* Subdirectory of lib where ImageMagick architecture dependent files are installed */ #ifndef MAGICKCORE_LIBRARY_RELATIVE_PATH -#define MAGICKCORE_LIBRARY_RELATIVE_PATH "ImageMagick-6.6.8" +#define MAGICKCORE_LIBRARY_RELATIVE_PATH "ImageMagick-6.6.9" #endif /* Define if you have LQR library */ @@ -1176,12 +1176,12 @@ /* Define to the full name and version of this package. */ #ifndef MAGICKCORE_PACKAGE_STRING -#define MAGICKCORE_PACKAGE_STRING "ImageMagick 6.6.8" +#define MAGICKCORE_PACKAGE_STRING "ImageMagick 6.6.9" #endif /* Define to the one symbol short name of this package. */ #ifndef MAGICKCORE_PACKAGE_TARNAME -#define MAGICKCORE_PACKAGE_TARNAME "ImageMagick-6.6.8" +#define MAGICKCORE_PACKAGE_TARNAME "ImageMagick-6.6.9" #endif /* Define to the home page for this package. */ @@ -1191,7 +1191,7 @@ /* Define to the version of this package. */ #ifndef MAGICKCORE_PACKAGE_VERSION -#define MAGICKCORE_PACKAGE_VERSION "6.6.8" +#define MAGICKCORE_PACKAGE_VERSION "6.6.9" #endif /* Define if you have PNG library */ @@ -1236,18 +1236,18 @@ /* Directory where architecture-independent configuration files live. */ #ifndef MAGICKCORE_SHARE_CONFIGURE_PATH -#define MAGICKCORE_SHARE_CONFIGURE_PATH "/usr/local/etc/ImageMagick-6.6.8/" +#define MAGICKCORE_SHARE_CONFIGURE_PATH "/usr/local/share/ImageMagick-6.6.9/" #endif /* Subdirectory of lib where architecture-independent configuration files live. */ #ifndef MAGICKCORE_SHARE_CONFIGURE_RELATIVE_PATH -#define MAGICKCORE_SHARE_CONFIGURE_RELATIVE_PATH "ImageMagick-6.6.8" +#define MAGICKCORE_SHARE_CONFIGURE_RELATIVE_PATH "ImageMagick-6.6.9" #endif /* Directory where architecture-independent files live. */ #ifndef MAGICKCORE_SHARE_PATH -#define MAGICKCORE_SHARE_PATH "/usr/local/share/ImageMagick-6.6.8/" +#define MAGICKCORE_SHARE_PATH "/usr/local/share/ImageMagick-6.6.9/" #endif /* The size of `off_t', as computed by sizeof. */ diff --git a/magick/version.h b/magick/version.h index 86e7ae654..f2ec750e7 100644 --- a/magick/version.h +++ b/magick/version.h @@ -27,14 +27,14 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2011 ImageMagick Studio LLC" -#define MagickLibVersion 0x668 -#define MagickLibVersionText "6.6.8" +#define MagickLibVersion 0x669 +#define MagickLibVersionText "6.6.9" #define MagickLibVersionNumber 4,0,1 -#define MagickLibAddendum "-10" +#define MagickLibAddendum "-0" #define MagickLibInterface 4 #define MagickLibMinInterface 4 -#define MagickReleaseDate "2011-03-26" -#define MagickChangeDate "20110326" +#define MagickReleaseDate "2011-03-27" +#define MagickChangeDate "20110327" #define MagickAuthoritativeURL "http://www.imagemagick.org" #if defined(MAGICKCORE_OPENMP_SUPPORT) #define MagickOpenMPFeature "OpenMP " @@ -52,7 +52,7 @@ extern "C" { #define MagickHDRIFeature " " #endif #define MagickFeatures MagickOpenMPFeature MagickOpenCLFeature MagickHDRIFeature -#define MagickHomeURL "file:///usr/local/share/doc/ImageMagick-6.6.8//index.html" +#define MagickHomeURL "file:///usr/local/share/doc/ImageMagick-6.6.9//index.html" #if (MAGICKCORE_QUANTUM_DEPTH == 8) #define MagickQuantumDepth "Q8" #define MagickQuantumRange "255" diff --git a/utilities/ImageMagick.1 b/utilities/ImageMagick.1 index 8541e8212..360d3eb4e 100644 --- a/utilities/ImageMagick.1 +++ b/utilities/ImageMagick.1 @@ -67,9 +67,9 @@ saves any visible window on an X server and outputs it as an image file. You can 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-6.6.8//index.html or http://www.imagemagick.org/. +For more information about the ImageMagick, point your browser to file:///usr/local/share/doc/ImageMagick-6.6.9//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-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.8//www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.9//www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/animate.1 b/utilities/animate.1 index 4293e9a91..95348e272 100644 --- a/utilities/animate.1 +++ b/utilities/animate.1 @@ -7,7 +7,7 @@ animate \- animates an image or image sequence on any X server. .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-6.6.8//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-6.6.9//www/animate.html or http://www.imagemagick.org/script/animate.php. .SH DESCRIPTION Image Settings: \-authenticate value decrypt image with this password @@ -93,4 +93,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.8//www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.9//www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/compare.1 b/utilities/compare.1 index a92c7fc4e..8d070c2a2 100644 --- a/utilities/compare.1 +++ b/utilities/compare.1 @@ -7,7 +7,7 @@ compare \- mathematically and visually annotate the difference between an image .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-6.6.8//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-6.6.9//www/compare.html or http://www.imagemagick.org/script/compare.php. .SH DESCRIPTION Image Settings: \-authenticate value decrypt image with this password @@ -66,4 +66,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.8//www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.9//www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/composite.1 b/utilities/composite.1 index df00a8bc9..2675ad3af 100644 --- a/utilities/composite.1 +++ b/utilities/composite.1 @@ -7,7 +7,7 @@ composite \- overlaps one image over another. .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-6.6.8//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-6.6.9//www/composite.html or http://www.imagemagick.org/script/composite.php. .SH DESCRIPTION Image Settings: \-affine matrix affine transform matrix @@ -103,4 +103,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.8//www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.9//www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/conjure.1 b/utilities/conjure.1 index f414c354e..6b6025dcb 100644 --- a/utilities/conjure.1 +++ b/utilities/conjure.1 @@ -7,7 +7,7 @@ conjure \- interprets and executes scripts written in the Magick Scripting Langu .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-6.6.8//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-6.6.9//www/conjure.html or http://www.imagemagick.org/script/conjure.php. .SH DESCRIPTION Image Settings: \-monitor monitor progress @@ -31,4 +31,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.8//www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.9//www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/convert.1 b/utilities/convert.1 index 4edafb493..7fb8be8ec 100644 --- a/utilities/convert.1 +++ b/utilities/convert.1 @@ -7,7 +7,7 @@ convert \- convert between image formats as well as resize an image, blur, crop, .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-6.6.8//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-6.6.9//www/convert.html or http://www.imagemagick.org/script/convert.php. .SH DESCRIPTION Image Settings: \-adjoin join images into a single multi-image file @@ -266,4 +266,4 @@ By default, the image format of `file' is determined by its magic number. To sp ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.8//www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.9//www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/display.1 b/utilities/display.1 index e8462be52..80b02594a 100644 --- a/utilities/display.1 +++ b/utilities/display.1 @@ -7,7 +7,7 @@ display \- displays an image or image sequence on any X server. .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-6.6.8//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-6.6.9//www/display.html or http://www.imagemagick.org/script/display.php. .SH DESCRIPTION Image Settings: \-antialias remove pixel-aliasing @@ -125,4 +125,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.8//www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.9//www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/identify.1 b/utilities/identify.1 index e552292e3..b19530d55 100644 --- a/utilities/identify.1 +++ b/utilities/identify.1 @@ -7,7 +7,7 @@ identify \- describes the format and characteristics of one or more image files. .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-6.6.8//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-6.6.9//www/identify.html or http://www.imagemagick.org/script/identify.php. .SH DESCRIPTION Image Settings: \-antialias remove pixel-aliasing @@ -61,4 +61,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.8//www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.9//www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/import.1 b/utilities/import.1 index 8f24674d8..864805250 100644 --- a/utilities/import.1 +++ b/utilities/import.1 @@ -7,7 +7,7 @@ import \- saves any visible window on an X server and outputs it as an image fil .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-6.6.8//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-6.6.9//www/import.html or http://www.imagemagick.org/script/import.php. .SH DESCRIPTION Image Settings: \-adjoin join images into a single multi-image file @@ -94,4 +94,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.8//www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.9//www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/mogrify.1 b/utilities/mogrify.1 index 1d42fa69c..ae7b27f0d 100644 --- a/utilities/mogrify.1 +++ b/utilities/mogrify.1 @@ -7,7 +7,7 @@ mogrify \- resize an image, blur, crop, despeckle, dither, draw on, flip, join, .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-6.6.8//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-6.6.9//www/mogrify.html or http://www.imagemagick.org/script/mogrify.php. .SH DESCRIPTION Image Settings: \-adjoin join images into a single multi-image file @@ -268,4 +268,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.8//www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.9//www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/montage.1 b/utilities/montage.1 index edf7ecae4..415e8c311 100644 --- a/utilities/montage.1 +++ b/utilities/montage.1 @@ -7,7 +7,7 @@ montage \- create a composite image by combining several separate images. The im .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-6.6.8//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-6.6.9//www/montage.html or http://www.imagemagick.org/script/montage.php. .SH DESCRIPTION Image Settings: \-adjoin join images into a single multi-image file @@ -131,4 +131,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.8//www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.9//www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/stream.1 b/utilities/stream.1 index dcec95739..70213f1f8 100644 --- a/utilities/stream.1 +++ b/utilities/stream.1 @@ -7,7 +7,7 @@ stream \- a lightweight tool to stream one or more pixel components of the image .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-6.6.8//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-6.6.9//www/stream.html or http://www.imagemagick.org/script/stream.php. .SH DESCRIPTION Image Settings: \-authenticate value decrypt image with this password @@ -54,4 +54,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.8//www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.9//www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/version.sh b/version.sh index 2ba7c2c87..29cd48aa3 100644 --- a/version.sh +++ b/version.sh @@ -10,10 +10,10 @@ PACKAGE_NAME='ImageMagick' # # Package version. This is is the numeric version suffix applied to # PACKAGE_NAME (e.g. "1.0.0"). -PACKAGE_VERSION='6.6.8' -PACKAGE_LIB_VERSION="0x668" -PACKAGE_RELEASE="10" -PACKAGE_LIB_VERSION_NUMBER="6,6,8,${PACKAGE_RELEASE}" +PACKAGE_VERSION='6.6.9' +PACKAGE_LIB_VERSION="0x669" +PACKAGE_RELEASE="0" +PACKAGE_LIB_VERSION_NUMBER="6,6,9,${PACKAGE_RELEASE}" PACKAGE_RELEASE_DATE=`date +%F` PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION" diff --git a/wand/Wand-config b/wand/Wand-config index 632b31182..6e6ca30c5 100755 --- a/wand/Wand-config +++ b/wand/Wand-config @@ -37,7 +37,7 @@ while test $# -gt 0; do echo $exec_prefix ;; --version) - echo '6.6.8 Q16 ' + echo '6.6.9 Q16 ' ;; --cflags) echo "-I${includedir} -fopenmp" diff --git a/wand/Wand.pc b/wand/Wand.pc index eb70bd0f7..e98638771 100644 --- a/wand/Wand.pc +++ b/wand/Wand.pc @@ -4,7 +4,7 @@ libdir=${exec_prefix}/lib includedir=${prefix}/include/ImageMagick Name: Wand -Version: 6.6.8 +Version: 6.6.9 Description: MagickWand - C API for ImageMagick Requires: ImageMagick Libs: -L${libdir} -lMagickWand -lMagickCore diff --git a/www/ImageMagickObject.html b/www/ImageMagickObject.html index 609f65df3..9cf90a0e7 100644 --- a/www/ImageMagickObject.html +++ b/www/ImageMagickObject.html @@ -160,6 +160,9 @@ [sponsor]
+ @@ -167,7 +170,7 @@ Hotel München
diff --git a/www/advanced-unix-installation.html b/www/advanced-unix-installation.html index 959a3e681..8f1f8c3eb 100644 --- a/www/advanced-unix-installation.html +++ b/www/advanced-unix-installation.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
@@ -221,7 +221,7 @@

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:

-

$magick> cd ImageMagick-6.6.8-9 $magick> ./configure

+

$magick> cd ImageMagick-6.6.8-10 $magick> ./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:

@@ -573,7 +573,7 @@ Options used to compile and link:

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

Unpack and change into the top-level ImageMagick directory:

-

$magick> tar xvfz ImageMagick-6.6.8-9.tar.gz $magick> cd ImageMagick-6.6.8-9

Configure ImageMagick:

+

$magick> tar xvfz ImageMagick-6.6.8-10.tar.gz $magick> cd ImageMagick-6.6.8-10

Configure ImageMagick:

$magick> ./configure --prefix=/opt --with-quantum-depth=16 \
--disable-dependency-tracking --with-x=yes \
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib/ \
@@ -593,7 +593,7 @@ Options used to compile and link:

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,

-

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

+

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

Dealing with Unexpected Problems

diff --git a/www/advanced-windows-installation.html b/www/advanced-windows-installation.html index 08e94a2d0..ca19e5669 100644 --- a/www/advanced-windows-installation.html +++ b/www/advanced-windows-installation.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
@@ -473,7 +473,7 @@
  1. Double-click on - VisualMagick/bin/ImageMagick-6.6.8-9-Q16-windows-dll.exe + VisualMagick/bin/ImageMagick-6.6.8-10-Q16-windows-dll.exe to launch the ImageMagick binary distribution.
  2. Complete the installer screens to install ImageMagick on your system.
diff --git a/www/animate.html b/www/animate.html index b61cfa8fd..e7a75de02 100644 --- a/www/animate.html +++ b/www/animate.html @@ -160,6 +160,9 @@ [sponsor]
+ @@ -167,7 +170,7 @@ Hotel München
diff --git a/www/api.html b/www/api.html index 0c2d21454..320e0aec7 100644 --- a/www/api.html +++ b/www/api.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/annotate.html b/www/api/annotate.html index eed975ec8..b359171fc 100644 --- a/www/api/annotate.html +++ b/www/api/annotate.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/attribute.html b/www/api/attribute.html index 0f476f8c8..55b651e4d 100644 --- a/www/api/attribute.html +++ b/www/api/attribute.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/blob.html b/www/api/blob.html index dee28b1f6..9fbdb07ad 100644 --- a/www/api/blob.html +++ b/www/api/blob.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/cache-view.html b/www/api/cache-view.html index 10db07fab..839fa45e9 100644 --- a/www/api/cache-view.html +++ b/www/api/cache-view.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/cache.html b/www/api/cache.html index 126a976f9..df39f74fc 100644 --- a/www/api/cache.html +++ b/www/api/cache.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/cipher.html b/www/api/cipher.html index eb57f84b0..ad35804e8 100644 --- a/www/api/cipher.html +++ b/www/api/cipher.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/color.html b/www/api/color.html index b71004240..577fe5dec 100644 --- a/www/api/color.html +++ b/www/api/color.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/colormap.html b/www/api/colormap.html index d9a958a13..981c10727 100644 --- a/www/api/colormap.html +++ b/www/api/colormap.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/compare.html b/www/api/compare.html index 85984d87b..af6465274 100644 --- a/www/api/compare.html +++ b/www/api/compare.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/composite.html b/www/api/composite.html index 09721dc81..b1d75a413 100644 --- a/www/api/composite.html +++ b/www/api/composite.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/constitute.html b/www/api/constitute.html index 482db5559..6d40aebcf 100644 --- a/www/api/constitute.html +++ b/www/api/constitute.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/decorate.html b/www/api/decorate.html index 2df8c270c..51371bb82 100644 --- a/www/api/decorate.html +++ b/www/api/decorate.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/deprecate.html b/www/api/deprecate.html index ad0378c14..ad3ca3590 100644 --- a/www/api/deprecate.html +++ b/www/api/deprecate.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/display.html b/www/api/display.html index 1b88a9438..461bd7a7c 100644 --- a/www/api/display.html +++ b/www/api/display.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/distort.html b/www/api/distort.html index 26f099e93..381b63d02 100644 --- a/www/api/distort.html +++ b/www/api/distort.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/draw.html b/www/api/draw.html index a083d686f..fc230bfac 100644 --- a/www/api/draw.html +++ b/www/api/draw.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/effect.html b/www/api/effect.html index 56ee35d67..aa4c10bce 100644 --- a/www/api/effect.html +++ b/www/api/effect.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/enhance.html b/www/api/enhance.html index ff9e34584..137e7c166 100644 --- a/www/api/enhance.html +++ b/www/api/enhance.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/exception.html b/www/api/exception.html index d59a560db..4d0ef1a3a 100644 --- a/www/api/exception.html +++ b/www/api/exception.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/feature.html b/www/api/feature.html index 5bf2ea08d..242c5c8db 100644 --- a/www/api/feature.html +++ b/www/api/feature.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/fourier.html b/www/api/fourier.html index 07f6522f2..d57a140e5 100644 --- a/www/api/fourier.html +++ b/www/api/fourier.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/fx.html b/www/api/fx.html index 643baf987..eaabdde59 100644 --- a/www/api/fx.html +++ b/www/api/fx.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/histogram.html b/www/api/histogram.html index 01d32208f..093d5dad6 100644 --- a/www/api/histogram.html +++ b/www/api/histogram.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/image.html b/www/api/image.html index 7d6b131b9..7dde26687 100644 --- a/www/api/image.html +++ b/www/api/image.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/layer.html b/www/api/layer.html index 1557c92c8..ae65557e8 100644 --- a/www/api/layer.html +++ b/www/api/layer.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/list.html b/www/api/list.html index 7a9cdf970..5f746eae4 100644 --- a/www/api/list.html +++ b/www/api/list.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
@@ -197,7 +197,7 @@

Module list Methods

-

[AppendImageToList • CloneImageList • CloneImages • DeleteImageFromList • DeleteImages • DestroyImageList • DuplicateImages • GetFirstImageInList • GetImageFromList • GetImageIndexInList • GetImageListLength • GetLastImageInList • GetNextImageInList • GetPreviousImageInList • ImageListToArray • InsertImageInList • NewImageList • PrependImageToList • RemoveImageFromList • RemoveFirstImageFromList • RemoveLastImageFromList • ReplaceImageInList • ReverseImageList • SpliceImageIntoList • SplitImageList]

+

[AppendImageToList • CloneImageList • CloneImages • DeleteImageFromList • DeleteImages • DestroyImageList • DuplicateImages • GetFirstImageInList • GetImageFromList • GetImageIndexInList • GetImageListLength • GetLastImageInList • GetNextImageInList • GetPreviousImageInList • ImageListToArray • InsertImageInList • NewImageList • PrependImageToList • RemoveImageFromList • RemoveFirstImageFromList • RemoveLastImageFromList • ReplaceImageInList • ReplaceImageInListReturnLast • ReverseImageList • SpliceImageIntoList • SplitImageList]

AppendImageToList

@@ -613,7 +613,7 @@

ReplaceImageInList

-

ReplaceImageInList() replaces an image in the list. Old image is destroyed. The given image list pointer is set to point to the just inserted image.

+

ReplaceImageInList() replaces an image in the list with the given image, or list of images. Old image is destroyed. The image list pointer is set to point to the first image of the inserted list of images.

The format of the ReplaceImageInList method is:

@@ -624,10 +624,32 @@

A description of each parameter follows:

images
-

the image list.

+

the list and pointer to image to replace

image
-

the image.

+

the image or image list replacing the original

+ +
+

ReplaceImageInListReturnLast

+
+ +

ReplaceImageInListReturnLast() is exactly as ReplaceImageInList() except the image pointer is set to the last image in the list.

+ +

This allows you to simply use 'next' to go to the image that follows the just replaced image.

+ +

The format of the ReplaceImageInList method is:

+ +
+  ReplaceImageInListReturnLast(Image **images,Image *image)
+
+ +

A description of each parameter follows:

+ +
images
+

the list and pointer to image to replace

+ +
image
+

the image or image list replacing the original

ReverseImageList

diff --git a/www/api/magick-deprecate.html b/www/api/magick-deprecate.html index 894da6029..1fdb2b87f 100644 --- a/www/api/magick-deprecate.html +++ b/www/api/magick-deprecate.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/magick-image.html b/www/api/magick-image.html index 99af668e8..99f3e60ee 100644 --- a/www/api/magick-image.html +++ b/www/api/magick-image.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/magick-property.html b/www/api/magick-property.html index 53df0bf53..df72391e8 100644 --- a/www/api/magick-property.html +++ b/www/api/magick-property.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/magick-wand.html b/www/api/magick-wand.html index f68a5cf70..b260631bd 100644 --- a/www/api/magick-wand.html +++ b/www/api/magick-wand.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/magick.html b/www/api/magick.html index e0a5dc2c3..ecc010161 100644 --- a/www/api/magick.html +++ b/www/api/magick.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/memory.html b/www/api/memory.html index 4d7028562..5a93535f0 100644 --- a/www/api/memory.html +++ b/www/api/memory.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/module.html b/www/api/module.html index 5afb50d6c..e4590b131 100644 --- a/www/api/module.html +++ b/www/api/module.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
@@ -197,7 +197,7 @@

Module mogrify Methods

-

[MagickCommandGenesis]

+

[MagickCommandGenesis • ** GetImageCache • ** SparseColorOption]

MagickCommandGenesis

@@ -233,6 +233,16 @@

return any errors or warnings in this structure.

+

** GetImageCache

+
+ +

** GetImageCache() will read an image into a image cache if not already ** present then return the image that is in the cache under that filename.

+
+

** SparseColorOption

+
+ +

** SparseColorOption() parse the complex -sparse-color argument into an ** an array of floating point values than call SparseColorImage(). ** Argument is a complex mix of floating-point pixel coodinates, and color ** specifications (or direct floating point numbers). The number of floats ** needed to represent a color varies depending on teh current channel ** setting.

+
diff --git a/www/api/monitor.html b/www/api/monitor.html index c272bcab3..a779303c9 100644 --- a/www/api/monitor.html +++ b/www/api/monitor.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/montage.html b/www/api/montage.html index 65a896a7a..18743df7e 100644 --- a/www/api/montage.html +++ b/www/api/montage.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/morphology.html b/www/api/morphology.html index 885a5c56f..91e6bc28a 100644 --- a/www/api/morphology.html +++ b/www/api/morphology.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/paint.html b/www/api/paint.html index f7086581f..4faeaf94b 100644 --- a/www/api/paint.html +++ b/www/api/paint.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/pixel-iterator.html b/www/api/pixel-iterator.html index eb3d1f0d6..10d82ed12 100644 --- a/www/api/pixel-iterator.html +++ b/www/api/pixel-iterator.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/quantize.html b/www/api/quantize.html index c6a9bdf8b..dff57b8b1 100644 --- a/www/api/quantize.html +++ b/www/api/quantize.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/registry.html b/www/api/registry.html index bb0b065a4..19a173485 100644 --- a/www/api/registry.html +++ b/www/api/registry.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/resize.html b/www/api/resize.html index 26d9d78fc..c963a50a2 100644 --- a/www/api/resize.html +++ b/www/api/resize.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/segment.html b/www/api/segment.html index 3cab1af81..6b39af6b7 100644 --- a/www/api/segment.html +++ b/www/api/segment.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/shear.html b/www/api/shear.html index 08c43ef74..8506b789e 100644 --- a/www/api/shear.html +++ b/www/api/shear.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/signature.html b/www/api/signature.html index b7da45224..ae2cf119b 100644 --- a/www/api/signature.html +++ b/www/api/signature.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/statistic.html b/www/api/statistic.html index 746e9759a..79658bc19 100644 --- a/www/api/statistic.html +++ b/www/api/statistic.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/stream.html b/www/api/stream.html index 61aad15ae..a13a46a4f 100644 --- a/www/api/stream.html +++ b/www/api/stream.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/transform.html b/www/api/transform.html index 39ee9fde2..437bd6868 100644 --- a/www/api/transform.html +++ b/www/api/transform.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/version.html b/www/api/version.html index c47874e05..66f9010e6 100644 --- a/www/api/version.html +++ b/www/api/version.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/api/wand-view.html b/www/api/wand-view.html index e37271c90..1a23d9518 100644 --- a/www/api/wand-view.html +++ b/www/api/wand-view.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
diff --git a/www/architecture.html b/www/architecture.html index 8dfb08e95..f18e06f55 100644 --- a/www/architecture.html +++ b/www/architecture.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
@@ -288,7 +288,7 @@

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:

-

$magick> identify -versionVersion: ImageMagick 6.6.8-9 2011-03-25 Q16 http://www.imagemagick.org

+

$magick> identify -versionVersion: ImageMagick 6.6.8-10 2011-03-25 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.

diff --git a/www/binary-releases.html b/www/binary-releases.html index c29cc3d79..9f88a708f 100644 --- a/www/binary-releases.html +++ b/www/binary-releases.html @@ -159,6 +159,9 @@ [sponsor]
+ @@ -166,7 +169,7 @@ Hotel München
@@ -219,16 +219,16 @@ - ImageMagick-6.6.8-9.i386.rpm - download - download + ImageMagick-6.6.8-10.i386.rpm + download + download CentOS 5.4 i386 RPM - ImageMagick-6.6.8-9.x86_64.rpm - download - download + ImageMagick-6.6.8-10.x86_64.rpm + download + download CentOS 5.4 x86_64 RPM @@ -265,7 +265,7 @@

ImageMagick RPM's are self-installing. Simply type the following command and you're ready to start using ImageMagick:

-

$magick> rpm -Uvh ImageMagick-6.6.8-9.i386.rpm

+

$magick> rpm -Uvh ImageMagick-6.6.8-10.i386.rpm

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

$magick> cd $HOME

@@ -331,7 +331,7 @@

Set the DYLD_LIBRARY_PATH environment variable:

-

$magick> export DYLD_LIBRARY_PATH="$MAGICK_HOME/lib"

+

$magick> export DYLD_LIBRARY_PATH="$MAGICK_HOME/lib/"

Finally, to verify ImageMagick is working properly, type the following on the command line:

$magick> convert logo: logo.gif $magick> identify logo.gif $magick> display logo.gif

@@ -365,7 +365,7 @@ 
 	./imagemagick_compile.sh VERSION
-

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

+

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

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