From bc3392ad730a0886c1fabc9ae546b4de30a98526 Mon Sep 17 00:00:00 2001 From: cristy Date: Tue, 6 Oct 2009 03:15:57 +0000 Subject: [PATCH] --- ImageMagick.spec | 2 +- config/configure.xml | 2 +- index.html | 2 +- libtool | 2 +- magick/string.c | 139 +++++++++++-------------------- magick/version.h | 4 +- version.sh | 2 +- www/animate.html | 2 +- www/api.html | 40 ++++----- www/api/cipher.html | 2 +- www/api/color.html | 2 +- www/api/compare.html | 2 +- www/api/composite.html | 2 +- www/api/constitute.html | 2 +- www/api/decorate.html | 2 +- www/api/display.html | 2 +- www/api/drawing-wand.html | 4 +- www/api/effect.html | 4 +- www/api/fx.html | 2 +- www/api/list.html | 2 +- www/api/magick-deprecate.html | 4 +- www/api/magick-image.html | 2 +- www/api/magick-property.html | 2 +- www/api/magick-wand.html | 4 +- www/api/magick.html | 2 +- www/api/memory.html | 2 +- www/api/monitor.html | 2 +- www/api/paint.html | 2 +- www/api/pixel-iterator.html | 2 +- www/api/profile.html | 4 +- www/api/quantize.html | 2 +- www/api/shear.html | 4 +- www/api/signature.html | 2 +- www/api/stream.html | 2 +- www/api/transform.html | 2 +- www/changelog.html | 2 +- www/color.html | 2 +- www/command-line-processing.html | 2 +- www/command-line-tools.html | 4 +- www/compare.html | 2 +- www/conjure.html | 2 +- www/contact.html | 2 +- www/display.html | 2 +- www/escape.html | 2 +- www/examples.html | 4 +- www/exception.html | 4 +- www/formats.html | 2 +- www/fx.html | 2 +- www/high-dynamic-range.html | 2 +- www/history.html | 2 +- www/index.html | 2 +- www/install-source.html | 2 +- www/license.html | 2 +- www/links.html | 94 ++++++++++----------- www/magick-core.html | 2 +- www/magick-vector-graphics.html | 2 +- www/mailing-list.html | 10 +-- www/miff.html | 2 +- www/mirrors.html | 4 +- www/mogrify.html | 2 +- www/quantize.html | 2 +- www/resources.html | 2 +- www/search.html | 2 +- www/sitemap.html | 52 ++++++------ www/sponsors.html | 2 +- www/stream.html | 2 +- www/subversion.html | 2 +- www/t-shirt.html | 2 +- 68 files changed, 220 insertions(+), 263 deletions(-) diff --git a/ImageMagick.spec b/ImageMagick.spec index 49c19a36c..584bce60f 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,5 +1,5 @@ %define VERSION 6.5.6 -%define Patchlevel 9 +%define Patchlevel 10 Name: ImageMagick Version: %{VERSION} diff --git a/config/configure.xml b/config/configure.xml index 31d9296b0..f7a03338b 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -8,7 +8,7 @@ - + diff --git a/index.html b/index.html index 898c83388..7093cbe0c 100644 --- a/index.html +++ b/index.html @@ -217,7 +217,7 @@ Discourse ServerMailing Lists • - Studio + Studio   diff --git a/libtool b/libtool index fa2e69b11..5560e405b 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.5.6-9 +# Generated automatically by config.status (ImageMagick) 6.5.6-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/string.c b/magick/string.c index b5a3ff69c..310f61d86 100644 --- a/magick/string.c +++ b/magick/string.c @@ -1144,7 +1144,7 @@ MagickExport long FormatMagickTime(const time_t time,const size_t length, (void) localtime_r(&time,&local_time); #else { - struct tm + struct tm *my_time; my_time=localtime(&time); @@ -1156,7 +1156,7 @@ MagickExport long FormatMagickTime(const time_t time,const size_t length, (void) gmtime_r(&time,&gm_time); #else { - struct tm + struct tm *my_time; my_time=gmtime(&time); @@ -2373,7 +2373,9 @@ MagickExport void StripString(char *message) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % SubstituteString() performs string substitution on a buffer, replacing the -% buffer with the substituted version. Buffer must be allocate from the heap. +% buffer with the substituted version. Buffer must be allocated from the heap. +% If the string is matched and status, MagickTrue is returned otherwise +% MagickFalse. % % The format of the SubstituteString method is: % @@ -2382,113 +2384,68 @@ MagickExport void StripString(char *message) % % A description of each parameter follows: % -% o buffer: the buffer to perform replacements on. Replaced with new +% o buffer: the buffer to perform replacements on; replaced with new % allocation if a replacement is made. % -% o search: String to search for. +% o search: search for this string. % -% o replace: Replacement string. +% o replace: replace any matches with this string. % */ MagickExport MagickBooleanType SubstituteString(char **buffer, const char *search,const char *replace) { - char - *result; + MagickBooleanType + status; - const char - *match, - *source; + register char + *p; - MagickOffsetType - destination_offset; + register size_t + i; size_t - copy_length, - length, - replace_length, - result_length, - search_length; - - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); - assert(buffer != (char **) NULL); - assert(*buffer != (char *) NULL); - assert(search != (const char *) NULL); - assert(replace != (const char *) NULL); - if (strcmp(search,replace) == 0) - return(MagickTrue); - source=(*buffer); - match=strstr(source,search); - if (match == (char *) NULL) - return(MagickFalse); - result=(char *) NULL; - length=strlen(source); - if (~length >= MaxTextExtent) - result=(char *) AcquireQuantumMemory(length+MaxTextExtent,sizeof(*result)); - if (result == (char *) NULL) - ThrowFatalException(ResourceLimitFatalError,"UnableToAcquireString"); - *result='\0'; - result_length=0; - destination_offset=0; - replace_length=strlen(replace); - for (search_length=strlen(search); match != (char *) NULL; ) + extent, + replace_extent, + search_extent; + + status=MagickFalse; + search_extent=0, + replace_extent=0; + p=(*buffer); + for (i=0; *(p+i) != '\0'; i++) { + if (*(p+i) != *search) + continue; + if (strcmp(p+i,search) != 0) + continue; /* - Copy portion before match. + We found a match. */ - copy_length=(size_t) (match-source); - if (copy_length != 0) + if (search_extent == 0) + search_extent=strlen(search); + if (replace_extent == 0) + replace_extent=strlen(replace); + if (replace_extent > search_extent) { - result_length+=copy_length; - if ((result_length+MaxTextExtent) >= length) - { - length+=copy_length; - result=(char *) ResizeQuantumMemory(result,length+MaxTextExtent, - sizeof(*result)); - if (result == (char *) NULL) - ThrowFatalException(ResourceLimitFatalError, - "UnableToAcquireString"); - } - (void) CopyMagickString(result+destination_offset,source,copy_length+1); - destination_offset+=copy_length; - } - /* - Copy replacement. - */ - result_length+=replace_length; - if ((result_length+MaxTextExtent) >= length) - { - length+=replace_length; - result=(char *) ResizeQuantumMemory(result,length+MaxTextExtent, - sizeof(*result)); - if (result == (char *) NULL) + /* + Make room for the replacement string. + */ + extent=strlen(p)+replace_extent-search_extent; + p=(char *) ResizeQuantumMemory(p,extent+MaxTextExtent,sizeof(*p)); + *buffer=p; + if (p == (char *) NULL) ThrowFatalException(ResourceLimitFatalError,"UnableToAcquireString"); } - (void) ConcatenateMagickString(result+destination_offset,replace,length); - destination_offset+=replace_length; /* - Find next match. + Replace string. */ - source=match; - source+=search_length; - match=strstr(source,search); + status=MagickTrue; + if (search_extent != replace_extent) + (void) CopyMagickMemory(p+replace_extent+i,p+search_extent+i, + strlen(p+search_extent+i)+1); + (void) CopyMagickMemory(p+i,replace,replace_extent); + i+=replace_extent; } - /* - Copy remaining string. - */ - copy_length=strlen(source); - result_length+=copy_length; - if ((result_length+MaxTextExtent) >= length) - { - length+=copy_length; - result=(char *) ResizeQuantumMemory(result,length+MaxTextExtent, - sizeof(*result)); - if (result == (char *) NULL) - ThrowFatalException(ResourceLimitFatalError,"UnableToAcquireString"); - } - (void) ConcatenateMagickString(result+destination_offset,source,(size_t) - (length+MaxTextExtent-destination_offset)); - (void) RelinquishMagickMemory(*buffer); - *buffer=result; - return(MagickTrue); + return(status); } diff --git a/magick/version.h b/magick/version.h index b25e268c8..00056ce6d 100644 --- a/magick/version.h +++ b/magick/version.h @@ -30,9 +30,9 @@ extern "C" { #define MagickLibVersion 0x656 #define MagickLibVersionText "6.5.6" #define MagickLibVersionNumber 2,0,0 -#define MagickLibSubversion "-9" +#define MagickLibSubversion "-10" #define MagickReleaseDate "2009-10-05" -#define MagickChangeDate "20091003" +#define MagickChangeDate "20091004" #define MagickAuthoritativeURL "http://www.imagemagick.org" #define MagickHomeURL "file:///usr/local/share/doc/ImageMagick-6.5.6/index.html" #if (MAGICKCORE_QUANTUM_DEPTH == 8) diff --git a/version.sh b/version.sh index ceb46d7a7..99870a451 100644 --- a/version.sh +++ b/version.sh @@ -12,7 +12,7 @@ PACKAGE_NAME='ImageMagick' # PACKAGE_NAME (e.g. "1.0.0"). PACKAGE_VERSION='6.5.6' PACKAGE_LIB_VERSION="0x656" -PACKAGE_RELEASE="9" +PACKAGE_RELEASE="10" PACKAGE_LIB_VERSION_NUMBER="6,5,6,${PACKAGE_RELEASE}" PACKAGE_RELEASE_DATE=`date +%F` PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION" diff --git a/www/animate.html b/www/animate.html index 8b5c82f24..4395f22a7 100644 --- a/www/animate.html +++ b/www/animate.html @@ -607,7 +607,7 @@ transparent, extract, background, or shape the alpha channel Discourse ServerMailing Lists • - Studio + Studio   diff --git a/www/api.html b/www/api.html index ded8b3ad0..f4200cea1 100644 --- a/www/api.html +++ b/www/api.html @@ -159,7 +159,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

