From: cristy Date: Tue, 24 May 2011 01:59:01 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~7492 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=575d5ee5a36355a955ef1a394c9d13d0eedde5bf;p=imagemagick --- diff --git a/ImageMagick.spec b/ImageMagick.spec index 7d7cc6c18..b49ff393a 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,5 +1,5 @@ %global VERSION 6.7.0 -%global Patchlevel 0 +%global Patchlevel 1 Name: ImageMagick Version: %{VERSION} diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs index 13f047eba..403194107 100644 --- a/PerlMagick/Magick.xs +++ b/PerlMagick/Magick.xs @@ -843,8 +843,8 @@ static void DestroyPackageInfo(struct PackageInfo *info) % o info: a structure of type info. % */ -static Image *GetList(pTHX_ SV *reference,SV ***reference_vector,ssize_t *current, - ssize_t *last,ExceptionInfo *exception) +static Image *GetList(pTHX_ SV *reference,SV ***reference_vector, + ssize_t *current,ssize_t *last,ExceptionInfo *exception) { Image *image; @@ -5998,9 +5998,6 @@ Histogram(ref,...) ExceptionInfo *exception; - HV - *hv; - Image *image; @@ -6014,7 +6011,6 @@ Histogram(ref,...) *info; SV - *av_reference, *perl_exception, *reference; @@ -6033,9 +6029,7 @@ Histogram(ref,...) goto PerlException; } reference=SvRV(ST(0)); - hv=SvSTASH(reference); av=newAV(); - av_reference=sv_2mortal(sv_bless(newRV((SV *) av),hv)); SvREFCNT_dec(av); image=SetupList(aTHX_ reference,&info,(SV ***) NULL,exception); if (image == (Image *) NULL) diff --git a/config/configure.xml b/config/configure.xml index ec00db695..1fb47b8d5 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -9,9 +9,9 @@ - + - + diff --git a/index.html b/index.html index e7159cefa..8fa8eaa49 100644 --- a/index.html +++ b/index.html @@ -166,7 +166,7 @@ Druckerei @@ -212,7 +212,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.9-10.

+

The current release is ImageMagick 6.7.0-0.

diff --git a/libtool b/libtool index 39d8f0f3b..013362eb1 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-0 +# Generated automatically by config.status (ImageMagick) 6.7.0-1 # 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 5068078ea..557f53ffc 100644 --- a/magick/version.h +++ b/magick/version.h @@ -31,11 +31,11 @@ extern "C" { #define MagickLibVersion 0x670 #define MagickLibVersionText "6.7.0" #define MagickLibVersionNumber 4,0,1 -#define MagickLibAddendum "-0" +#define MagickLibAddendum "-1" #define MagickLibInterface 4 #define MagickLibMinInterface 4 -#define MagickReleaseDate "2011-05-20" -#define MagickChangeDate "20110520" +#define MagickReleaseDate "2011-05-23" +#define MagickChangeDate "20110522" #define MagickAuthoritativeURL "http://www.imagemagick.org" #if defined(MAGICKCORE_OPENMP_SUPPORT) #define MagickOpenMPFeature "OpenMP " diff --git a/version.sh b/version.sh index ee0151af9..b2cc4bf12 100644 --- a/version.sh +++ b/version.sh @@ -12,7 +12,7 @@ PACKAGE_NAME='ImageMagick' # PACKAGE_NAME (e.g. "1.0.0"). PACKAGE_VERSION='6.7.0' PACKAGE_LIB_VERSION="0x670" -PACKAGE_RELEASE="0" +PACKAGE_RELEASE="1" PACKAGE_LIB_VERSION_NUMBER="6,7,0,${PACKAGE_RELEASE}" PACKAGE_RELEASE_DATE=`date +%F` PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION" diff --git a/www/ImageMagickObject.html b/www/ImageMagickObject.html index aeb9c9262..183443e69 100644 --- a/www/ImageMagickObject.html +++ b/www/ImageMagickObject.html @@ -167,7 +167,7 @@ Druckerei @@ -213,7 +213,7 @@

