From: cristy Date: Sat, 26 Mar 2011 23:38:55 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~7861 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1b80ae36ccc89153f6fa25cab8292a93b6643963;p=imagemagick --- diff --git a/ChangeLog b/ChangeLog index 8c42422a6..01ec1f429 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ -2011-03-25 6.6.8-8 Cristy +2011-03-26 6.6.8-9 Cristy + * New version 6.6.8-9. + +2011-03-25 6.6.8-9 Cristy * Add InterpolatePixelPacket() method. * Add support for the %[opaque] property. diff --git a/ImageMagick.spec b/ImageMagick.spec index f1d8ae2e7..f6ff17b7c 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,5 +1,5 @@ %global VERSION 6.6.8 -%global Patchlevel 9 +%global Patchlevel 10 Name: ImageMagick Version: %{VERSION} diff --git a/coders/dcm.c b/coders/dcm.c index 3b75af396..8c2e56a22 100644 --- a/coders/dcm.c +++ b/coders/dcm.c @@ -2842,9 +2842,6 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception) register unsigned char *p; - ssize_t - count; - size_t bits_allocated, bytes_per_pixel, @@ -2862,6 +2859,9 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception) width, window_width; + ssize_t + count; + unsigned char *data; @@ -3652,7 +3652,7 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception) stream_info->count=0; stream_info->segment_count=ReadBlobLSBLong(image); for (i=0; i < 15; i++) - stream_info->segments[i]=(int) ReadBlobLSBLong(image); + stream_info->segments[i]=(int) ReadBlobLSBLong(image); stream_info->remaining-=64; } image->columns=(size_t) width; diff --git a/config/configure.xml b/config/configure.xml index f637aab47..d464dff8a 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -9,8 +9,8 @@ - - + + diff --git a/index.html b/index.html index 50cf273d3..c80fd12a7 100644 --- a/index.html +++ b/index.html @@ -184,7 +184,7 @@ Druckerei @@ -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-8.

+

The current release is ImageMagick 6.6.8-9.

diff --git a/libtool b/libtool index b59692efd..4aca3ff78 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-9 +# Generated automatically by config.status (ImageMagick) 6.6.8-10 # 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/version.h b/magick/version.h index 64011ad18..a7a347499 100644 --- a/magick/version.h +++ b/magick/version.h @@ -30,11 +30,11 @@ extern "C" { #define MagickLibVersion 0x668 #define MagickLibVersionText "6.6.8" #define MagickLibVersionNumber 4,0,1 -#define MagickLibAddendum "-9" +#define MagickLibAddendum "-10" #define MagickLibInterface 4 #define MagickLibMinInterface 4 -#define MagickReleaseDate "2011-03-25" -#define MagickChangeDate "20110325" +#define MagickReleaseDate "2011-03-26" +#define MagickChangeDate "20110326" #define MagickAuthoritativeURL "http://www.imagemagick.org" #if defined(MAGICKCORE_OPENMP_SUPPORT) #define MagickOpenMPFeature "OpenMP " diff --git a/version.sh b/version.sh index 4e5fa182c..2ba7c2c87 100644 --- a/version.sh +++ b/version.sh @@ -12,7 +12,7 @@ PACKAGE_NAME='ImageMagick' # PACKAGE_NAME (e.g. "1.0.0"). PACKAGE_VERSION='6.6.8' PACKAGE_LIB_VERSION="0x668" -PACKAGE_RELEASE="9" +PACKAGE_RELEASE="10" PACKAGE_LIB_VERSION_NUMBER="6,6,8,${PACKAGE_RELEASE}" PACKAGE_RELEASE_DATE=`date +%F` PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION" diff --git a/www/ImageMagickObject.html b/www/ImageMagickObject.html index 912bb6921..bae56ea27 100644 --- a/www/ImageMagickObject.html +++ b/www/ImageMagickObject.html @@ -185,7 +185,7 @@ Druckerei diff --git a/www/advanced-unix-installation.html b/www/advanced-unix-installation.html index ab13e94b7..4023f9b84 100644 --- a/www/advanced-unix-installation.html +++ b/www/advanced-unix-installation.html @@ -184,7 +184,7 @@ Druckerei @@ -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-8 $magick> ./configure

