From 87a7f073fd2c81e224b64b3edefa3764cd7fc3ae Mon Sep 17 00:00:00 2001 From: cristy Date: Fri, 1 Jul 2011 00:08:52 +0000 Subject: [PATCH] --- ImageMagick.spec | 4 +- Magick++/bin/Magick++-config | 2 +- Magick++/lib/ImageMagick++.pc | 2 +- PerlMagick/Magick.pm | 2 +- PerlMagick/Makefile.PL | 2 +- config/ImageMagick.rdf | 2 +- config/configure.xml | 14 ++-- configure.ac | 2 +- index.html | 7 +- libtool | 2 +- magick/ImageMagick.pc | 2 +- magick/Magick-config | 2 +- magick/magick-config.h | 16 ++--- magick/version.h | 6 +- version.sh | 8 +-- wand/Wand-config | 2 +- wand/Wand.pc | 2 +- www/ImageMagickObject.html | 5 +- www/advanced-unix-installation.html | 11 ++- www/advanced-windows-installation.html | 7 +- www/animate.html | 5 +- www/api.html | 3 - www/api/animate.html | 5 +- www/api/annotate.html | 5 +- www/api/attribute.html | 5 +- www/api/blob.html | 5 +- www/api/cache-view.html | 5 +- www/api/cache.html | 5 +- www/api/cipher.html | 5 +- www/api/color.html | 5 +- www/api/colormap.html | 5 +- www/api/compare.html | 5 +- www/api/composite.html | 5 +- www/api/constitute.html | 5 +- www/api/decorate.html | 5 +- www/api/deprecate.html | 3 - www/api/display.html | 5 +- www/api/distort.html | 5 +- www/api/draw.html | 5 +- www/api/drawing-wand.html | 5 +- www/api/effect.html | 5 +- www/api/enhance.html | 5 +- www/api/exception.html | 5 +- www/api/feature.html | 5 +- www/api/fourier.html | 5 +- www/api/fx.html | 5 +- www/api/histogram.html | 3 - www/api/image-view.html | 5 +- www/api/image.html | 5 +- www/api/layer.html | 3 - www/api/list.html | 5 +- www/api/magick-deprecate.html | 5 +- www/api/magick-image.html | 5 +- www/api/magick-property.html | 5 +- www/api/magick-wand.html | 5 +- www/api/magick.html | 5 +- www/api/memory.html | 5 +- www/api/module.html | 5 +- www/api/mogrify.html | 10 +-- www/api/monitor.html | 5 +- www/api/montage.html | 5 +- www/api/morphology.html | 5 +- www/api/paint.html | 5 +- www/api/pixel-iterator.html | 5 +- www/api/pixel-wand.html | 5 +- www/api/profile.html | 5 +- www/api/property.html | 5 +- www/api/quantize.html | 5 +- www/api/registry.html | 5 +- www/api/resize.html | 5 +- www/api/resource.html | 5 +- www/api/segment.html | 5 +- www/api/shear.html | 5 +- www/api/signature.html | 5 +- www/api/statistic.html | 5 +- www/api/stream.html | 5 +- www/api/transform.html | 5 +- www/api/version.html | 5 +- www/api/wand-view.html | 5 +- www/architecture.html | 7 +- www/binary-releases.html | 59 ++++++++-------- www/changelog.html | 14 ++-- www/cipher.html | 5 +- www/color.html | 3 - www/command-line-options.html | 57 ++++++++++++--- www/command-line-processing.html | 5 +- www/command-line-tools.html | 5 +- www/compare.html | 5 +- www/compose.html | 5 +- www/composite.html | 5 +- www/conjure.html | 5 +- www/contact.html | 5 +- www/convert.html | 5 +- www/display.html | 5 +- www/download.html | 7 +- www/escape.html | 3 - www/examples.html | 5 +- www/exception.html | 5 +- www/export.html | 5 +- www/formats.html | 5 +- www/fx.html | 5 +- www/high-dynamic-range.html | 5 +- www/identify.html | 7 +- www/import.html | 5 +- www/index.html | 7 +- www/install-source.html | 5 +- www/jp2.html | 5 +- www/license.html | 5 +- www/links.html | 5 +- www/magick++.html | 5 +- www/magick-core.html | 5 +- www/magick-vector-graphics.html | 5 +- www/magick-wand.html | 3 - www/miff.html | 5 +- www/mogrify.html | 5 +- www/montage.html | 5 +- www/motion-picture.html | 5 +- www/perl-magick.html | 5 +- www/porting.html | 98 +++++++++++++++++++------- www/quantize.html | 5 +- www/resources.html | 5 +- www/search.html | 5 +- www/sitemap.html | 5 +- www/sponsors.html | 8 +-- www/stream.html | 5 +- www/subversion.html | 5 +- www/t-shirt.html | 5 +- 127 files changed, 301 insertions(+), 544 deletions(-) diff --git a/ImageMagick.spec b/ImageMagick.spec index 92ae3f0cf..b3ac424f0 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,5 +1,5 @@ -%global VERSION 6.7.0 -%global Patchlevel 10 +%global VERSION 6.7.1 +%global Patchlevel 0 Name: ImageMagick Version: %{VERSION} diff --git a/Magick++/bin/Magick++-config b/Magick++/bin/Magick++-config index 1f392380c..e8df6ce4e 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.7.0 Q16 ' + echo '6.7.1 Q16 ' ;; --cflags) echo "-I${includedir} -fopenmp" diff --git a/Magick++/lib/ImageMagick++.pc b/Magick++/lib/ImageMagick++.pc index c735b778e..89d867935 100644 --- a/Magick++/lib/ImageMagick++.pc +++ b/Magick++/lib/ImageMagick++.pc @@ -5,7 +5,7 @@ includedir=${prefix}/include/ImageMagick Name: ImageMagick++ -Version: 6.7.0 +Version: 6.7.1 Description: Magick++ - C++ API for ImageMagick Requires: ImageMagick Libs: -L${libdir} -lMagick++ diff --git a/PerlMagick/Magick.pm b/PerlMagick/Magick.pm index f2e14a02c..993825c17 100644 --- a/PerlMagick/Magick.pm +++ b/PerlMagick/Magick.pm @@ -30,7 +30,7 @@ require AutoLoader; ConfigureError FatalErrorException ); -$VERSION = '6.7.0'; +$VERSION = '6.7.1'; sub AUTOLOAD { # This AUTOLOAD is used to 'autoload' constants from the constant() diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL index 17cd3f73c..0d90a576b 100644 --- a/PerlMagick/Makefile.PL +++ b/PerlMagick/Makefile.PL @@ -189,7 +189,7 @@ WriteMakefile 'AUTHOR' => 'ImageMagick Studio LLC', # Module version - 'VERSION' => '6.7.0', + 'VERSION' => '6.7.1', # 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 70337e1b7..4124d618c 100644 --- a/config/ImageMagick.rdf +++ b/config/ImageMagick.rdf @@ -97,7 +97,7 @@ stable 2010-12-01 - 6.7.0 + 6.7.1 diff --git a/config/configure.xml b/config/configure.xml index ae02ec045..ed6267c0b 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -7,21 +7,21 @@ ]> - - - + + + - + - - - + + + diff --git a/configure.ac b/configure.ac index 96720fb90..deb671582 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], [7]) -m4_define([magick_micro_version], [0]) +m4_define([magick_micro_version], [1]) m4_define([magick_version], [magick_major_version.magick_minor_version.magick_micro_version]) m4_define([magick_svn_revision], esyscmd([sh -c "svnversion | sed -r 's/([0-9]+).*/\1/'"])) diff --git a/index.html b/index.html index cb537a44b..9098b0ced 100644 --- a/index.html +++ b/index.html @@ -193,14 +193,11 @@ - @@ -227,7 +224,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.7.0-9.