@@ -171,7 +171,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+

@@ -183,31 +183,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

@@ -221,7 +221,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

@@ -233,50 +233,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

-

PythonMagick an object-oriented Python interface to ImageMagick.

+

PythonMagick an object-oriented Python interface to ImageMagick.

-

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

+

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

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/cipher.html b/www/api/cipher.html index dc87947b3..e19934162 100644 --- a/www/api/cipher.html +++ b/www/api/cipher.html @@ -355,7 +355,7 @@ _8c.html" target="source" name="PasskeyEncipherImage">PasskeyEncipherImage Discourse ServerMailing Lists • - Studio + Studio   diff --git a/www/api/color.html b/www/api/color.html index 423d9f9a8..4baddcc0f 100644 --- a/www/api/color.html +++ b/www/api/color.html @@ -549,7 +549,7 @@ _8c.html" target="source" name="UniqueImageColors">UniqueImageColors Discourse ServerMailing Lists • - Studio + Studio   diff --git a/www/api/compare.html b/www/api/compare.html index c24f4d4aa..f91f4f8d9 100644 --- a/www/api/compare.html +++ b/www/api/compare.html @@ -325,7 +325,7 @@ _8c.html" target="source" name="SimilarityImage">SimilarityImage Discourse ServerMailing Lists • - Studio + Studio   diff --git a/www/api/composite.html b/www/api/composite.html index e442261aa..a7f7af258 100644 --- a/www/api/composite.html +++ b/www/api/composite.html @@ -123,7 +123,7 @@
diff --git a/www/api/decorate.html b/www/api/decorate.html index 11dfc8e0f..29d789006 100644 --- a/www/api/decorate.html +++ b/www/api/decorate.html @@ -236,7 +236,7 @@ _8c.html" target="source" name="RaiseImage">RaiseImage Discourse ServerMailing Lists • - Studio + Studio  
diff --git a/www/api/display.html b/www/api/display.html index 9daf1d611..32fc17c87 100644 --- a/www/api/display.html +++ b/www/api/display.html @@ -236,7 +236,7 @@ _8c.html" target="source" name="XDisplayBackgroundImage">XDisplayBackgroundImage Discourse ServerMailing Lists • - Studio + Studio   diff --git a/www/api/drawing-wand.html b/www/api/drawing-wand.html index 1e5350ef6..e7bad6b1d 100644 --- a/www/api/drawing-wand.html +++ b/www/api/drawing-wand.html @@ -123,7 +123,7 @@
diff --git a/www/api/effect.html b/www/api/effect.html index 6241f5a7e..6e55b4b79 100644 --- a/www/api/effect.html +++ b/www/api/effect.html @@ -123,7 +123,7 @@
diff --git a/www/api/fx.html b/www/api/fx.html index f7da0a90d..daeb98a90 100644 --- a/www/api/fx.html +++ b/www/api/fx.html @@ -825,7 +825,7 @@ _8c.html" target="source" name="WaveImage">WaveImage Discourse ServerMailing Lists • - Studio + Studio  
diff --git a/www/api/list.html b/www/api/list.html index 421c3adba..4dad7ca0e 100644 --- a/www/api/list.html +++ b/www/api/list.html @@ -123,7 +123,7 @@
diff --git a/www/api/magick-wand.html b/www/api/magick-wand.html index 7c749cc09..2f7088b4c 100644 --- a/www/api/magick-wand.html +++ b/www/api/magick-wand.html @@ -123,7 +123,7 @@
diff --git a/www/api/magick.html b/www/api/magick.html index 8ac81acad..3c3ca4d03 100644 --- a/www/api/magick.html +++ b/www/api/magick.html @@ -123,7 +123,7 @@