+

$magick> cd ImageMagick-6.6.8-9 $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-8.tar.gz $magick> cd ImageMagick-6.6.8-8

Configure ImageMagick:

+

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

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-8 $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-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

Dealing with Unexpected Problems

diff --git a/www/advanced-windows-installation.html b/www/advanced-windows-installation.html index 9a2949a0c..dedb5c0cc 100644 --- a/www/advanced-windows-installation.html +++ b/www/advanced-windows-installation.html @@ -184,7 +184,7 @@ Druckerei
@@ -473,7 +473,7 @@
  1. Double-click on - VisualMagick/bin/ImageMagick-6.6.8-8-Q16-windows-dll.exe + VisualMagick/bin/ImageMagick-6.6.8-9-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 932f822e0..ddee6aed2 100644 --- a/www/animate.html +++ b/www/animate.html @@ -185,7 +185,7 @@ Druckerei diff --git a/www/api.html b/www/api.html index a6a31e382..0a304e690 100644 --- a/www/api.html +++ b/www/api.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/annotate.html b/www/api/annotate.html index f5de39897..6f02d8bc7 100644 --- a/www/api/annotate.html +++ b/www/api/annotate.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/attribute.html b/www/api/attribute.html index c2e4c6661..61b50e637 100644 --- a/www/api/attribute.html +++ b/www/api/attribute.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/blob.html b/www/api/blob.html index 0eb149659..dee28b1f6 100644 --- a/www/api/blob.html +++ b/www/api/blob.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/cache-view.html b/www/api/cache-view.html index 73347e06d..10db07fab 100644 --- a/www/api/cache-view.html +++ b/www/api/cache-view.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/cache.html b/www/api/cache.html index 50ccb2c18..3fdfe1c04 100644 --- a/www/api/cache.html +++ b/www/api/cache.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/cipher.html b/www/api/cipher.html index a6d630ff6..0954ba546 100644 --- a/www/api/cipher.html +++ b/www/api/cipher.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/color.html b/www/api/color.html index b71004240..02c1eaba1 100644 --- a/www/api/color.html +++ b/www/api/color.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/colormap.html b/www/api/colormap.html index d9a958a13..1a84b9c43 100644 --- a/www/api/colormap.html +++ b/www/api/colormap.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/compare.html b/www/api/compare.html index 4c702d562..85984d87b 100644 --- a/www/api/compare.html +++ b/www/api/compare.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/composite.html b/www/api/composite.html index 8c41e4408..e25e6e624 100644 --- a/www/api/composite.html +++ b/www/api/composite.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/constitute.html b/www/api/constitute.html index d458e3e5b..de9a17185 100644 --- a/www/api/constitute.html +++ b/www/api/constitute.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/decorate.html b/www/api/decorate.html index 56d3635d7..2673dbd4e 100644 --- a/www/api/decorate.html +++ b/www/api/decorate.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/deprecate.html b/www/api/deprecate.html index e5f96b4f0..13b31feb8 100644 --- a/www/api/deprecate.html +++ b/www/api/deprecate.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/display.html b/www/api/display.html index ee09dff63..8366b3d36 100644 --- a/www/api/display.html +++ b/www/api/display.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/distort.html b/www/api/distort.html index 0aa273b01..50697e1fe 100644 --- a/www/api/distort.html +++ b/www/api/distort.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/effect.html b/www/api/effect.html index 762cd957b..daa0c16a9 100644 --- a/www/api/effect.html +++ b/www/api/effect.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/enhance.html b/www/api/enhance.html index b86eabe73..c085df4a8 100644 --- a/www/api/enhance.html +++ b/www/api/enhance.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/exception.html b/www/api/exception.html index 2e34fa352..1a1a90268 100644 --- a/www/api/exception.html +++ b/www/api/exception.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/feature.html b/www/api/feature.html index 5bf2ea08d..1fc65abf8 100644 --- a/www/api/feature.html +++ b/www/api/feature.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/fourier.html b/www/api/fourier.html index 9f51cb474..4ad3b6cb7 100644 --- a/www/api/fourier.html +++ b/www/api/fourier.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/image-view.html b/www/api/image-view.html index f197428b0..422e2ed07 100644 --- a/www/api/image-view.html +++ b/www/api/image-view.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/image.html b/www/api/image.html index 7d6b131b9..e598a680d 100644 --- a/www/api/image.html +++ b/www/api/image.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/layer.html b/www/api/layer.html index 63fde2421..5465db2e6 100644 --- a/www/api/layer.html +++ b/www/api/layer.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/list.html b/www/api/list.html index d6d99749f..8bacf13d0 100644 --- a/www/api/list.html +++ b/www/api/list.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/magick-deprecate.html b/www/api/magick-deprecate.html index 83f81c959..141204cf1 100644 --- a/www/api/magick-deprecate.html +++ b/www/api/magick-deprecate.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/magick-property.html b/www/api/magick-property.html index 53df0bf53..2f1fdaac9 100644 --- a/www/api/magick-property.html +++ b/www/api/magick-property.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/magick.html b/www/api/magick.html index 6ff6be04f..f4fda637c 100644 --- a/www/api/magick.html +++ b/www/api/magick.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/memory.html b/www/api/memory.html index a4c2329cd..4d7028562 100644 --- a/www/api/memory.html +++ b/www/api/memory.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/mogrify.html b/www/api/mogrify.html index f85e27ca6..ce5de9d41 100644 --- a/www/api/mogrify.html +++ b/www/api/mogrify.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/monitor.html b/www/api/monitor.html index 75adb5cd7..b102e7973 100644 --- a/www/api/monitor.html +++ b/www/api/monitor.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/montage.html b/www/api/montage.html index ad0171600..aba13d1a5 100644 --- a/www/api/montage.html +++ b/www/api/montage.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/morphology.html b/www/api/morphology.html index 00eeab9d6..f4d9ca473 100644 --- a/www/api/morphology.html +++ b/www/api/morphology.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/paint.html b/www/api/paint.html index 773565c08..347b73b09 100644 --- a/www/api/paint.html +++ b/www/api/paint.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/pixel-iterator.html b/www/api/pixel-iterator.html index 252ae0540..62a934036 100644 --- a/www/api/pixel-iterator.html +++ b/www/api/pixel-iterator.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/pixel-wand.html b/www/api/pixel-wand.html index 9a79082fd..9baae6095 100644 --- a/www/api/pixel-wand.html +++ b/www/api/pixel-wand.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/profile.html b/www/api/profile.html index 06d46e9d1..5c848f802 100644 --- a/www/api/profile.html +++ b/www/api/profile.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/property.html b/www/api/property.html index 576dcb358..214feceee 100644 --- a/www/api/property.html +++ b/www/api/property.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/quantize.html b/www/api/quantize.html index f921d4751..f50849ad9 100644 --- a/www/api/quantize.html +++ b/www/api/quantize.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/resize.html b/www/api/resize.html index 2539f5de1..e8ad72107 100644 --- a/www/api/resize.html +++ b/www/api/resize.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/resource.html b/www/api/resource.html index eb39294fb..766bb885a 100644 --- a/www/api/resource.html +++ b/www/api/resource.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/statistic.html b/www/api/statistic.html index 746e9759a..a0908318f 100644 --- a/www/api/statistic.html +++ b/www/api/statistic.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/version.html b/www/api/version.html index c47874e05..6571a510d 100644 --- a/www/api/version.html +++ b/www/api/version.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/api/wand-view.html b/www/api/wand-view.html index e37271c90..e8847c10a 100644 --- a/www/api/wand-view.html +++ b/www/api/wand-view.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/architecture.html b/www/architecture.html index 98b251b54..8dfb08e95 100644 --- a/www/architecture.html +++ b/www/architecture.html @@ -184,7 +184,7 @@ Druckerei @@ -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-8 2011-03-25 Q16 http://www.imagemagick.org