+

The current release is ImageMagick 6.7.0-10.

diff --git a/libtool b/libtool index 514c58d2b..004342591 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.7.0-10 +# Generated automatically by config.status (ImageMagick) 6.7.1-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 090a8742a..d6922a923 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.7.0 +Version: 6.7.1 Libs: -L${libdir} -lMagickCore Cflags: -I${includedir} -fopenmp diff --git a/magick/Magick-config b/magick/Magick-config index 42bea3bcd..ea8b4c966 100755 --- a/magick/Magick-config +++ b/magick/Magick-config @@ -37,7 +37,7 @@ while test $# -gt 0; do echo $exec_prefix ;; --version) - echo '6.7.0 Q16 ' + echo '6.7.1 Q16 ' ;; --cflags) echo "-I${includedir} -fopenmp" diff --git a/magick/magick-config.h b/magick/magick-config.h index 79a94b40c..970402232 100644 --- a/magick/magick-config.h +++ b/magick/magick-config.h @@ -34,12 +34,12 @@ /* Location of coder modules */ #ifndef MAGICKCORE_CODER_PATH -#define MAGICKCORE_CODER_PATH "/usr/local/lib/ImageMagick-6.7.0/modules-Q16/coders/" +#define MAGICKCORE_CODER_PATH "/usr/local/lib/ImageMagick-6.7.1/modules-Q16/coders/" #endif /* Subdirectory of lib where coder modules are installed */ #ifndef MAGICKCORE_CODER_RELATIVE_PATH -#define MAGICKCORE_CODER_RELATIVE_PATH "ImageMagick-6.7.0/modules-Q16/coders" +#define MAGICKCORE_CODER_RELATIVE_PATH "ImageMagick-6.7.1/modules-Q16/coders" #endif /* Directory where architecture-dependent configuration files live. */ @@ -80,12 +80,12 @@ /* Location of filter modules */ #ifndef MAGICKCORE_FILTER_PATH -#define MAGICKCORE_FILTER_PATH "/usr/local/lib/ImageMagick-6.7.0/modules-Q16/filters/" +#define MAGICKCORE_FILTER_PATH "/usr/local/lib/ImageMagick-6.7.1/modules-Q16/filters/" #endif /* Subdirectory of lib where filter modules are installed */ #ifndef MAGICKCORE_FILTER_RELATIVE_PATH -#define MAGICKCORE_FILTER_RELATIVE_PATH "ImageMagick-6.7.0/modules-Q16/filters" +#define MAGICKCORE_FILTER_RELATIVE_PATH "ImageMagick-6.7.1/modules-Q16/filters" #endif /* Define if you have FONTCONFIG library */ @@ -1165,13 +1165,13 @@ /* Directory where architecture-dependent files live. */ #ifndef MAGICKCORE_LIBRARY_PATH -#define MAGICKCORE_LIBRARY_PATH "/usr/local/lib/ImageMagick-6.7.0/" +#define MAGICKCORE_LIBRARY_PATH "/usr/local/lib/ImageMagick-6.7.1/" #endif /* Subdirectory of lib where ImageMagick architecture dependent files are installed */ #ifndef MAGICKCORE_LIBRARY_RELATIVE_PATH -#define MAGICKCORE_LIBRARY_RELATIVE_PATH "ImageMagick-6.7.0" +#define MAGICKCORE_LIBRARY_RELATIVE_PATH "ImageMagick-6.7.1" #endif /* Define if you have LQR library */ @@ -1312,13 +1312,13 @@ /* Directory where architecture-independent configuration files live. */ #ifndef MAGICKCORE_SHARE_PATH -#define MAGICKCORE_SHARE_PATH "/usr/local/share/ImageMagick-6.7.0/" +#define MAGICKCORE_SHARE_PATH "/usr/local/share/ImageMagick-6.7.1/" #endif /* Subdirectory of lib where architecture-independent configuration files live. */ #ifndef MAGICKCORE_SHARE_RELATIVE_PATH -#define MAGICKCORE_SHARE_RELATIVE_PATH "ImageMagick-6.7.0" +#define MAGICKCORE_SHARE_RELATIVE_PATH "ImageMagick-6.7.1" #endif /* The size of `off_t', as computed by sizeof. */ diff --git a/magick/version.h b/magick/version.h index f4d575f5c..9e91fb3da 100644 --- a/magick/version.h +++ b/magick/version.h @@ -28,10 +28,10 @@ extern "C" { #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2011 ImageMagick Studio LLC" #define MagickSVNRevision "4660" -#define MagickLibVersion 0x670 -#define MagickLibVersionText "6.7.0" +#define MagickLibVersion 0x671 +#define MagickLibVersionText "6.7.1" #define MagickLibVersionNumber 4,0,1 -#define MagickLibAddendum "-10" +#define MagickLibAddendum "-0" #define MagickLibInterface 4 #define MagickLibMinInterface 4 #define MagickReleaseDate "2011-06-30" diff --git a/version.sh b/version.sh index c26fb7b1e..c21686d0d 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.7.0' -PACKAGE_LIB_VERSION="0x670" -PACKAGE_RELEASE="10" -PACKAGE_LIB_VERSION_NUMBER="6,7,0,${PACKAGE_RELEASE}" +PACKAGE_VERSION='6.7.1' +PACKAGE_LIB_VERSION="0x671" +PACKAGE_RELEASE="0" +PACKAGE_LIB_VERSION_NUMBER="6,7,1,${PACKAGE_RELEASE}" PACKAGE_RELEASE_DATE=`date +%F` PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION" diff --git a/wand/Wand-config b/wand/Wand-config index 09d5c78c7..cd24d7f1c 100755 --- a/wand/Wand-config +++ b/wand/Wand-config @@ -37,7 +37,7 @@ while test $# -gt 0; do echo $exec_prefix ;; --version) - echo '6.7.0 Q16 ' + echo '6.7.1 Q16 ' ;; --cflags) echo "-I${includedir} -fopenmp" diff --git a/wand/Wand.pc b/wand/Wand.pc index 8f365d42e..3d3523593 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.7.0 +Version: 6.7.1 Description: MagickWand - C API for ImageMagick Requires: ImageMagick Libs: -L${libdir} -lMagickWand -lMagickCore diff --git a/www/ImageMagickObject.html b/www/ImageMagickObject.html index 6ce9e5f43..ffb13c254 100644 --- a/www/ImageMagickObject.html +++ b/www/ImageMagickObject.html @@ -194,14 +194,11 @@ - diff --git a/www/advanced-unix-installation.html b/www/advanced-unix-installation.html index cb399e532..573d8e3b0 100644 --- a/www/advanced-unix-installation.html +++ b/www/advanced-unix-installation.html @@ -193,14 +193,11 @@ - @@ -239,7 +236,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.7.0-9 $magick> ./configure

