From 37f02952d7d785905b23f7aa71b5527ba9adb187 Mon Sep 17 00:00:00 2001 From: cristy Date: Wed, 24 Mar 2010 19:47:41 +0000 Subject: [PATCH] --- ImageMagick.spec | 2 +- config/configure.xml | 4 +- index.html | 2 +- libtool | 2 +- magick/version.h | 6 +- version.sh | 2 +- www/ImageMagickObject.html | 3 - www/advanced-unix-installation.html | 8 +-- www/advanced-windows-installation.html | 4 +- www/animate.html | 2 +- www/api.html | 42 +++++------ www/api/animate.html | 4 +- www/api/attribute.html | 3 - www/api/blob.html | 2 +- www/api/cache-view.html | 4 +- www/api/cache.html | 4 +- www/api/cipher.html | 2 +- www/api/color.html | 2 +- www/api/colormap.html | 4 +- www/api/compare.html | 2 +- www/api/composite.html | 2 +- www/api/constitute.html | 4 +- www/api/decorate.html | 4 +- www/api/display.html | 2 +- www/api/draw.html | 2 +- www/api/drawing-wand.html | 3 - www/api/effect.html | 2 +- www/api/exception.html | 2 +- www/api/histogram.html | 4 +- www/api/image.html | 3 - www/api/list.html | 2 +- www/api/magick-deprecate.html | 2 +- www/api/magick-image.html | 2 +- www/api/magick-property.html | 3 - www/api/magick.html | 5 +- www/api/memory.html | 2 +- www/api/module.html | 2 +- www/api/monitor.html | 5 +- www/api/montage.html | 4 +- www/api/morphology.html | 2 +- www/api/paint.html | 5 +- www/api/pixel-iterator.html | 2 +- www/api/pixel-view.html | 4 +- www/api/pixel-wand.html | 4 +- www/api/profile.html | 2 +- www/api/property.html | 2 +- www/api/quantize.html | 2 +- www/api/registry.html | 2 +- www/api/resize.html | 4 +- www/api/resource.html | 4 +- www/api/shear.html | 2 +- www/api/signature.html | 4 +- www/api/transform.html | 5 +- www/api/version.html | 2 +- www/architecture.html | 6 +- www/binary-releases.html | 48 ++++++------- www/changelog.html | 16 ++++- www/cipher.html | 2 +- www/command-line-processing.html | 2 +- www/command-line-tools.html | 6 +- www/composite.html | 3 + www/conjure.html | 3 + www/contact.html | 9 +-- www/display.html | 2 +- www/download.html | 2 +- www/examples.html | 7 +- www/formats.html | 2 +- www/high-dynamic-range.html | 4 +- www/history.html | 4 +- www/identify.html | 4 +- www/import.html | 2 +- www/index.html | 2 +- www/install-source.html | 2 +- www/jp2.html | 2 +- www/license.html | 3 + www/links.html | 96 +++++++++++++------------- www/magick-core.html | 3 - www/magick-vector-graphics.html | 3 + www/magick-wand.html | 4 +- www/miff.html | 2 +- www/mirrors.html | 6 +- www/montage.html | 5 +- www/motion-picture.html | 4 +- www/perl-magick.html | 3 - www/quantize.html | 4 +- www/resources.html | 4 +- www/sitemap.html | 52 +++++++------- www/sponsors.html | 6 +- www/stream.html | 2 +- www/subversion.html | 4 +- www/t-shirt.html | 5 +- 91 files changed, 269 insertions(+), 270 deletions(-) diff --git a/ImageMagick.spec b/ImageMagick.spec index 0278188f6..3b97748f6 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,5 +1,5 @@ %define VERSION 6.6.0 -%define Patchlevel 9 +%define Patchlevel 10 Name: ImageMagick Version: %{VERSION} diff --git a/config/configure.xml b/config/configure.xml index 21549b723..d72e15184 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -8,8 +8,8 @@ - - + + diff --git a/index.html b/index.html index 130ceae3a..decdc85ac 100644 --- a/index.html +++ b/index.html @@ -226,7 +226,7 @@ Discourse Server • - Studio + Studio   diff --git a/libtool b/libtool index a39ad7ce3..837409d42 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.0-9 +# Generated automatically by config.status (ImageMagick) 6.6.0-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 6ec3e85b0..46e704426 100644 --- a/magick/version.h +++ b/magick/version.h @@ -30,11 +30,11 @@ extern "C" { #define MagickLibVersion 0x660 #define MagickLibVersionText "6.6.0" #define MagickLibVersionNumber 3,0,0 -#define MagickLibAddendum "-9" +#define MagickLibAddendum "-10" #define MagickLibInterface 3 #define MagickLibMinInterface 3 -#define MagickReleaseDate "2010-03-21" -#define MagickChangeDate "20100320" +#define MagickReleaseDate "2010-03-24" +#define MagickChangeDate "20100323" #define MagickAuthoritativeURL "http://www.imagemagick.org" #define MagickHomeURL "file:///usr/local/share/doc/ImageMagick-6.6.0/index.html" #if (MAGICKCORE_QUANTUM_DEPTH == 8) diff --git a/version.sh b/version.sh index 118e3175a..8214798bf 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.0' PACKAGE_LIB_VERSION="0x660" -PACKAGE_RELEASE="9" +PACKAGE_RELEASE="10" PACKAGE_LIB_VERSION_NUMBER="6,6,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 6a0ccd16e..260efe6e9 100644 --- a/www/ImageMagickObject.html +++ b/www/ImageMagickObject.html @@ -124,9 +124,6 @@ Sponsors:
- diff --git a/www/advanced-unix-installation.html b/www/advanced-unix-installation.html index 68b44f98d..bda2c1b58 100644 --- a/www/advanced-unix-installation.html +++ b/www/advanced-unix-installation.html @@ -179,7 +179,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.0-8 $magick> ./configure