+

$magick> identify -versionVersion: ImageMagick 6.6.8-9 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 7b0b46447..81e3e26c8 100644 --- a/www/binary-releases.html +++ b/www/binary-releases.html @@ -184,7 +184,7 @@ Druckerei @@ -219,16 +219,16 @@ - ImageMagick-6.6.8-8.i386.rpm - download - download + ImageMagick-6.6.8-9.i386.rpm + download + download CentOS 5.4 i386 RPM - ImageMagick-6.6.8-8.x86_64.rpm - download - download + ImageMagick-6.6.8-9.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-8.i386.rpm

+

$magick> rpm -Uvh ImageMagick-6.6.8-9.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

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

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

+

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

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

    @@ -404,7 +404,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.6.8-8-Q16-windows-dll.exe.

    +ImageMagick-6.6.8-9-Q16-windows-dll.exe.

    @@ -416,44 +416,44 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + diff --git a/www/changelog.html b/www/changelog.html index 6c58cdd26..63ebc81e2 100644 --- a/www/changelog.html +++ b/www/changelog.html @@ -184,7 +184,7 @@ Druckerei @@ -197,7 +197,12 @@

    ImageMagick Changelog

    -
    2011-03-25 6.6.8-8 Cristy <quetzlzacatenango@image...>
    +
    2011-03-26 6.6.8-9 Cristy <quetzlzacatenango@image...>
    +
    New version 6.6.8-9.
    +
    2011-03-25 6.6.8-9 Cristy <quetzlzacatenango@image...>
    +
    Add InterpolatePixelPacket() method.
    +
    Add support for the %[opaque] property.
    +
    2011-03-25 6.6.8-8 Cristy <quetzlzacatenango@image...>
    New version 6.6.8-8.
    2011-03-25 6.6.8-8 Cristy <quetzlzacatenango@image...>
    Fix memory access bug in CloneString() (reference http://www.imagemagick.org/discourse-server/viewtopic.html?f=2&t=18382).
    @@ -210,11 +215,11 @@
    Add support for 16-bit DCM short ints (reference http://www.imagemagick.org/discourse-server/viewtopic.html?f=3&t=18371).
    2011-03-23 6.6.8-7 Anthony Thyssen <A.Thyssen@griffith...>
    Another fix for -sparse-color and unused color channels
    -
    Finialize the -duplicate option created by Cristy
    +
    Finalize the -duplicate option created by Cristy
    Fix of segmentation fault for second image in %[fx:..] during info: (Bug in AcquireFxInfo(), as given start image is not first image)
    2011-03-21 6.6.8-7 Glenn Randers-Pehrson <glennrp@image...>
    Revised the PNG8 encoder to use 50% threshold instead of 0% when reducing transparency to binary. Collapse all resulting fully transparent colors into one (the background color), to reduce the compressed filesize.
    -
    First try the 4-4-4 and 3-3-3 palettes instead of 3-3-2, to preserve colors (especially gray) better, when reducing to PNG8.
    +
    First try the 4-4-4-1 and 3-3-3-1 palettes instead of 3-3-2-1, to preserve colors (especially gray) better, when reducing to PNG8.
    Force the PNG encoder to return image->matte==MagickTrue when the format is RGBA or GA or if the tRNS chunk is present, even when the image is fully opaque (reference http://www.imagemagick.org/discourse-server/viewtopic.html?f=3&t=18349).
    2011-03-21 6.6.8-6 Cristy <quetzlzacatenango@image...>
    New version 6.6.8-6.
    diff --git a/www/color.html b/www/color.html index d1a72fafa..ca296758c 100644 --- a/www/color.html +++ b/www/color.html @@ -185,7 +185,7 @@ Druckerei
    diff --git a/www/command-line-options.html b/www/command-line-options.html index e7ff0fb54..0dd5a7e72 100644 --- a/www/command-line-options.html +++ b/www/command-line-options.html @@ -188,7 +188,7 @@ Druckerei diff --git a/www/command-line-processing.html b/www/command-line-processing.html index 4d2c967fc..81b211aa3 100644 --- a/www/command-line-processing.html +++ b/www/command-line-processing.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/command-line-tools.html b/www/command-line-tools.html index ba7cd7181..2b59cec3a 100644 --- a/www/command-line-tools.html +++ b/www/command-line-tools.html @@ -184,7 +184,7 @@ Druckerei diff --git a/www/compare.html b/www/compare.html index 5af045d0b..2ff2b97ad 100644 --- a/www/compare.html +++ b/www/compare.html @@ -185,7 +185,7 @@ Druckerei diff --git a/www/compose.html b/www/compose.html index 812ea80b3..5fe2345ae 100644 --- a/www/compose.html +++ b/www/compose.html @@ -185,7 +185,7 @@ Druckerei diff --git a/www/composite.html b/www/composite.html index 3e3a39c80..850ae94dc 100644 --- a/www/composite.html +++ b/www/composite.html @@ -185,7 +185,7 @@ Druckerei diff --git a/www/conjure.html b/www/conjure.html index e5fb5bee6..eab305292 100644 --- a/www/conjure.html +++ b/www/conjure.html @@ -185,7 +185,7 @@ Druckerei diff --git a/www/convert.html b/www/convert.html index 8648eea30..ffaae5a3a 100644 --- a/www/convert.html +++ b/www/convert.html @@ -185,7 +185,7 @@ Druckerei diff --git a/www/display.html b/www/display.html index e15b002d0..0882e2bfe 100644 --- a/www/display.html +++ b/www/display.html @@ -185,7 +185,7 @@ Druckerei diff --git a/www/download.html b/www/download.html index fffc2fe42..4c699b224 100644 --- a/www/download.html +++ b/www/download.html @@ -184,7 +184,7 @@ Druckerei @@ -199,7 +199,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.6.8-8.

    +

    The latest release of ImageMagick is version 6.6.8-9.

    Australia
    ftp://mirror.aarnet.edu.au/pub/imagemagick/
    diff --git a/www/escape.html b/www/escape.html index 322d17dce..b77baef37 100644 --- a/www/escape.html +++ b/www/escape.html @@ -185,7 +185,7 @@ Druckerei
    @@ -204,11 +204,11 @@

    Use the -format option to print properties associated with an image in a format of your choosing. You can include the image filename, type, width, height, EXIF data, or other image attributes by embedding special format characters:

    -   %b   file size
+   %b   original file size of image file
    %c   comment property
    %d   directory path
-   %e   filename suffix
-   %f   filename (excluding suffix)
+   %e   filename extension or suffix
+   %f   filename (including suffix)
    %g   page geometry   ( = %Wx%H%X%Y )
    %h   current image height in pixels
    %i   input filename (full path)
@@ -220,14 +220,14 @@
    %p   index of image in sequence
    %q   quantum depth (compile-time constant)
    %r   image class and colorspace
-   %s   scene number (from input)
-   %t   top of filename
+   %s   scene number (from input unless re-assigned)
+   %t   top of filename (excluding suffix)
    %u   unique temporary filename
    %w   current width in pixels
    %x   x resolution
    %y   y resolution
    %z   image depth (as read in)
-   %A   image alpha channel (true/false)
+   %A   image transparency channel enabled (true/false)
    %C   image compression type
    %D   image dispose method
    %G   image size ( = %wx%h )
@@ -254,27 +254,28 @@ for an image with filename bird.miff and whose width is 512 and heigh
 
    Additional properties are recognized when enclosed in braces:
    
 
 
    -   %[base]                base filename
+   %[base]                 base filename, no suffixes (as %t)
    %[channels]
-   %[colorspace]
-   %[copyright]
-   %[depth]
-   %[directory]
-   %[extension]
+   %[colorspace]           Colorspace of Image Data (excluding transparency)
+   %[copyright]            ImageMagick Copyright String
+   %[depth]                depth of image for write (as input unless changed)
+   %[directory]            directory part of filename (as %d)
+   %[extension]            extention part of filename (as %e)
    %[group]
    %[height]               original height of image (when it was read in)
-   %[magick]
+   %[magick]               coder used to read image (not the file suffix)
    %[max]
    %[mean]
    %[min]
    %[name]
+   %[opaque]
    %[page]
-   %[scene]
-   %[scenes]
+   %[scene]                original scene number of image in input file
+   %[scenes]               original number of scenes in input file
    %[size]                 original size of image (when it was read in)
    %[standard-deviation]
-   %[unique]               unique temporary filename
-   %[version]
+   %[unique]               unique temporary filename ???
+   %[version]              Version Information of this running ImageMagick
    %[width]                original width of image (when it was read in)
    %[xresolution]
    %[yresolution]
diff --git a/www/examples.html b/www/examples.html
index 0223beb92..8e8594035 100644
--- a/www/examples.html
+++ b/www/examples.html
@@ -184,7 +184,7 @@
   Druckerei
 
 
 
 
diff --git a/www/exception.html b/www/exception.html
index 69f221229..9a1369c90 100644
--- a/www/exception.html
+++ b/www/exception.html
@@ -184,7 +184,7 @@
   Druckerei
 
 
 
 
diff --git a/www/formats.html b/www/formats.html
index c29b1b086..247dc5175 100644
--- a/www/formats.html
+++ b/www/formats.html
@@ -185,7 +185,7 @@
   Druckerei
 
 
 
 
diff --git a/www/fx.html b/www/fx.html
index bdb63263c..d364a7176 100644
--- a/www/fx.html
+++ b/www/fx.html
@@ -185,7 +185,7 @@
   Druckerei
 
 
 
 
diff --git a/www/high-dynamic-range.html b/www/high-dynamic-range.html
index bd6aa706b..ea7648be3 100644
--- a/www/high-dynamic-range.html
+++ b/www/high-dynamic-range.html
@@ -184,7 +184,7 @@
   Druckerei
 
 
 
 
diff --git a/www/identify.html b/www/identify.html
index 6be6e578e..f8c2c2e03 100644
--- a/www/identify.html
+++ b/www/identify.html
@@ -184,7 +184,7 @@
   Druckerei
 
 
 
 
@@ -267,7 +267,7 @@
     Tainted: False  
    
     Filesize: 3.97266kb  
    
     Number pixels: 3.14453kb  
    
-    Version: ImageMagick 6.6.8-8 2011-03-25 Q16 http://www.imagemagick.org
    
+    Version: ImageMagick 6.6.8-9 2011-03-25 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 03b3cb4c0..458902db2 100644
--- a/www/import.html
+++ b/www/import.html
@@ -185,7 +185,7 @@
   Druckerei
 
 
 
 
diff --git a/www/index.html b/www/index.html
index 2cad3fd40..962c4126f 100644
--- a/www/index.html
+++ b/www/index.html
@@ -184,7 +184,7 @@
   Druckerei
 
 
 
 
@@ -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-8.
    
+
    The current release is ImageMagick 6.6.8-9.
    
 
 
 
diff --git a/www/install-source.html b/www/install-source.html
index 80f5cade9..9690e11dc 100644
--- a/www/install-source.html
+++ b/www/install-source.html
@@ -184,7 +184,7 @@
   Druckerei
 
 
 
 
diff --git a/www/jp2.html b/www/jp2.html
index 521bf8f1c..f4517ccbf 100644
--- a/www/jp2.html
+++ b/www/jp2.html
@@ -185,7 +185,7 @@
   Druckerei
 
 
 
 
diff --git a/www/license.html b/www/license.html
index f5dcadc8d..04365ef7f 100644
--- a/www/license.html
+++ b/www/license.html
@@ -184,7 +184,7 @@
   Druckerei
 
 
 
 
diff --git a/www/links.html b/www/links.html
index b7a9b3479..3ff1df803 100644
--- a/www/links.html
+++ b/www/links.html
@@ -184,7 +184,7 @@
   Druckerei
 
 
 
 
diff --git a/www/magick++.html b/www/magick++.html
index 43bffe901..c82a37c17 100644
--- a/www/magick++.html
+++ b/www/magick++.html
@@ -185,7 +185,7 @@
   Druckerei
 
 
 
 
diff --git a/www/magick-core.html b/www/magick-core.html
index 06efbe39e..f376939d4 100644
--- a/www/magick-core.html
+++ b/www/magick-core.html
@@ -185,7 +185,7 @@
   Druckerei
 
 
 
 
diff --git a/www/magick-wand.html b/www/magick-wand.html
index 6fb1544df..84df97a1b 100644
--- a/www/magick-wand.html
+++ b/www/magick-wand.html
@@ -185,7 +185,7 @@
   Druckerei
 
 
 
 
diff --git a/www/mogrify.html b/www/mogrify.html
index bea18e4e3..bacf3bd2c 100644
--- a/www/mogrify.html
+++ b/www/mogrify.html
@@ -185,7 +185,7 @@
   Druckerei
 
 
 
 
diff --git a/www/montage.html b/www/montage.html
index f32d0e393..5754ade43 100644
--- a/www/montage.html
+++ b/www/montage.html
@@ -185,7 +185,7 @@
   Druckerei
 
 
 
 
diff --git a/www/motion-picture.html b/www/motion-picture.html
index b7c9b8892..47d69a394 100644
--- a/www/motion-picture.html
+++ b/www/motion-picture.html
@@ -185,7 +185,7 @@
   Druckerei
 
 
 
 
diff --git a/www/perl-magick.html b/www/perl-magick.html
index df3ac3d04..06f5420b8 100644
--- a/www/perl-magick.html
+++ b/www/perl-magick.html
@@ -184,7 +184,7 @@
   Druckerei
 
 
 
 
diff --git a/www/quantize.html b/www/quantize.html
index 3237a7b39..db7adafe7 100644
--- a/www/quantize.html
+++ b/www/quantize.html
@@ -184,7 +184,7 @@
   Druckerei
 
 
 
 
diff --git a/www/resources.html b/www/resources.html
index d116df570..7c9994144 100644
--- a/www/resources.html
+++ b/www/resources.html
@@ -184,7 +184,7 @@
   Druckerei
 
 
 
 
diff --git a/www/search.html b/www/search.html
index 9750909b4..766acda6c 100644
--- a/www/search.html
+++ b/www/search.html
@@ -184,7 +184,7 @@
   Druckerei
 
 
 
 
diff --git a/www/sitemap.html b/www/sitemap.html
index 7ba5ab4e0..3d993434b 100644
--- a/www/sitemap.html
+++ b/www/sitemap.html
@@ -184,7 +184,7 @@
   Druckerei
 
 
 
 
diff --git a/www/sponsors.html b/www/sponsors.html
index a079f5035..29189223d 100644
--- a/www/sponsors.html
+++ b/www/sponsors.html
@@ -184,7 +184,7 @@
   Druckerei
 
 
 
 
diff --git a/www/stream.html b/www/stream.html
index c7e61109a..a8842ebac 100644
--- a/www/stream.html
+++ b/www/stream.html
@@ -185,7 +185,7 @@
   Druckerei
 
 
 
 
diff --git a/www/subversion.html b/www/subversion.html
index f36717d88..2dc5de334 100644
--- a/www/subversion.html
+++ b/www/subversion.html
@@ -184,7 +184,7 @@
   Druckerei
 
 
 
 
diff --git a/www/t-shirt.html b/www/t-shirt.html
index 7fd5ffea7..da7be5ae9 100644
--- a/www/t-shirt.html
+++ b/www/t-shirt.html
@@ -184,7 +184,7 @@
   Druckerei
    ImageMagick-6.6.8-8-Q16-windows-dll.exedownloaddownloadImageMagick-6.6.8-9-Q16-windows-dll.exedownloaddownload Win32 dynamic at 16 bits-per-pixel
    ImageMagick-6.6.8-8-Q16-windows-static.exedownloaddownloadImageMagick-6.6.8-9-Q16-windows-static.exedownloaddownload Win32 static at 16 bits-per-pixel
    ImageMagick-6.6.8-8-Q8-windows-dll.exedownloaddownloadImageMagick-6.6.8-9-Q8-windows-dll.exedownloaddownload Win32 dynamic at 8 bits-per-pixel
    ImageMagick-6.6.8-8-Q8-windows-static.exedownloaddownloadImageMagick-6.6.8-9-Q8-windows-static.exedownloaddownload Win32 static at 8 bits-per-pixel
    ImageMagick-6.6.8-8-Q16-windows-x64-dll.exedownloaddownloadImageMagick-6.6.8-9-Q16-windows-x64-dll.exedownloaddownload Win64 dynamic at 16 bits-per-pixel
    ImageMagick-6.6.8-8-Q16-windows-x64-static.exedownloaddownloadImageMagick-6.6.8-9-Q16-windows-x64-static.exedownloaddownload Win64 static at 16 bits-per-pixel