+

$magick> cd ImageMagick-6.7.0-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:

@@ -591,7 +588,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.7.0-9.tar.gz $magick> cd ImageMagick-6.7.0-9

Configure ImageMagick:

+

$magick> tar xvfz ImageMagick-6.7.0-10.tar.gz $magick> cd ImageMagick-6.7.0-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/ \
@@ -611,7 +608,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.7.0-?.tar.bz2 $magick> cd ImageMagick-6.7.0-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.7.0-?.tar.bz2 $magick> cd ImageMagick-6.7.0-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 c46a9a6fe..291e50fe1 100644 --- a/www/advanced-windows-installation.html +++ b/www/advanced-windows-installation.html @@ -193,14 +193,11 @@ -
@@ -491,7 +488,7 @@
  1. Double-click on - VisualMagick/bin/ImageMagick-6.7.0-9-Q16-windows-dll.exe + VisualMagick/bin/ImageMagick-6.7.0-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 2b39e0a90..9bc7000ae 100644 --- a/www/animate.html +++ b/www/animate.html @@ -194,14 +194,11 @@ - diff --git a/www/api.html b/www/api.html index a02ee0b6f..4b68ad022 100644 --- a/www/api.html +++ b/www/api.html @@ -193,9 +193,6 @@ - diff --git a/www/api/animate.html b/www/api/animate.html index 2ae22fb86..6c98c90cf 100644 --- a/www/api/animate.html +++ b/www/api/animate.html @@ -193,14 +193,11 @@ - diff --git a/www/api/annotate.html b/www/api/annotate.html index 98c1b914d..704fc864e 100644 --- a/www/api/annotate.html +++ b/www/api/annotate.html @@ -193,14 +193,11 @@ - diff --git a/www/api/attribute.html b/www/api/attribute.html index 197d22f61..571afbb6b 100644 --- a/www/api/attribute.html +++ b/www/api/attribute.html @@ -193,14 +193,11 @@ - diff --git a/www/api/blob.html b/www/api/blob.html index 54ca8cb7e..2a7a11d00 100644 --- a/www/api/blob.html +++ b/www/api/blob.html @@ -193,14 +193,11 @@ - diff --git a/www/api/cache-view.html b/www/api/cache-view.html index f1a75b29f..3bacc871e 100644 --- a/www/api/cache-view.html +++ b/www/api/cache-view.html @@ -193,14 +193,11 @@ - diff --git a/www/api/cache.html b/www/api/cache.html index f631fa597..9a588df75 100644 --- a/www/api/cache.html +++ b/www/api/cache.html @@ -193,14 +193,11 @@ - diff --git a/www/api/cipher.html b/www/api/cipher.html index 2f161b622..690f69391 100644 --- a/www/api/cipher.html +++ b/www/api/cipher.html @@ -193,14 +193,11 @@ - diff --git a/www/api/color.html b/www/api/color.html index c82c8d945..442fb6c2f 100644 --- a/www/api/color.html +++ b/www/api/color.html @@ -193,14 +193,11 @@ - diff --git a/www/api/colormap.html b/www/api/colormap.html index 5e3e8451a..576190581 100644 --- a/www/api/colormap.html +++ b/www/api/colormap.html @@ -193,14 +193,11 @@ - diff --git a/www/api/compare.html b/www/api/compare.html index e8fb65246..9aba24f0a 100644 --- a/www/api/compare.html +++ b/www/api/compare.html @@ -193,14 +193,11 @@ - diff --git a/www/api/composite.html b/www/api/composite.html index d34145307..ac340530a 100644 --- a/www/api/composite.html +++ b/www/api/composite.html @@ -193,14 +193,11 @@ - diff --git a/www/api/constitute.html b/www/api/constitute.html index 1e6586e6a..de41043d9 100644 --- a/www/api/constitute.html +++ b/www/api/constitute.html @@ -193,14 +193,11 @@ - diff --git a/www/api/decorate.html b/www/api/decorate.html index 5236d40b5..c842bde51 100644 --- a/www/api/decorate.html +++ b/www/api/decorate.html @@ -193,14 +193,11 @@ - diff --git a/www/api/deprecate.html b/www/api/deprecate.html index 3040aa4ee..278edc691 100644 --- a/www/api/deprecate.html +++ b/www/api/deprecate.html @@ -193,9 +193,6 @@ - diff --git a/www/api/display.html b/www/api/display.html index ce88597a4..fc10de284 100644 --- a/www/api/display.html +++ b/www/api/display.html @@ -193,14 +193,11 @@ - diff --git a/www/api/distort.html b/www/api/distort.html index 642bc5808..c19168e92 100644 --- a/www/api/distort.html +++ b/www/api/distort.html @@ -193,14 +193,11 @@ - diff --git a/www/api/draw.html b/www/api/draw.html index 0e3107ff4..e34c83318 100644 --- a/www/api/draw.html +++ b/www/api/draw.html @@ -193,14 +193,11 @@ - diff --git a/www/api/drawing-wand.html b/www/api/drawing-wand.html index 2bb2c44e8..b920ce68e 100644 --- a/www/api/drawing-wand.html +++ b/www/api/drawing-wand.html @@ -193,14 +193,11 @@ - diff --git a/www/api/effect.html b/www/api/effect.html index c0f307d1d..f0b94cab7 100644 --- a/www/api/effect.html +++ b/www/api/effect.html @@ -193,14 +193,11 @@ - diff --git a/www/api/enhance.html b/www/api/enhance.html index 1287e16f4..8c28f90bf 100644 --- a/www/api/enhance.html +++ b/www/api/enhance.html @@ -193,14 +193,11 @@ - diff --git a/www/api/exception.html b/www/api/exception.html index 07ffb13ee..163816125 100644 --- a/www/api/exception.html +++ b/www/api/exception.html @@ -193,14 +193,11 @@ - diff --git a/www/api/feature.html b/www/api/feature.html index 6fb367daf..70fcd2e75 100644 --- a/www/api/feature.html +++ b/www/api/feature.html @@ -193,14 +193,11 @@ - diff --git a/www/api/fourier.html b/www/api/fourier.html index a2c446798..d3d6190cc 100644 --- a/www/api/fourier.html +++ b/www/api/fourier.html @@ -193,14 +193,11 @@ - diff --git a/www/api/fx.html b/www/api/fx.html index 6c4544937..d2c689eb1 100644 --- a/www/api/fx.html +++ b/www/api/fx.html @@ -193,14 +193,11 @@ - diff --git a/www/api/histogram.html b/www/api/histogram.html index 0f8347cf9..30ee8511d 100644 --- a/www/api/histogram.html +++ b/www/api/histogram.html @@ -193,9 +193,6 @@ - diff --git a/www/api/image-view.html b/www/api/image-view.html index 07fc19162..ec8fb2cf3 100644 --- a/www/api/image-view.html +++ b/www/api/image-view.html @@ -193,14 +193,11 @@ - diff --git a/www/api/image.html b/www/api/image.html index eab93ee64..4de729c51 100644 --- a/www/api/image.html +++ b/www/api/image.html @@ -193,14 +193,11 @@ - diff --git a/www/api/layer.html b/www/api/layer.html index c703b642d..52b54d432 100644 --- a/www/api/layer.html +++ b/www/api/layer.html @@ -193,9 +193,6 @@ - diff --git a/www/api/list.html b/www/api/list.html index 3ec0dfce9..0451801bd 100644 --- a/www/api/list.html +++ b/www/api/list.html @@ -193,14 +193,11 @@ - diff --git a/www/api/magick-deprecate.html b/www/api/magick-deprecate.html index f6102ab99..58ee905f5 100644 --- a/www/api/magick-deprecate.html +++ b/www/api/magick-deprecate.html @@ -193,14 +193,11 @@ - diff --git a/www/api/magick-image.html b/www/api/magick-image.html index 461d2c2fb..c44561a49 100644 --- a/www/api/magick-image.html +++ b/www/api/magick-image.html @@ -193,14 +193,11 @@ - diff --git a/www/api/magick-property.html b/www/api/magick-property.html index 35d1d6a54..1bd585c34 100644 --- a/www/api/magick-property.html +++ b/www/api/magick-property.html @@ -193,14 +193,11 @@ - diff --git a/www/api/magick-wand.html b/www/api/magick-wand.html index e1ad8010c..d819c7bf9 100644 --- a/www/api/magick-wand.html +++ b/www/api/magick-wand.html @@ -193,14 +193,11 @@ - diff --git a/www/api/magick.html b/www/api/magick.html index f6a01225a..6984100b4 100644 --- a/www/api/magick.html +++ b/www/api/magick.html @@ -193,14 +193,11 @@ - diff --git a/www/api/memory.html b/www/api/memory.html index 2143ec0bd..16a567e85 100644 --- a/www/api/memory.html +++ b/www/api/memory.html @@ -193,14 +193,11 @@ - diff --git a/www/api/module.html b/www/api/module.html index 6e75ef0ec..e44d81998 100644 --- a/www/api/module.html +++ b/www/api/module.html @@ -193,14 +193,11 @@ - diff --git a/www/api/mogrify.html b/www/api/mogrify.html index d3c36bffc..c812461fe 100644 --- a/www/api/mogrify.html +++ b/www/api/mogrify.html @@ -193,9 +193,6 @@ - @@ -215,7 +212,7 @@