ImageMagick provides a statically-built ImageMagick object as part of its Windows installation package. When this package is installed, ImageMagickObject and its sample programs are installed to this path:

-  c:\Program Files\ImageMagick-6.6.9-Q16\ImageMagickObject
+  c:\Program Files\ImageMagick-6.7.0-Q16\ImageMagickObject

The ImageMagickObject is registered if the checkbox, Register ImageMagickObject, is checked at install time.

diff --git a/www/advanced-unix-installation.html b/www/advanced-unix-installation.html index 9f7d606d4..b6b67afc9 100644 --- a/www/advanced-unix-installation.html +++ b/www/advanced-unix-installation.html @@ -166,7 +166,7 @@ Druckerei @@ -224,7 +224,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.9-10 $magick> ./configure

+

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

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

$magick> rpmbuild --rebuild ImageMagick.src.rpm

After the build you, locate the RPMS folder and install the ImageMagick binary RPM distribution:

-

$magick> rpm -ivh ImageMagick-6.6.9-?.*.rpm

+

$magick> rpm -ivh ImageMagick-6.7.0-?.*.rpm

Mac OS X-specific Build instructions

@@ -576,7 +576,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.9-10.tar.gz $magick> cd ImageMagick-6.6.9-10

Configure ImageMagick:

+

$magick> tar xvfz ImageMagick-6.7.0-0.tar.gz $magick> cd ImageMagick-6.7.0-0

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/ \
@@ -596,7 +596,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.9-?.tar.bz2 $magick> cd ImageMagick-6.6.9-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

+