+

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

@@ -531,7 +531,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.0-8.tar.gz $magick> cd ImageMagick-6.6.0-8

Configure ImageMagick:

+

$magick> tar xvfz ImageMagick-6.6.0-9.tar.gz $magick> cd ImageMagick-6.6.0-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/ \
@@ -551,7 +551,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.0-?.tar.bz2 $magick> cd ImageMagick-6.6.0-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.0-?.tar.bz2 $magick> cd ImageMagick-6.6.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

Dealing with Unexpected Problems

@@ -596,7 +596,7 @@ Options used to compile and link: Discourse Server • - Studio + Studio  
diff --git a/www/advanced-windows-installation.html b/www/advanced-windows-installation.html index da7c56c23..95ff0197b 100644 --- a/www/advanced-windows-installation.html +++ b/www/advanced-windows-installation.html @@ -124,7 +124,7 @@
diff --git a/www/api/animate.html b/www/api/animate.html index 16d5b5c36..8842385b9 100644 --- a/www/api/animate.html +++ b/www/api/animate.html @@ -124,7 +124,7 @@
diff --git a/www/api/attribute.html b/www/api/attribute.html index f581f6c4c..0b4fda26f 100644 --- a/www/api/attribute.html +++ b/www/api/attribute.html @@ -123,9 +123,6 @@ Sponsors:
- diff --git a/www/api/blob.html b/www/api/blob.html index 202cedf7e..0160083f3 100644 --- a/www/api/blob.html +++ b/www/api/blob.html @@ -346,7 +346,7 @@ _8c.html" target="source" name="InjectImageBlob">InjectImageBlob Discourse Server • - Studio + Studio  
diff --git a/www/api/cache-view.html b/www/api/cache-view.html index 66cedcf4e..85984d88c 100644 --- a/www/api/cache-view.html +++ b/www/api/cache-view.html @@ -124,7 +124,7 @@
diff --git a/www/api/cache.html b/www/api/cache.html index db253ebca..abdc732fd 100644 --- a/www/api/cache.html +++ b/www/api/cache.html @@ -124,7 +124,7 @@
diff --git a/www/api/cipher.html b/www/api/cipher.html index 4797cf16a..242feb7bf 100644 --- a/www/api/cipher.html +++ b/www/api/cipher.html @@ -358,7 +358,7 @@ _8c.html" target="source" name="PasskeyEncipherImage">PasskeyEncipherImage  --> Discourse Server • - Studio + Studio  
diff --git a/www/api/color.html b/www/api/color.html index ddc621a91..81a473a2e 100644 --- a/www/api/color.html +++ b/www/api/color.html @@ -124,7 +124,7 @@