Module mogrify Methods

-

[MagickCommandGenesis • ** GetImageCache • ** SparseColorOption]

+

[MagickCommandGenesis • ** SparseColorOption]

MagickCommandGenesis

@@ -250,11 +247,6 @@
exception

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

diff --git a/www/api/monitor.html b/www/api/monitor.html index 127eebafb..0280f55ee 100644 --- a/www/api/monitor.html +++ b/www/api/monitor.html @@ -193,14 +193,11 @@ -
diff --git a/www/api/montage.html b/www/api/montage.html index 744ec0782..9aff04eb7 100644 --- a/www/api/montage.html +++ b/www/api/montage.html @@ -193,14 +193,11 @@ - diff --git a/www/api/morphology.html b/www/api/morphology.html index abcf17515..f95fb364e 100644 --- a/www/api/morphology.html +++ b/www/api/morphology.html @@ -193,14 +193,11 @@ - diff --git a/www/api/paint.html b/www/api/paint.html index 24c68c839..77d010658 100644 --- a/www/api/paint.html +++ b/www/api/paint.html @@ -193,14 +193,11 @@ - diff --git a/www/api/pixel-iterator.html b/www/api/pixel-iterator.html index 9696a9dbf..a90f6ee18 100644 --- a/www/api/pixel-iterator.html +++ b/www/api/pixel-iterator.html @@ -193,14 +193,11 @@ - diff --git a/www/api/pixel-wand.html b/www/api/pixel-wand.html index 668400da7..3f1f38d82 100644 --- a/www/api/pixel-wand.html +++ b/www/api/pixel-wand.html @@ -193,14 +193,11 @@ - diff --git a/www/api/profile.html b/www/api/profile.html index 47f0c591b..e352e6e7c 100644 --- a/www/api/profile.html +++ b/www/api/profile.html @@ -193,14 +193,11 @@ - diff --git a/www/api/property.html b/www/api/property.html index 97582077a..96d1d5550 100644 --- a/www/api/property.html +++ b/www/api/property.html @@ -193,14 +193,11 @@ - diff --git a/www/api/quantize.html b/www/api/quantize.html index 665783895..e93ab1869 100644 --- a/www/api/quantize.html +++ b/www/api/quantize.html @@ -193,14 +193,11 @@ - diff --git a/www/api/registry.html b/www/api/registry.html index c0b477f65..7518f92d7 100644 --- a/www/api/registry.html +++ b/www/api/registry.html @@ -193,14 +193,11 @@ - diff --git a/www/api/resize.html b/www/api/resize.html index 44c0f0cbd..bebc48903 100644 --- a/www/api/resize.html +++ b/www/api/resize.html @@ -193,14 +193,11 @@ - diff --git a/www/api/resource.html b/www/api/resource.html index 40e56a297..62f96f5c6 100644 --- a/www/api/resource.html +++ b/www/api/resource.html @@ -193,14 +193,11 @@ - diff --git a/www/api/segment.html b/www/api/segment.html index 21fcb6031..b63bbee71 100644 --- a/www/api/segment.html +++ b/www/api/segment.html @@ -193,14 +193,11 @@ - diff --git a/www/api/shear.html b/www/api/shear.html index 0e5d594e6..92b5a5b91 100644 --- a/www/api/shear.html +++ b/www/api/shear.html @@ -193,14 +193,11 @@ - diff --git a/www/api/signature.html b/www/api/signature.html index e1f2e91bb..4bc900d80 100644 --- a/www/api/signature.html +++ b/www/api/signature.html @@ -193,14 +193,11 @@ - diff --git a/www/api/statistic.html b/www/api/statistic.html index 9864720c0..cfbab6bd2 100644 --- a/www/api/statistic.html +++ b/www/api/statistic.html @@ -193,14 +193,11 @@ - diff --git a/www/api/stream.html b/www/api/stream.html index 2ebef4516..739a3a8b4 100644 --- a/www/api/stream.html +++ b/www/api/stream.html @@ -193,14 +193,11 @@ - diff --git a/www/api/transform.html b/www/api/transform.html index 6b26ec126..6bb174cd6 100644 --- a/www/api/transform.html +++ b/www/api/transform.html @@ -193,14 +193,11 @@ - diff --git a/www/api/version.html b/www/api/version.html index 0a3f41661..df226d4c4 100644 --- a/www/api/version.html +++ b/www/api/version.html @@ -193,14 +193,11 @@ - diff --git a/www/api/wand-view.html b/www/api/wand-view.html index fbd3b8394..7d8ab6cca 100644 --- a/www/api/wand-view.html +++ b/www/api/wand-view.html @@ -193,14 +193,11 @@ - diff --git a/www/architecture.html b/www/architecture.html index c7f31462a..cae737989 100644 --- a/www/architecture.html +++ b/www/architecture.html @@ -193,14 +193,11 @@ - @@ -306,7 +303,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.7.0-9 2011-06-03 Q16 http://www.imagemagick.org