$magick> tar jxvf ImageMagick-6.7.0-?.tar.bz2 $magick> cd ImageMagick-6.7.0-0 $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 c7887d98d..effbad122 100644 --- a/www/advanced-windows-installation.html +++ b/www/advanced-windows-installation.html @@ -166,7 +166,7 @@ Druckerei
@@ -476,7 +476,7 @@
  1. Double-click on - VisualMagick/bin/ImageMagick-6.6.9-10-Q16-windows-dll.exe + VisualMagick/bin/ImageMagick-6.7.0-0-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 03b2fd9c1..125085bc2 100644 --- a/www/animate.html +++ b/www/animate.html @@ -167,7 +167,7 @@ Druckerei diff --git a/www/api.html b/www/api.html index 6aa84c9b4..78289cfac 100644 --- a/www/api.html +++ b/www/api.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/animate.html b/www/api/animate.html index 8203de1af..08412dd61 100644 --- a/www/api/animate.html +++ b/www/api/animate.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/annotate.html b/www/api/annotate.html index d0fcf9695..acf804388 100644 --- a/www/api/annotate.html +++ b/www/api/annotate.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/blob.html b/www/api/blob.html index ebaa930d6..e8bbe2196 100644 --- a/www/api/blob.html +++ b/www/api/blob.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/cache-view.html b/www/api/cache-view.html index 7e3413075..6150afa7b 100644 --- a/www/api/cache-view.html +++ b/www/api/cache-view.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/cache.html b/www/api/cache.html index 079f2960d..7fa371754 100644 --- a/www/api/cache.html +++ b/www/api/cache.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/cipher.html b/www/api/cipher.html index 43dfc59d0..752a68489 100644 --- a/www/api/cipher.html +++ b/www/api/cipher.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/color.html b/www/api/color.html index d92de019f..a3debb79f 100644 --- a/www/api/color.html +++ b/www/api/color.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/colormap.html b/www/api/colormap.html index e76e3cf44..a65e87216 100644 --- a/www/api/colormap.html +++ b/www/api/colormap.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/compare.html b/www/api/compare.html index 7ea1b100b..7c898018d 100644 --- a/www/api/compare.html +++ b/www/api/compare.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/constitute.html b/www/api/constitute.html index 9f23df495..bdd491ce3 100644 --- a/www/api/constitute.html +++ b/www/api/constitute.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/decorate.html b/www/api/decorate.html index d28198d2a..85c62a26e 100644 --- a/www/api/decorate.html +++ b/www/api/decorate.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/display.html b/www/api/display.html index 9e592c0ee..1dd4206f6 100644 --- a/www/api/display.html +++ b/www/api/display.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/distort.html b/www/api/distort.html index 093ba4217..54b27e999 100644 --- a/www/api/distort.html +++ b/www/api/distort.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/draw.html b/www/api/draw.html index 827a09764..b81f357b7 100644 --- a/www/api/draw.html +++ b/www/api/draw.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/drawing-wand.html b/www/api/drawing-wand.html index 945ceba8d..cc44f3538 100644 --- a/www/api/drawing-wand.html +++ b/www/api/drawing-wand.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/effect.html b/www/api/effect.html index ebf9f6515..6277f0469 100644 --- a/www/api/effect.html +++ b/www/api/effect.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/enhance.html b/www/api/enhance.html index 7b9653bc5..9541fe072 100644 --- a/www/api/enhance.html +++ b/www/api/enhance.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/exception.html b/www/api/exception.html index 529f39b77..15ad5ae3c 100644 --- a/www/api/exception.html +++ b/www/api/exception.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/feature.html b/www/api/feature.html index 3fd714940..a080452c3 100644 --- a/www/api/feature.html +++ b/www/api/feature.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/fx.html b/www/api/fx.html index d31bb9ac6..bb4b5ee46 100644 --- a/www/api/fx.html +++ b/www/api/fx.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/image.html b/www/api/image.html index a250044cc..972a7bb64 100644 --- a/www/api/image.html +++ b/www/api/image.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/layer.html b/www/api/layer.html index fbc109503..b5a79c823 100644 --- a/www/api/layer.html +++ b/www/api/layer.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/list.html b/www/api/list.html index 360184091..2e95b1e4c 100644 --- a/www/api/list.html +++ b/www/api/list.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/magick-image.html b/www/api/magick-image.html index 3e67de964..24d2483b2 100644 --- a/www/api/magick-image.html +++ b/www/api/magick-image.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/magick-property.html b/www/api/magick-property.html index a64a538f8..fac9b101e 100644 --- a/www/api/magick-property.html +++ b/www/api/magick-property.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/magick-wand.html b/www/api/magick-wand.html index 0a33871eb..586f21cef 100644 --- a/www/api/magick-wand.html +++ b/www/api/magick-wand.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/magick.html b/www/api/magick.html index 506dc00a3..7592cca4f 100644 --- a/www/api/magick.html +++ b/www/api/magick.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/memory.html b/www/api/memory.html index 1afba4d2f..704485b94 100644 --- a/www/api/memory.html +++ b/www/api/memory.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/module.html b/www/api/module.html index a6bfbe888..62e6c5575 100644 --- a/www/api/module.html +++ b/www/api/module.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/mogrify.html b/www/api/mogrify.html index 777a29229..04d55592b 100644 --- a/www/api/mogrify.html +++ b/www/api/mogrify.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/monitor.html b/www/api/monitor.html index 1f2b8950d..e2f99554e 100644 --- a/www/api/monitor.html +++ b/www/api/monitor.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/montage.html b/www/api/montage.html index 71c205571..40753b86c 100644 --- a/www/api/montage.html +++ b/www/api/montage.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/paint.html b/www/api/paint.html index d11a2e840..2e0938c52 100644 --- a/www/api/paint.html +++ b/www/api/paint.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/pixel-iterator.html b/www/api/pixel-iterator.html index e8840b3f7..4d8f576fa 100644 --- a/www/api/pixel-iterator.html +++ b/www/api/pixel-iterator.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/pixel-wand.html b/www/api/pixel-wand.html index 070f4dbc4..266df41eb 100644 --- a/www/api/pixel-wand.html +++ b/www/api/pixel-wand.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/profile.html b/www/api/profile.html index a9ef43f70..be239c15f 100644 --- a/www/api/profile.html +++ b/www/api/profile.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/property.html b/www/api/property.html index e33550b72..af6199491 100644 --- a/www/api/property.html +++ b/www/api/property.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/quantize.html b/www/api/quantize.html index bda00b64b..c135d0811 100644 --- a/www/api/quantize.html +++ b/www/api/quantize.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/registry.html b/www/api/registry.html index 05f67e260..3b581e8af 100644 --- a/www/api/registry.html +++ b/www/api/registry.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/resource.html b/www/api/resource.html index ddcdd9474..94450bfed 100644 --- a/www/api/resource.html +++ b/www/api/resource.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/segment.html b/www/api/segment.html index 5a1afc929..3d24c3e06 100644 --- a/www/api/segment.html +++ b/www/api/segment.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/signature.html b/www/api/signature.html index e6f7d93a7..d7f694e4c 100644 --- a/www/api/signature.html +++ b/www/api/signature.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/statistic.html b/www/api/statistic.html index df011e66a..98d8a293a 100644 --- a/www/api/statistic.html +++ b/www/api/statistic.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/stream.html b/www/api/stream.html index 0237a5224..6c59f90e6 100644 --- a/www/api/stream.html +++ b/www/api/stream.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/transform.html b/www/api/transform.html index 10e97005a..771f5405c 100644 --- a/www/api/transform.html +++ b/www/api/transform.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/api/wand-view.html b/www/api/wand-view.html index 99a64909f..7219ab3c3 100644 --- a/www/api/wand-view.html +++ b/www/api/wand-view.html @@ -166,7 +166,7 @@ Druckerei diff --git a/www/architecture.html b/www/architecture.html index eb959163d..47f640eae 100644 --- a/www/architecture.html +++ b/www/architecture.html @@ -166,7 +166,7 @@ Druckerei @@ -291,7 +291,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.9-10 2011-04-06 Q16 http://www.imagemagick.org

