From 7d34ef217a6539f183410d0c4df4e77d95ab248a Mon Sep 17 00:00:00 2001 From: cristy Date: Thu, 25 Mar 2010 01:11:22 +0000 Subject: [PATCH] --- ImageMagick.spec | 2 +- config/configure.xml | 2 +- index.html | 4 +- libtool | 2 +- magick/version.h | 2 +- version.sh | 2 +- wand/mogrify.c | 6 ++ www/ImageMagickObject.html | 3 + www/advanced-unix-installation.html | 4 +- www/advanced-windows-installation.html | 4 +- www/animate.html | 5 +- www/api.html | 40 +++++------ www/api/attribute.html | 5 +- www/api/cache-view.html | 2 +- www/api/cache.html | 3 - www/api/cipher.html | 2 +- www/api/color.html | 2 +- www/api/compare.html | 2 +- www/api/composite.html | 2 +- www/api/constitute.html | 4 +- www/api/decorate.html | 2 +- www/api/deprecate.html | 2 +- www/api/display.html | 2 +- www/api/distort.html | 4 +- www/api/effect.html | 2 +- www/api/feature.html | 2 +- www/api/fx.html | 2 +- www/api/histogram.html | 2 +- www/api/image.html | 3 + www/api/list.html | 4 +- www/api/magick-deprecate.html | 4 +- www/api/magick-image.html | 2 +- www/api/magick-property.html | 3 + www/api/magick-wand.html | 2 +- www/api/module.html | 2 +- www/api/monitor.html | 3 + www/api/morphology.html | 5 +- www/api/paint.html | 2 +- www/api/pixel-view.html | 2 +- www/api/profile.html | 2 +- www/api/quantize.html | 2 +- www/api/registry.html | 5 +- www/api/resize.html | 2 +- www/api/resource.html | 2 +- www/api/segment.html | 4 +- www/api/shear.html | 2 +- www/api/signature.html | 2 +- www/api/transform.html | 5 +- www/architecture.html | 2 +- www/binary-releases.html | 2 +- www/changelog.html | 9 ++- www/cipher.html | 2 +- www/color.html | 4 +- www/command-line-options.html | 4 +- www/command-line-processing.html | 5 +- www/command-line-tools.html | 6 +- www/compare.html | 2 +- www/composite.html | 2 +- www/conjure.html | 2 +- www/contact.html | 2 +- www/convert.html | 4 +- www/download.html | 2 +- www/examples.html | 7 +- www/formats.html | 2 +- www/fx.html | 4 +- www/high-dynamic-range.html | 2 +- www/history.html | 4 +- www/identify.html | 4 +- www/import.html | 3 - www/index.html | 4 +- www/install-source.html | 2 +- www/jp2.html | 3 - www/license.html | 5 +- www/links.html | 96 +++++++++++++------------- www/magick-core.html | 3 + www/magick-vector-graphics.html | 4 +- www/magick-wand.html | 2 +- www/miff.html | 2 +- www/mirrors.html | 4 +- www/montage.html | 5 +- www/motion-picture.html | 4 +- www/perl-magick.html | 3 + www/quantize.html | 4 +- www/resources.html | 5 +- www/search.html | 2 +- www/sitemap.html | 52 +++++++------- www/sponsors.html | 2 +- www/stream.html | 4 +- www/subversion.html | 2 +- www/t-shirt.html | 3 + 90 files changed, 232 insertions(+), 227 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 6686e84d2..d72e15184 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -8,7 +8,7 @@ - + diff --git a/index.html b/index.html index decdc85ac..4156a37f8 100644 --- a/index.html +++ b/index.html @@ -124,7 +124,7 @@
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 c22dbbfb3..9c3ea3787 100644 --- a/magick/version.h +++ b/magick/version.h @@ -30,7 +30,7 @@ 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-24" 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/wand/mogrify.c b/wand/mogrify.c index cbbfc5700..667ac5d31 100644 --- a/wand/mogrify.c +++ b/wand/mogrify.c @@ -2191,6 +2191,12 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, } if (LocaleCompare("monitor",option+1) == 0) { + if (*option == '+') + { + (void) SetImageProgressMonitor(*image, + (MagickProgressMonitor) NULL,(void *) NULL); + break; + } (void) SetImageProgressMonitor(*image,MonitorProgress, (void *) NULL); break; diff --git a/www/ImageMagickObject.html b/www/ImageMagickObject.html index 260efe6e9..f3f8457e8 100644 --- a/www/ImageMagickObject.html +++ b/www/ImageMagickObject.html @@ -124,6 +124,9 @@ Sponsors:
+ diff --git a/www/advanced-unix-installation.html b/www/advanced-unix-installation.html index bda2c1b58..fd67a7330 100644 --- a/www/advanced-unix-installation.html +++ b/www/advanced-unix-installation.html @@ -124,7 +124,7 @@
diff --git a/www/advanced-windows-installation.html b/www/advanced-windows-installation.html index 95ff0197b..6da785146 100644 --- a/www/advanced-windows-installation.html +++ b/www/advanced-windows-installation.html @@ -124,7 +124,7 @@
diff --git a/www/animate.html b/www/animate.html index 5335d57fd..4a0e9cf08 100644 --- a/www/animate.html +++ b/www/animate.html @@ -124,9 +124,6 @@ Sponsors:
- @@ -615,7 +612,7 @@ transparent, extract, background, or shape the alpha channel Discourse Server • - Studio + Studio  
diff --git a/www/api.html b/www/api.html index 1e07184d3..504918a03 100644 --- a/www/api.html +++ b/www/api.html @@ -163,7 +163,7 @@

Ada

-

G2F implements an Ada 95 binding to a subset of the low-level MagickCore library.