+

$magick> identify -versionVersion: ImageMagick 6.7.0-10 2011-06-03 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 bcd2846b5..4abce6a7d 100644 --- a/www/binary-releases.html +++ b/www/binary-releases.html @@ -193,14 +193,11 @@ - @@ -237,16 +234,16 @@ - ImageMagick-6.7.0-9.i386.rpm - download - download + ImageMagick-6.7.0-10.i386.rpm + download + download CentOS 5.4 i386 RPM - ImageMagick-6.7.0-9.x86_64.rpm - download - download + ImageMagick-6.7.0-10.x86_64.rpm + download + download CentOS 5.4 x86_64 RPM @@ -283,7 +280,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.7.0-9.i386.rpm

+

$magick> rpm -Uvh ImageMagick-6.7.0-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

@@ -383,7 +380,7 @@ 
 	./imagemagick_compile.sh VERSION
-

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

+

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

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

    @@ -422,7 +419,7 @@

    The amount of memory can be an important factor, especially if you intend to work on large images. A minimum of 512 MB of RAM is recommended, but the more RAM the better. Although ImageMagick runs well on a single core computer, it automagically runs in parallel on multi-core systems reducing run times considerably.

    The Windows version of ImageMagick is self-installing. Simply click on the appropriate version below and it will launch itself and ask you a few installation questions. Versions with Q8 in the name are 8 bits-per-pixel component (e.g. 8-bit red, 8-bit green, etc.), whereas, Q16 in the filename are 16 bits-per-pixel component. A Q16 version permits you to read or write 16-bit images without losing precision but requires twice as much resources as the Q8 version. Versions with dll in the filename include ImageMagick libraries as dynamic link libraries. If you are not sure which version is appropriate, choose -ImageMagick-6.7.0-9-Q16-windows-dll.exe.

    +ImageMagick-6.7.0-10-Q16-windows-dll.exe.

    @@ -434,44 +431,44 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + diff --git a/www/changelog.html b/www/changelog.html index 7bffdbde1..2362ff529 100644 --- a/www/changelog.html +++ b/www/changelog.html @@ -193,14 +193,11 @@ - @@ -215,7 +212,14 @@

    ImageMagick Changelog

    -
    2011-06-25 6.7.0-9 Cristy <quetzlzacatenango@image...>
    +
    2011-06-30 6.7.0-10 Cristy <quetzlzacatenango@image...>
    +
    New version 6.7.0-10.
    +
    2011-06-29 6.7.0-7 Glenn Randers-Pehrson <glennrp@image...>
    +
    Handle "-quality 97" properly in the png encoder, .e., to use intrapixel filtering when writing a MNG file. and no filtering when writing a PNG file.
    +
    Added support for Z_RLE strategy in the png compressor, using -quality 98 or 99.
    +
    2011-06-28 6.7.0-10 Cristy <quetzlzacatenango@image...>
    +
    Properly allocate points when render text with large font size (reference http://www.imagemagick.org/discourse-server/viewtopic.html?f=3&t=18997).
    +
    2011-06-25 6.7.0-9 Cristy <quetzlzacatenango@image...>
    New version 6.7.0-9.
    2011-06-18 6.7.0-9 Cristy <quetzlzacatenango@image...>
    Defend against corrupt PSD resource blocks.
    diff --git a/www/cipher.html b/www/cipher.html index 0df93ba0d..81dd8f895 100644 --- a/www/cipher.html +++ b/www/cipher.html @@ -194,14 +194,11 @@ -
    diff --git a/www/color.html b/www/color.html index a00413100..215240791 100644 --- a/www/color.html +++ b/www/color.html @@ -194,9 +194,6 @@ - diff --git a/www/command-line-options.html b/www/command-line-options.html index 0e8bab667..339bd7742 100644 --- a/www/command-line-options.html +++ b/www/command-line-options.html @@ -197,14 +197,11 @@ - @@ -1753,6 +1750,19 @@ available:

    which can be 1, 2, 4, or 8. In such files, the color samples always have 8-bit depth. +
    png:compression-level=value
    +
    valid values are 0 through 9, with 0 providing the least but fastest + compression and 9 usually providing the best and always the slowest.
    + +
    png:compression-strategy=value
    +
    valid values are 0 through 4, meaning default, filtered, huffman_only, + rle, and fixed ZLIB compression strategy.
    + +
    png:compression-filter=value
    +
    valid values are 0 through 7. 0-4 are the corresponding PNG filters, + 5 means adaptive filtering except for images with a colormap, 6 means + adaptive filtering for all images, 7 means MNG "loco" compression.
    +
    png:exclude-chunk=value
    png:include-chunk=value
    ancillary chunks to be excluded from or included in PNG output. @@ -4878,13 +4888,25 @@ CMYK profiles are often very asymmetric since they involve 3−>4 and 4&m
    ImageMagick-6.7.0-9-Q16-windows-dll.exedownloaddownloadImageMagick-6.7.0-10-Q16-windows-dll.exedownloaddownload Win32 dynamic at 16 bits-per-pixel
    ImageMagick-6.7.0-9-Q16-windows-static.exedownloaddownloadImageMagick-6.7.0-10-Q16-windows-static.exedownloaddownload Win32 static at 16 bits-per-pixel
    ImageMagick-6.7.0-9-Q8-windows-dll.exedownloaddownloadImageMagick-6.7.0-10-Q8-windows-dll.exedownloaddownload Win32 dynamic at 8 bits-per-pixel
    ImageMagick-6.7.0-9-Q8-windows-static.exedownloaddownloadImageMagick-6.7.0-10-Q8-windows-static.exedownloaddownload Win32 static at 8 bits-per-pixel
    ImageMagick-6.7.0-9-Q16-windows-x64-dll.exedownloaddownloadImageMagick-6.7.0-10-Q16-windows-x64-dll.exedownloaddownload Win64 dynamic at 16 bits-per-pixel
    ImageMagick-6.7.0-9-Q16-windows-x64-static.exedownloaddownloadImageMagick-6.7.0-10-Q16-windows-x64-static.exedownloaddownload Win64 static at 16 bits-per-pixel
    JPEG/MIFF/PNG compression level.
    -

    For the JPEG and MPEG image formats, quality is 1 (lowest image quality and highest compression) to 100 (best quality but least effective compression). The default is to use the estimate quality of your input image otherwise 92. Use the -sampling-factor option to specify the factors for chroma downsampling.

    +

    For the JPEG and MPEG image formats, quality is 1 (lowest image quality and +highest compression) to 100 (best quality but least effective compression). +The default is to use the estimated quality of your input image if it can +be determined, otherwise 92. When the quality is greater than 90, then the +chroma channels are not downsampled. +Use the -sampling-factor option to specify the +factors for chroma downsampling.

    For the MIFF image format, quality/10 is the zlib compression level, which is 0 (worst but fastest compression) to 9 (best but slowest). It has no effect on the image appearance, since the compression is always lossless.

    For the JPEG-2000 image format, quality is mapped using a non-linear equation to the compression ratio required by the Jasper library. This non-linear equation is intended to loosely approximate the quality provided by the JPEG v1 format. The default quality value 100, a request for non-lossy compression. A quality of 75 results in a request for 16:1 compression.

    -

    For the MNG and PNG image formats, the quality value sets the zlib compression level (quality / 10) and filter-type (quality % 10). For compression level 0, the Huffman-only strategy is used, which is fastest but not necessarily the worst compression. The default PNG compression is 75.

    +

    For the MNG and PNG image formats, the quality value sets the zlib +compression level (quality / 10) and filter-type (quality % 10). The default +PNG "quality" is 75, which means compression level 7 with adaptive PNG +filtering, unless the image has a color map, in which case it means +compression level 7 with no PNG filtering.

    + +

    For compression level 0, the Huffman-only strategy is used, which is fastest but not necessarily the worst compression.

    If filter-type is 4 or less, the specified filter-type is used for all scanlines:

    @@ -4896,15 +4918,28 @@ CMYK profiles are often very asymmetric since they involve 3−>4 and 4&m 4: Paeth -

    If filter-type is 5, adaptive filtering is used when quality is greater than 50 and the image does not have a color map, otherwise no filtering is used.

    +

    If filter-type is 5, adaptive filtering is used when quality is greater +than 50 and the image does not have a color map, otherwise no filtering is +used.

    + +

    If filter-type is 6, adaptive filtering +with minimum-sum-of-absolute-values is used.

    + +

    Only if the output is MNG, if filter-type is 7, the LOCO color +transformation (intrapixel differencing) and adaptive filtering +with minimum-sum-of-absolute-values are used.

    -

    If filter-type is 6, adaptive filtering with minimum-sum-of-absolute-values is used.

    +

    If the filter-type is 8 the zlib Z_RLE compression strategy is used with + no PNG filtering.

    -

    Only if the output is MNG, if filter-type is 7, the LOCO color transformation and adaptive filtering with minimum-sum-of-absolute-values are used.

    +

    If the filter-type is 9 the zlib Z_RLE compression strategy is used with + adaptive PNG filtering.

    -

    The quality setting has no effect on the appearance of PNG and MNG images, since the compression is always lossless.

    +

    The quality setting has no effect on the appearance of PNG and MNG images, +since the compression is always lossless.

    -

    For further information, see the PNG specification.

    +

    For further information, see +the PNG specification.

    -quantize colorspace

    diff --git a/www/command-line-processing.html b/www/command-line-processing.html index e4439a715..76e94e8ca 100644 --- a/www/command-line-processing.html +++ b/www/command-line-processing.html @@ -193,14 +193,11 @@ -
    diff --git a/www/command-line-tools.html b/www/command-line-tools.html index f7af7f03d..85e36c2f6 100644 --- a/www/command-line-tools.html +++ b/www/command-line-tools.html @@ -193,14 +193,11 @@ - diff --git a/www/compare.html b/www/compare.html index 538ef8eec..d83ecd9a1 100644 --- a/www/compare.html +++ b/www/compare.html @@ -194,14 +194,11 @@ - diff --git a/www/compose.html b/www/compose.html index 515197b3c..8ccb751fe 100644 --- a/www/compose.html +++ b/www/compose.html @@ -194,14 +194,11 @@ - diff --git a/www/composite.html b/www/composite.html index 5c3396805..45c384310 100644 --- a/www/composite.html +++ b/www/composite.html @@ -194,14 +194,11 @@ - diff --git a/www/conjure.html b/www/conjure.html index b73bb23b3..638e1afb9 100644 --- a/www/conjure.html +++ b/www/conjure.html @@ -194,14 +194,11 @@ - diff --git a/www/contact.html b/www/contact.html index 21db30a5a..f95205142 100644 --- a/www/contact.html +++ b/www/contact.html @@ -193,14 +193,11 @@ - diff --git a/www/convert.html b/www/convert.html index b664701ff..02ae3ec83 100644 --- a/www/convert.html +++ b/www/convert.html @@ -194,14 +194,11 @@ - diff --git a/www/display.html b/www/display.html index 8b6ccb8e8..076a1a737 100644 --- a/www/display.html +++ b/www/display.html @@ -194,14 +194,11 @@ - diff --git a/www/download.html b/www/download.html index 4fbbcea1a..803044e8c 100644 --- a/www/download.html +++ b/www/download.html @@ -193,14 +193,11 @@ - @@ -217,7 +214,7 @@

    Download ImageMagick

    ImageMagick source and binary distributions are available from a variety of FTP and Web mirrors around the world listed below. ImageMagick stable and development source releases are also available from Subversion. Before you download, you may want to review recent changes to the ImageMagick distribution.

    -

    The latest release of ImageMagick is version 6.7.0-9.

    +

    The latest release of ImageMagick is version 6.7.0-10.

    Australia
    ftp://mirror.aarnet.edu.au/pub/imagemagick/
    diff --git a/www/escape.html b/www/escape.html index fecb45d89..31b6fba83 100644 --- a/www/escape.html +++ b/www/escape.html @@ -194,9 +194,6 @@ - diff --git a/www/examples.html b/www/examples.html index c613cb8d9..ddac2d435 100644 --- a/www/examples.html +++ b/www/examples.html @@ -193,14 +193,11 @@ -
    diff --git a/www/exception.html b/www/exception.html index 308a2dce8..b4ebf3951 100644 --- a/www/exception.html +++ b/www/exception.html @@ -193,14 +193,11 @@ - diff --git a/www/export.html b/www/export.html index 5a8272f17..7ba06b37c 100644 --- a/www/export.html +++ b/www/export.html @@ -193,14 +193,11 @@ - diff --git a/www/formats.html b/www/formats.html index d446898e1..b7905d1ad 100644 --- a/www/formats.html +++ b/www/formats.html @@ -194,14 +194,11 @@ - diff --git a/www/fx.html b/www/fx.html index 2dddacb2d..2b9fa367c 100644 --- a/www/fx.html +++ b/www/fx.html @@ -194,14 +194,11 @@ - diff --git a/www/high-dynamic-range.html b/www/high-dynamic-range.html index 5488438ed..c06974d6e 100644 --- a/www/high-dynamic-range.html +++ b/www/high-dynamic-range.html @@ -193,14 +193,11 @@ - diff --git a/www/identify.html b/www/identify.html index 5eb49c18f..b1cb5cc50 100644 --- a/www/identify.html +++ b/www/identify.html @@ -193,14 +193,11 @@ - @@ -285,7 +282,7 @@ Tainted: False
    Filesize: 3.97266kb
    Number pixels: 3.14453kb
    - Version: ImageMagick 6.7.0-9 2011-06-03 Q16 http://www.imagemagick.org

    + Version: ImageMagick 6.7.0-10 2011-06-03 Q16 http://www.imagemagick.org

    To get the print size in inches of an image at 72 DPI, use:

    $magick> identify -format "%[fx:w/72] by %[fx:h/72] inches" document.png8.5 x 11 inches

    diff --git a/www/import.html b/www/import.html index 675182c83..16596e65d 100644 --- a/www/import.html +++ b/www/import.html @@ -194,14 +194,11 @@ - diff --git a/www/index.html b/www/index.html index 755c5d660..7d21c4193 100644 --- a/www/index.html +++ b/www/index.html @@ -193,14 +193,11 @@ - @@ -227,7 +224,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.7.0-9.

    +

    The current release is ImageMagick 6.7.0-10.

    diff --git a/www/install-source.html b/www/install-source.html index d66e41547..b4abe36ab 100644 --- a/www/install-source.html +++ b/www/install-source.html @@ -193,14 +193,11 @@ - diff --git a/www/jp2.html b/www/jp2.html index aafea8e29..79742b5a6 100644 --- a/www/jp2.html +++ b/www/jp2.html @@ -194,14 +194,11 @@ - diff --git a/www/license.html b/www/license.html index d7e21316c..1c9b6db90 100644 --- a/www/license.html +++ b/www/license.html @@ -193,14 +193,11 @@ - diff --git a/www/links.html b/www/links.html index f9c2bd5fb..091d02ce9 100644 --- a/www/links.html +++ b/www/links.html @@ -193,14 +193,11 @@ - diff --git a/www/magick++.html b/www/magick++.html index 4e5136c30..ffd0b9e76 100644 --- a/www/magick++.html +++ b/www/magick++.html @@ -194,14 +194,11 @@ - diff --git a/www/magick-core.html b/www/magick-core.html index 693b1136a..fd031891d 100644 --- a/www/magick-core.html +++ b/www/magick-core.html @@ -194,14 +194,11 @@ - diff --git a/www/magick-vector-graphics.html b/www/magick-vector-graphics.html index 93ae1942a..88adfc7e9 100644 --- a/www/magick-vector-graphics.html +++ b/www/magick-vector-graphics.html @@ -193,14 +193,11 @@ - diff --git a/www/magick-wand.html b/www/magick-wand.html index 4c7749cdb..a48ce9356 100644 --- a/www/magick-wand.html +++ b/www/magick-wand.html @@ -194,9 +194,6 @@ - diff --git a/www/miff.html b/www/miff.html index 0ae6d6c54..ec37fee96 100644 --- a/www/miff.html +++ b/www/miff.html @@ -193,14 +193,11 @@ - diff --git a/www/mogrify.html b/www/mogrify.html index dc50b20cf..e066cc438 100644 --- a/www/mogrify.html +++ b/www/mogrify.html @@ -194,14 +194,11 @@ - diff --git a/www/montage.html b/www/montage.html index e79889131..e5ad343c1 100644 --- a/www/montage.html +++ b/www/montage.html @@ -194,14 +194,11 @@ - diff --git a/www/motion-picture.html b/www/motion-picture.html index 2b20cadc6..060bbc3ba 100644 --- a/www/motion-picture.html +++ b/www/motion-picture.html @@ -194,14 +194,11 @@ - diff --git a/www/perl-magick.html b/www/perl-magick.html index b438e9c92..c38ca93d1 100644 --- a/www/perl-magick.html +++ b/www/perl-magick.html @@ -193,14 +193,11 @@ - diff --git a/www/porting.html b/www/porting.html index b3769af8d..70f9cb875 100644 --- a/www/porting.html +++ b/www/porting.html @@ -194,14 +194,11 @@ - @@ -217,7 +214,7 @@

    ImageMagick Version 7 Porting Guide

    -

    [Header Files • Pixel Channels • Alpha • Deprecated Features Removed • Version 7 Change Summary ]

    +

    [Header Files • Pixel Channels • Alpha • Grayscale • Deprecated Features Removed • Version 7 Change Summary ]

    The design of ImageMagick is an evolutionary process, with the design and implementation efforts serving to influence and guide further progress in the other. With ImageMagick version 7 we aim to improve the design based on lessons learned from the version 6 implementation. ImageMagick was originally designed to display RGB images to an X Windows server. Over time we extended support to RGBA images and then to the CMYK and CMYKA image format. With ImageMagick version 7, we extend support to arbitrary colorspaces with an arbitrary number of pixel channels. Other design changes are in the works and we will document them here so be sure to revisit periodically.

    @@ -302,7 +299,7 @@ SetPixelBlack(image,QuantumRange-GetPixelBlack(image,q),q); if ((channels & OpacityChannel) != 0) SetPixelAlpha(image,QuantumRange-GetPixelAlpha(image,q),q); - q+=GetImagePixelChannels(image); + q+=GetPixelChannels(image); } if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse) status=MagickFalse; @@ -323,7 +320,7 @@ continue; } for (x=0; x < (ssize_t) image->columns; x++) - for (channel=0; channel < GetImagePixelChannels(image); channel++) + for (channel=0; channel < GetPixelChannels(image); channel++) { if ((channels & (1 << channel)) != 0) *q=(Quantum) QuantumRange-(*q); @@ -334,31 +331,78 @@ } -

    Use GetImagePixelChannels() to advance to the next set of pixel channels.

    +

    Use GetPixelChannels() to advance to the next set of pixel channels.

    + +

    The colormap indexes and black pixel component (for the CMYK colorspace) are no longer stored in the index channel, previously accessed with GetAuthenticIndexQueue() and GetCacheViewAuthenticIndexQueue((). Instead they are now a pixel channel and accessed with the convenience pixel macros GetPixelIndex(), SetPixelIndex(), GetPixelBlack(), and SetPixelBlack().

    + +

    In addition to supporting any number of channels, version 7 simplifies working with channels and provides opportunity for compiler optimiziations that were previously not possible. Our benchmarking shows version 7 has increased performance for virtually all image operations.

    Pixel Accessors

    -

    Use accessors to get or set pixel components (e.g. GetPixelRed(), SetPixelRed()). You can find these accessors defined in the header file, MagickCore/pixel-accessor.h

    +

    Use accessors to get or set pixel components:

    -
  • The colormap indexes and black pixel component (for the CMYK colorspace) are no longer stored in the index channel, previously accessed with GetAuthenticIndexQueue() and GetCacheViewAuthenticIndexQueue((). Instead they are now a pixel channel and accessed with the convenience pixel macros GetPixelIndex(), SetPixelIndex(), GetPixelBlack(), and SetPixelBlack().
    • +
    +  GetPixelAlpha()
+  GetPixelBlack()
+  GetPixelBlue()
+  GetPixelCb()
+  GetPixelChannels()
+  GetPixelCr()
+  GetPixelCyan()
+  GetPixelGray()
+  GetPixelGreen()
+  GetPixelIndex()
+  GetPixelInfoIntensity()
+  GetPixelInfoLuminance()
+  GetPixelMagenta()
+  GetPixelRed()
+  GetPixelPacket()
+  GetPixelPacketIntensity()
+  GetPixelY()
+  GetPixelYellow()
+  GetPixelIntensity()
+  SetPixelAlpha()
+  SetPixelBlack()
+  SetPixelBlue()
+  SetPixelCb()
+  SetPixelChannels()
+  SetPixelCr()
+  SetPixelCyan()
+  SetPixelGray()
+  SetPixelGreen()
+  SetPixelIndex()
+  SetPixelInfo()
+  SetPixelInfoBias()
+  SetPixelInfoPacket()
+  SetPixelMagenta()
+  SetPixelRed()
+  SetPixelPacket()
+  SetPixelPixelInfo()
+  SetPixelYellow()
+  SetPixelY()
+
    -

    In addition to supporting any number of channels, version 7 simplifies working with channels and provides opportunity for compiler optimiziations that were previously not possible. Our benchmarking shows version 7 has increased performance for virtually all image operations.

    +

    You can find these accessors defined in the header file, MagickCore/pixel-accessor.h

    -

    Associated Pixel Channels

    -

    In version 7, we introduce associated pixel channels. These pixel channels are for your exclusive use and are accessed with these MagickCore API methods:

    -
    -
  • SetImageAssociatedPixelChannels()
    • -
  • GetImageAssociatedPixelChannels()
    • -
  • GetVirtualAssociatedPixels
    • -
  • GetAuthenticAssociatedPixels
    • -
  • GetCacheViewAuthenticAssociatedPixels
    • -
  • GetCacheViewVirtualAssociatedPixels
    • -
    +

    Pixel Metacontent

    +

    In version 7, we introduce pixel metacontent. Metacontent is content about content. So rather than being the content itself, it's something that describes or amplifies the content. Here the content is a pixel. The pixel metacontent is for your exclusive use and is accessed with these MagickCore API methods:

    +
    +  SetImageMetacontentExtent()
+  GetImageMetacontentExtent()
+  GetVirtualMetacontent()
+  GetAuthenticMetacontent()
+  GetCacheViewAuthenticMetacontent()
+  GetCacheViewVirtualMetacontent()
+

    Alpha

    We support alpha now, previously opacity. With alpha, a value of 0 means that the pixel does not have any coverage information and is transparent; i.e. there was no color contribution from any geometry because the geometry did not overlap this pixel. A value of QuantumRange means that the pixel is opaque because the geometry completely overlapped the pixel. As a consequence, in version 7, the PixelPacket structure member alpha has replaced the previous opacity member.

    +

    Grayscale

    +
    +

    Previously, grayscale images consumed 4 channels: red, green, blue, and alpha. With version 7, grayscale consumes only 1 channel consuming far less resources as a result. However, there may be unintended consequences. With 1 channel, all image processing algorithms write to this one channel. Drawing yellow text on a grayscale image will produce gray lettering. To get the expected results, simply modify the colorspace to RGB (e.g. -colorspace rgb).

    +

    Deprecated Features Removed

    @@ -376,18 +420,22 @@

    Changes from ImageMagick version 6 to version 7 are summarized here:

    Pixels
    -
  • Pixels are no longer addressed with PixelPacket structure members (e.g. red, green, blue, opacity) but as an array of channels (e.g. p[PixelRed]).
    • +
  • Pixels are no longer addressed with PixelPacket structure members (e.g. red, green, blue, opacity) but as an array of channels (e.g. pixel[PixelRedComponent]).
  • Use convenience macros to access pixel components (e.g. GetPixelRed(), SetPixelRed()).
  • The black channel for the CMYK colorspace is no longer stored in the index channel, previously accessed with GetAuthenticIndexQueue() and GetCacheViewAuthenticIndexQueue((). Instead its now a pixel channel and accessed with the convenience pixel macros GetPixelBlack() and SetPixelBlack().
    • -
  • Use the index channel to address colormapped indexes. It no longer hosts the black channel for CMYK and CMYKA images.
    • -
  • Use GetImagePixelChannels() to advance to the next set of pixel channels.
    • -
  • Use associated pixel channels for your own use.
    • +
  • The index channel for colormapped images are no longer stored in the index channel, previously accessed with GetAuthenticIndexQueue() and GetCacheViewAuthenticIndexQueue((). Instead its now a pixel channel and accessed with the convenience pixel macros GetPixelIndex() and SetPixelIndex().
    • +
  • Use GetPixelChannels() to advance to the next set of pixel channels.
    • +
  • Use the metacontent channel to associate metacontent with each pixel.
    • Alpha
  • We support alpha rather than opacity (0 transparent; QuantumRange opaque).
  • Use GetPixelAlpha() or SetPixelAlpha() to get or set the alpha pixel component value.
    • +
    Grayscale
    +
    +
  • Grayscale images consume one channel in ImageMagick version 7. To process RGB, set the colorspace to RGB (e.g. -colorspace rgb).
    • +
    Deprecated Methods
  • All ImageMagick version 6 MagickCore and MagickWand deprecated methods are removed and no longer available in ImageMagick version 7.
    • diff --git a/www/quantize.html b/www/quantize.html index d8da68a15..4753fcf2f 100644 --- a/www/quantize.html +++ b/www/quantize.html @@ -193,14 +193,11 @@ -
    diff --git a/www/resources.html b/www/resources.html index 7838e6dd7..bf987cbaf 100644 --- a/www/resources.html +++ b/www/resources.html @@ -193,14 +193,11 @@ - diff --git a/www/search.html b/www/search.html index fd9b1b8da..72ee1a9c3 100644 --- a/www/search.html +++ b/www/search.html @@ -193,14 +193,11 @@ - diff --git a/www/sitemap.html b/www/sitemap.html index a70d90965..793d70a16 100644 --- a/www/sitemap.html +++ b/www/sitemap.html @@ -193,14 +193,11 @@ - diff --git a/www/sponsors.html b/www/sponsors.html index 45ba8e90b..d02547f15 100644 --- a/www/sponsors.html +++ b/www/sponsors.html @@ -193,14 +193,11 @@ - @@ -229,11 +226,11 @@
    Autoteile Online Shop
    Best Web Hosting
    Bildbearbeitung
    +
    Brand shopping
    Druckerei
    Druckerei
    Flyer drucken
    Fernsehdienst Berlin
    -
    Fototapete
    Free Catalogs
    Hotel München
    Kaffeevollautomaten Reparatur Berlin
    @@ -247,7 +244,6 @@
    Web Hosting Ratings
    Web Hosting Reviews
    Web Hosting Reviews
    -
    Web Hosting Reviews
    Web Hosting Secret Revealed
    diff --git a/www/stream.html b/www/stream.html index 57afef3a2..e2b0fa593 100644 --- a/www/stream.html +++ b/www/stream.html @@ -194,14 +194,11 @@ - diff --git a/www/subversion.html b/www/subversion.html index 8bd9a5865..4f9f3bb5c 100644 --- a/www/subversion.html +++ b/www/subversion.html @@ -193,14 +193,11 @@ - diff --git a/www/t-shirt.html b/www/t-shirt.html index 6e9b144d7..da5a5c126 100644 --- a/www/t-shirt.html +++ b/www/t-shirt.html @@ -193,14 +193,11 @@ - -- 2.49.0