+

$magick> identify -versionVersion: ImageMagick 6.7.0-0 2011-04-06 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 a2b3079dc..5ab9203d1 100644 --- a/www/binary-releases.html +++ b/www/binary-releases.html @@ -166,7 +166,7 @@ Druckerei @@ -222,16 +222,16 @@ - ImageMagick-6.6.9-10.i386.rpm - download - download + ImageMagick-6.7.0-0.i386.rpm + download + download CentOS 5.4 i386 RPM - ImageMagick-6.6.9-10.x86_64.rpm - download - download + ImageMagick-6.7.0-0.x86_64.rpm + download + download CentOS 5.4 x86_64 RPM @@ -268,7 +268,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.9-10.i386.rpm

+

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

@@ -277,7 +277,7 @@

$magick> tar xvfz ImageMagick.tar.gz

Set the MAGICK_HOME environment variable to the path where you extracted the ImageMagick files. For example:

-

$magick> export MAGICK_HOME="$HOME/ImageMagick-6.6.9"

+

$magick> export MAGICK_HOME="$HOME/ImageMagick-6.7.0"

If the bin subdirectory of the extracted package is not already in your executable search path, add it to your PATH environment variable. For example:

$magick> export PATH="$MAGICK_HOME/bin:$PATH"

@@ -327,7 +327,7 @@

$magick> tar xvfz ImageMagick-x86_64-apple-darwin10.7.0.tar.gz

Set the MAGICK_HOME environment variable to the path where you extracted the ImageMagick files. For example:

-

$magick> export MAGICK_HOME="$HOME/ImageMagick-6.6.9"

+

$magick> export MAGICK_HOME="$HOME/ImageMagick-6.7.0"

If the bin subdirectory of the extracted package is not already in your executable search path, add it to your PATH environment variable. For example:

$magick> export PATH="$MAGICK_HOME/bin:$PATH"

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

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

+

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

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