From fbe485afe671dae03d2c70e25872e5507c29dbe7 Mon Sep 17 00:00:00 2001 From: cristy Date: Tue, 22 Feb 2011 13:54:48 +0000 Subject: [PATCH] --- ImageMagick.spec | 2 +- config/configure.xml | 2 +- libtool | 2 +- magick/utility.c | 6 +++++- magick/version.h | 2 +- version.sh | 2 +- www/ImageMagickObject.html | 2 +- www/advanced-unix-installation.html | 2 +- www/advanced-windows-installation.html | 2 +- www/animate.html | 2 +- www/api.html | 2 +- www/api/animate.html | 2 +- www/api/annotate.html | 2 +- www/api/attribute.html | 2 +- www/api/blob.html | 2 +- www/api/cache-view.html | 2 +- www/api/cache.html | 2 +- www/api/cipher.html | 2 +- www/api/color.html | 2 +- www/api/colormap.html | 2 +- www/api/compare.html | 2 +- www/api/composite.html | 2 +- www/api/decorate.html | 2 +- www/api/deprecate.html | 2 +- www/api/display.html | 2 +- www/api/distort.html | 2 +- www/api/draw.html | 2 +- www/api/drawing-wand.html | 2 +- www/api/effect.html | 2 +- www/api/enhance.html | 2 +- www/api/exception.html | 2 +- www/api/feature.html | 2 +- www/api/fourier.html | 2 +- www/api/fx.html | 2 +- www/api/image.html | 2 +- www/api/layer.html | 2 +- www/api/list.html | 2 +- www/api/magick-deprecate.html | 2 +- www/api/magick-image.html | 2 +- www/api/magick-property.html | 2 +- www/api/magick-wand.html | 2 +- www/api/magick.html | 2 +- www/api/memory.html | 2 +- www/api/mogrify.html | 2 +- www/api/monitor.html | 2 +- www/api/morphology.html | 2 +- www/api/pixel-iterator.html | 2 +- www/api/profile.html | 2 +- www/api/registry.html | 2 +- www/api/resize.html | 2 +- www/api/resource.html | 2 +- www/api/segment.html | 2 +- www/api/signature.html | 2 +- www/api/transform.html | 2 +- www/api/version.html | 2 +- www/architecture.html | 2 +- www/binary-releases.html | 2 +- www/cipher.html | 2 +- www/color.html | 2 +- www/command-line-options.html | 2 +- www/command-line-processing.html | 2 +- www/command-line-tools.html | 2 +- www/compare.html | 2 +- www/composite.html | 2 +- www/conjure.html | 2 +- www/contact.html | 2 +- www/convert.html | 2 +- www/display.html | 2 +- www/escape.html | 2 +- www/examples.html | 2 +- www/exception.html | 2 +- www/export.html | 2 +- www/formats.html | 2 +- www/fx.html | 2 +- www/identify.html | 2 +- www/import.html | 2 +- www/install-source.html | 2 +- www/jp2.html | 2 +- www/license.html | 2 +- www/links.html | 2 +- www/magick++.html | 2 +- www/magick-core.html | 2 +- www/magick-vector-graphics.html | 2 +- www/miff.html | 2 +- www/mogrify.html | 2 +- www/montage.html | 2 +- www/motion-picture.html | 2 +- www/quantize.html | 2 +- www/search.html | 2 +- www/sitemap.html | 2 +- www/sponsors.html | 2 +- www/stream.html | 2 +- 92 files changed, 96 insertions(+), 92 deletions(-) diff --git a/ImageMagick.spec b/ImageMagick.spec index d24a9f4de..9de810268 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,5 +1,5 @@ %global VERSION 6.6.7 -%global Patchlevel 9 +%global Patchlevel 10 Name: ImageMagick Version: %{VERSION} diff --git a/config/configure.xml b/config/configure.xml index 0bf6f587c..2f834b107 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -8,7 +8,7 @@ - + diff --git a/libtool b/libtool index 5eb38a74e..d1dc64dd3 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.7-9 +# Generated automatically by config.status (ImageMagick) 6.6.7-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/utility.c b/magick/utility.c index 733d94de9..32b37e4de 100644 --- a/magick/utility.c +++ b/magick/utility.c @@ -939,8 +939,12 @@ MagickExport MagickBooleanType ExpandFilenames(int *number_arguments, */ MagickExport MagickBooleanType GetExecutionPath(char *path,const size_t extent) { + char + *directory; + *path='\0'; - (void) getcwd(path,(unsigned long) extent); + directory=getcwd(path,(unsigned long) extent); + (void) directory; #if defined(MAGICKCORE_HAVE_GETPID) && defined(MAGICKCORE_HAVE_READLINK) && defined(PATH_MAX) { char diff --git a/magick/version.h b/magick/version.h index 0d046f4b4..f3d210fd7 100644 --- a/magick/version.h +++ b/magick/version.h @@ -30,7 +30,7 @@ extern "C" { #define MagickLibVersion 0x667 #define MagickLibVersionText "6.6.7" #define MagickLibVersionNumber 4,0,1 -#define MagickLibAddendum "-9" +#define MagickLibAddendum "-10" #define MagickLibInterface 4 #define MagickLibMinInterface 4 #define MagickReleaseDate "2011-02-22" diff --git a/version.sh b/version.sh index c66b6090a..aa602401d 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.7' PACKAGE_LIB_VERSION="0x667" -PACKAGE_RELEASE="9" +PACKAGE_RELEASE="10" PACKAGE_LIB_VERSION_NUMBER="6,6,7,${PACKAGE_RELEASE}" PACKAGE_RELEASE_DATE=`date +%F` PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION" diff --git a/www/ImageMagickObject.html b/www/ImageMagickObject.html index a7c58ee30..b0c88e7aa 100644 --- a/www/ImageMagickObject.html +++ b/www/ImageMagickObject.html @@ -172,7 +172,7 @@ Druckerei diff --git a/www/advanced-unix-installation.html b/www/advanced-unix-installation.html index 72b514100..b0891cf50 100644 --- a/www/advanced-unix-installation.html +++ b/www/advanced-unix-installation.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/advanced-windows-installation.html b/www/advanced-windows-installation.html index 51d079c79..376821716 100644 --- a/www/advanced-windows-installation.html +++ b/www/advanced-windows-installation.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/animate.html b/www/animate.html index 4c42d746f..780a7f6d2 100644 --- a/www/animate.html +++ b/www/animate.html @@ -172,7 +172,7 @@ Druckerei diff --git a/www/api.html b/www/api.html index 45a48ce89..395da4cf8 100644 --- a/www/api.html +++ b/www/api.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/animate.html b/www/api/animate.html index 3f7999541..efb19af27 100644 --- a/www/api/animate.html +++ b/www/api/animate.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/annotate.html b/www/api/annotate.html index a786ebe6f..d0741fd60 100644 --- a/www/api/annotate.html +++ b/www/api/annotate.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/attribute.html b/www/api/attribute.html index 6d53c60c0..dea0d00cb 100644 --- a/www/api/attribute.html +++ b/www/api/attribute.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/blob.html b/www/api/blob.html index 3576a625d..19187ff56 100644 --- a/www/api/blob.html +++ b/www/api/blob.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/cache-view.html b/www/api/cache-view.html index 03875776e..7a0b726c4 100644 --- a/www/api/cache-view.html +++ b/www/api/cache-view.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/cache.html b/www/api/cache.html index 4822959ca..8067297da 100644 --- a/www/api/cache.html +++ b/www/api/cache.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/cipher.html b/www/api/cipher.html index fbf213438..23d09046b 100644 --- a/www/api/cipher.html +++ b/www/api/cipher.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/color.html b/www/api/color.html index a7b4d921d..d07a9df89 100644 --- a/www/api/color.html +++ b/www/api/color.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/colormap.html b/www/api/colormap.html index 17661e350..a4b122231 100644 --- a/www/api/colormap.html +++ b/www/api/colormap.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/compare.html b/www/api/compare.html index 6cb8d4f42..000b349d7 100644 --- a/www/api/compare.html +++ b/www/api/compare.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/composite.html b/www/api/composite.html index 4b35ac53a..fdf4c14ac 100644 --- a/www/api/composite.html +++ b/www/api/composite.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/decorate.html b/www/api/decorate.html index 88c021b2e..1b750744b 100644 --- a/www/api/decorate.html +++ b/www/api/decorate.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/deprecate.html b/www/api/deprecate.html index cbb91a596..e3a9ec1cc 100644 --- a/www/api/deprecate.html +++ b/www/api/deprecate.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/display.html b/www/api/display.html index eb5c14371..e272443e6 100644 --- a/www/api/display.html +++ b/www/api/display.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/distort.html b/www/api/distort.html index 22f2147a6..7f90763a2 100644 --- a/www/api/distort.html +++ b/www/api/distort.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/draw.html b/www/api/draw.html index 88467ef52..2b6682226 100644 --- a/www/api/draw.html +++ b/www/api/draw.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/drawing-wand.html b/www/api/drawing-wand.html index ba0706341..d77afcf15 100644 --- a/www/api/drawing-wand.html +++ b/www/api/drawing-wand.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/effect.html b/www/api/effect.html index 8e8cde196..d322378e0 100644 --- a/www/api/effect.html +++ b/www/api/effect.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/enhance.html b/www/api/enhance.html index b9dd1f80d..c67ac79f0 100644 --- a/www/api/enhance.html +++ b/www/api/enhance.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/exception.html b/www/api/exception.html index a6899857e..6f7bbadd7 100644 --- a/www/api/exception.html +++ b/www/api/exception.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/feature.html b/www/api/feature.html index 257c91498..078bf108a 100644 --- a/www/api/feature.html +++ b/www/api/feature.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/fourier.html b/www/api/fourier.html index 9f5988283..c389ba74d 100644 --- a/www/api/fourier.html +++ b/www/api/fourier.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/fx.html b/www/api/fx.html index 1bc2709b6..e616956fe 100644 --- a/www/api/fx.html +++ b/www/api/fx.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/image.html b/www/api/image.html index 7ed48c6aa..578168813 100644 --- a/www/api/image.html +++ b/www/api/image.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/layer.html b/www/api/layer.html index 8235fe3b8..98b5056f5 100644 --- a/www/api/layer.html +++ b/www/api/layer.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/list.html b/www/api/list.html index ec4f6f8bb..de02120a5 100644 --- a/www/api/list.html +++ b/www/api/list.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/magick-deprecate.html b/www/api/magick-deprecate.html index 3627e0361..1a5d0f2ed 100644 --- a/www/api/magick-deprecate.html +++ b/www/api/magick-deprecate.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/magick-image.html b/www/api/magick-image.html index fe9a1f77b..e71749d42 100644 --- a/www/api/magick-image.html +++ b/www/api/magick-image.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/magick-property.html b/www/api/magick-property.html index 055ad4a51..872c07f99 100644 --- a/www/api/magick-property.html +++ b/www/api/magick-property.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/magick-wand.html b/www/api/magick-wand.html index c0c0ec313..253602ea9 100644 --- a/www/api/magick-wand.html +++ b/www/api/magick-wand.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/magick.html b/www/api/magick.html index 910fbb982..be8e0c5cb 100644 --- a/www/api/magick.html +++ b/www/api/magick.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/memory.html b/www/api/memory.html index a90a80094..e4ace3265 100644 --- a/www/api/memory.html +++ b/www/api/memory.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/mogrify.html b/www/api/mogrify.html index 8221f093f..6dded0bb4 100644 --- a/www/api/mogrify.html +++ b/www/api/mogrify.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/monitor.html b/www/api/monitor.html index 89c0e3c3a..fb81df89a 100644 --- a/www/api/monitor.html +++ b/www/api/monitor.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/morphology.html b/www/api/morphology.html index cb384b2d5..d7b3da77e 100644 --- a/www/api/morphology.html +++ b/www/api/morphology.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/pixel-iterator.html b/www/api/pixel-iterator.html index 94544c93a..18f84c2ef 100644 --- a/www/api/pixel-iterator.html +++ b/www/api/pixel-iterator.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/profile.html b/www/api/profile.html index 968f77a1a..e2edd8fed 100644 --- a/www/api/profile.html +++ b/www/api/profile.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/registry.html b/www/api/registry.html index 27aeb2d89..af36e4074 100644 --- a/www/api/registry.html +++ b/www/api/registry.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/resize.html b/www/api/resize.html index fe26b346c..175be8499 100644 --- a/www/api/resize.html +++ b/www/api/resize.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/resource.html b/www/api/resource.html index 54983a679..53b122ff1 100644 --- a/www/api/resource.html +++ b/www/api/resource.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/segment.html b/www/api/segment.html index e25227b03..59e60789d 100644 --- a/www/api/segment.html +++ b/www/api/segment.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/signature.html b/www/api/signature.html index 8b2e3ea02..1999acc34 100644 --- a/www/api/signature.html +++ b/www/api/signature.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/transform.html b/www/api/transform.html index cea27c2fc..08b863e93 100644 --- a/www/api/transform.html +++ b/www/api/transform.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/api/version.html b/www/api/version.html index d6880160c..dcf07d6f0 100644 --- a/www/api/version.html +++ b/www/api/version.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/architecture.html b/www/architecture.html index 94a0d2adf..922f58337 100644 --- a/www/architecture.html +++ b/www/architecture.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/binary-releases.html b/www/binary-releases.html index 84b416812..a6a3eb6da 100644 --- a/www/binary-releases.html +++ b/www/binary-releases.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/cipher.html b/www/cipher.html index 72a8026bc..530867592 100644 --- a/www/cipher.html +++ b/www/cipher.html @@ -172,7 +172,7 @@ Druckerei diff --git a/www/color.html b/www/color.html index 1988d5fa3..74a1abf0e 100644 --- a/www/color.html +++ b/www/color.html @@ -172,7 +172,7 @@ Druckerei diff --git a/www/command-line-options.html b/www/command-line-options.html index 0cc25880a..6995fdabc 100644 --- a/www/command-line-options.html +++ b/www/command-line-options.html @@ -175,7 +175,7 @@ Druckerei diff --git a/www/command-line-processing.html b/www/command-line-processing.html index 625059817..e521f8104 100644 --- a/www/command-line-processing.html +++ b/www/command-line-processing.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/command-line-tools.html b/www/command-line-tools.html index ecbf22e21..9c3017c8c 100644 --- a/www/command-line-tools.html +++ b/www/command-line-tools.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/compare.html b/www/compare.html index a4139c38e..50693287b 100644 --- a/www/compare.html +++ b/www/compare.html @@ -172,7 +172,7 @@ Druckerei diff --git a/www/composite.html b/www/composite.html index c2a3d4a63..85211e8ac 100644 --- a/www/composite.html +++ b/www/composite.html @@ -172,7 +172,7 @@ Druckerei diff --git a/www/conjure.html b/www/conjure.html index 3f07cf010..1937da5c8 100644 --- a/www/conjure.html +++ b/www/conjure.html @@ -172,7 +172,7 @@ Druckerei diff --git a/www/contact.html b/www/contact.html index e27bbf548..38bc48564 100644 --- a/www/contact.html +++ b/www/contact.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/convert.html b/www/convert.html index 41ff2884f..adc7f2bc0 100644 --- a/www/convert.html +++ b/www/convert.html @@ -172,7 +172,7 @@ Druckerei diff --git a/www/display.html b/www/display.html index bc5d03f15..064fedfc1 100644 --- a/www/display.html +++ b/www/display.html @@ -172,7 +172,7 @@ Druckerei diff --git a/www/escape.html b/www/escape.html index 8beb0cd61..a3c4ae238 100644 --- a/www/escape.html +++ b/www/escape.html @@ -172,7 +172,7 @@ Druckerei diff --git a/www/examples.html b/www/examples.html index 5959aebce..4c7a4d45d 100644 --- a/www/examples.html +++ b/www/examples.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/exception.html b/www/exception.html index 6713b0aad..abfe238e1 100644 --- a/www/exception.html +++ b/www/exception.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/export.html b/www/export.html index ab9da6062..3141a7ebe 100644 --- a/www/export.html +++ b/www/export.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/formats.html b/www/formats.html index 0f0d67ea5..71a689fde 100644 --- a/www/formats.html +++ b/www/formats.html @@ -172,7 +172,7 @@ Druckerei diff --git a/www/fx.html b/www/fx.html index 366d4e784..4377e5b0b 100644 --- a/www/fx.html +++ b/www/fx.html @@ -172,7 +172,7 @@ Druckerei diff --git a/www/identify.html b/www/identify.html index 513200400..74185d8da 100644 --- a/www/identify.html +++ b/www/identify.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/import.html b/www/import.html index 5c39e0087..a98c56d26 100644 --- a/www/import.html +++ b/www/import.html @@ -172,7 +172,7 @@ Druckerei diff --git a/www/install-source.html b/www/install-source.html index 092b5e05f..dd0083813 100644 --- a/www/install-source.html +++ b/www/install-source.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/jp2.html b/www/jp2.html index 2e0b951c5..8badeb47f 100644 --- a/www/jp2.html +++ b/www/jp2.html @@ -172,7 +172,7 @@ Druckerei diff --git a/www/license.html b/www/license.html index 3c182bfd0..49e28f17c 100644 --- a/www/license.html +++ b/www/license.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/links.html b/www/links.html index 6922b5ab5..5c419909d 100644 --- a/www/links.html +++ b/www/links.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/magick++.html b/www/magick++.html index 94be08ce7..e422bb989 100644 --- a/www/magick++.html +++ b/www/magick++.html @@ -172,7 +172,7 @@ Druckerei diff --git a/www/magick-core.html b/www/magick-core.html index 9935d65af..58ed97a96 100644 --- a/www/magick-core.html +++ b/www/magick-core.html @@ -172,7 +172,7 @@ Druckerei diff --git a/www/magick-vector-graphics.html b/www/magick-vector-graphics.html index cf8f9e49d..f3dccddc5 100644 --- a/www/magick-vector-graphics.html +++ b/www/magick-vector-graphics.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/miff.html b/www/miff.html index 25b61d61a..33982080c 100644 --- a/www/miff.html +++ b/www/miff.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/mogrify.html b/www/mogrify.html index d8430f0c9..43debc01e 100644 --- a/www/mogrify.html +++ b/www/mogrify.html @@ -172,7 +172,7 @@ Druckerei diff --git a/www/montage.html b/www/montage.html index 7c1149cb7..2ca041b0b 100644 --- a/www/montage.html +++ b/www/montage.html @@ -172,7 +172,7 @@ Druckerei diff --git a/www/motion-picture.html b/www/motion-picture.html index 05dc4f5a1..abe4b9f4d 100644 --- a/www/motion-picture.html +++ b/www/motion-picture.html @@ -172,7 +172,7 @@ Druckerei diff --git a/www/quantize.html b/www/quantize.html index 8fedb1d4f..fc0a723af 100644 --- a/www/quantize.html +++ b/www/quantize.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/search.html b/www/search.html index c87f44ef8..54b19069b 100644 --- a/www/search.html +++ b/www/search.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/sitemap.html b/www/sitemap.html index 1645c7b8c..a860d7003 100644 --- a/www/sitemap.html +++ b/www/sitemap.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/sponsors.html b/www/sponsors.html index 7572e4df9..5e4a42e72 100644 --- a/www/sponsors.html +++ b/www/sponsors.html @@ -171,7 +171,7 @@ Druckerei diff --git a/www/stream.html b/www/stream.html index cf95867dd..c188ea102 100644 --- a/www/stream.html +++ b/www/stream.html @@ -172,7 +172,7 @@ Druckerei -- 2.40.0