+

G2F implements an Ada 95 binding to a subset of the low-level MagickCore library.

C

@@ -175,7 +175,7 @@

Ch

-

ChMagick is a Ch binding to the MagickCore and MagickWand API. Ch is an embeddable C/C++ interpreter for cross-platform scripting.

+

ChMagick is a Ch binding to the MagickCore and MagickWand API. Ch is an embeddable C/C++ interpreter for cross-platform scripting.

COM+

@@ -187,31 +187,31 @@

C++

-

Magick++ provides an object-oriented C++ interface to ImageMagick. See A Gentle Introduction to Magick++ for an introductory tutorial to Magick++. We include the source if you want to correct, enhance, or expand the tutorial.

+

Magick++ provides an object-oriented C++ interface to ImageMagick. See A Gentle Introduction to Magick++ for an introductory tutorial to Magick++. We include the source if you want to correct, enhance, or expand the tutorial.

Java

-

JMagick provides an object-oriented Java interface to ImageMagick. Im4java is a pure-java interface to the ImageMagick command-line.

+

JMagick provides an object-oriented Java interface to ImageMagick. Im4java is a pure-java interface to the ImageMagick command-line.

LabVIEW

-

LVOOP ImageMagick is an object-oriented LabVIEW interface to ImageMagick.

+

LVOOP ImageMagick is an object-oriented LabVIEW interface to ImageMagick.

Lisp

-

CL-Magick provides a Common Lisp interface to the ImageMagick library.

+

CL-Magick provides a Common Lisp interface to the ImageMagick library.

Neko

-

NMagick is a port of the ImageMagick library to the haXe and Neko platforms. It provides image manipulation capabilities to both web and desktop applications using Neko.

+

NMagick is a port of the ImageMagick library to the haXe and Neko platforms. It provides image manipulation capabilities to both web and desktop applications using Neko.

.NET

@@ -225,7 +225,7 @@

Pascal

-

PascalMagick a Pascal binding for the MagickWand API and also the low-level MagickCore library. It works with Free Pascal / Lazarus and Delphi.

+

PascalMagick a Pascal binding for the MagickWand API and also the low-level MagickCore library. It works with Free Pascal / Lazarus and Delphi.

Perl

@@ -237,50 +237,50 @@

PHP

-

MagickWand for PHP a native PHP-extension to the ImageMagick MagickWand API.

+

MagickWand for PHP a native PHP-extension to the ImageMagick MagickWand API.

-

IMagick is a native PHP extension to create and modify images using the ImageMagick API. Documentation for the extension is available here.

+

IMagick is a native PHP extension to create and modify images using the ImageMagick API. Documentation for the extension is available here.

-

phMagick is a wrapper class for ImageMagick, wrapping the most common web image manipulation actions in easy to use functions, but allowing full access to ImageMagick's power by issuing system calls to it's command-line programs.

+

phMagick is a wrapper class for ImageMagick, wrapping the most common web image manipulation actions in easy to use functions, but allowing full access to ImageMagick's power by issuing system calls to it's command-line programs.

Python

-

PythonMagickWand is an object-oriented Python interface to MagickWand based on ctypes.

+

PythonMagickWand is an object-oriented Python interface to MagickWand based on ctypes.

-

PythonMagick is an object-oriented Python interface to ImageMagick.

+

PythonMagick is an object-oriented Python interface to ImageMagick.

REALbasic

-

The MBS Realbasic ImageMagick is a plugin that utilizes the power of ImageMagick from within the RealBasic environment.

+

The MBS Realbasic ImageMagick is a plugin that utilizes the power of ImageMagick from within the RealBasic environment.

Ruby

-

RMagick is an interface between the Ruby programming language and the MagickCore image processing libraries. Get started with RMagick by perusing the documentation.

+

RMagick is an interface between the Ruby programming language and the MagickCore image processing libraries. Get started with RMagick by perusing the documentation.

-

MagickWand for Ruby is an interface between the Ruby programming language and the MagickWand image processing libraries. Get started with MagickWand for PHP by perusing the documentation.

+

MagickWand for Ruby is an interface between the Ruby programming language and the MagickWand image processing libraries. Get started with MagickWand for PHP by perusing the documentation.

-

MiniMagick is a Ruby wrapper for ImageMagick command line. MiniMagick gives you convenient access to all the command line options ImageMagick supports.

+

MiniMagick is a Ruby wrapper for ImageMagick command line. MiniMagick gives you convenient access to all the command line options ImageMagick supports.

-

QuickMagick is a gem for easily accessing ImageMagick command line tools from Ruby programs.

+

QuickMagick is a gem for easily accessing ImageMagick command line tools from Ruby programs.

Tcl/Tk

-

TclMagick a native Tcl-extension to the ImageMagick MagickWand API.

+

TclMagick a native Tcl-extension to the ImageMagick MagickWand API.

XML RPC

-

RemoteMagick is an XML-RPC web service that creates image thumbnails.

+

RemoteMagick is an XML-RPC web service that creates image thumbnails.

diff --git a/www/api/attribute.html b/www/api/attribute.html index 0b4fda26f..2e5e2ffbf 100644 --- a/www/api/attribute.html +++ b/www/api/attribute.html @@ -123,6 +123,9 @@ Sponsors:
+ @@ -330,7 +333,7 @@ _8c.html" target="source" name="SetImageChannelDepth">SetImageChannelDepth  --> Discourse Server • - Studio + Studio  
diff --git a/www/api/cache-view.html b/www/api/cache-view.html index 85984d88c..d35c9c382 100644 --- a/www/api/cache-view.html +++ b/www/api/cache-view.html @@ -124,7 +124,7 @@