Changeset 306

Timestamp:

10/06/09 06:25:21 (5 months ago)

Author:

cristy

Message:

 

Files:

• ImageMagick/trunk/ImageMagick.spec (modified) (1 diff)
• ImageMagick/trunk/config/configure.xml (modified) (1 diff)
• ImageMagick/trunk/libtool (modified) (1 diff)
• ImageMagick/trunk/magick/string.c (modified) (6 diffs)
• ImageMagick/trunk/magick/version.h (modified) (1 diff)
• ImageMagick/trunk/version.sh (modified) (1 diff)
• VisualMagick/trunk/bin/configure.xml (modified) (1 diff)
• VisualMagick/trunk/installer/inc/version.isx (modified) (1 diff)

ImageMagick/trunk/ImageMagick.spec

@@ -1 +1 @@
 %define VERSION  6.5.6
-%define Patchlevel  10
+%define Patchlevel  9
 
 Name:           ImageMagick

ImageMagick/trunk/config/configure.xml

@@ -9 +9 @@
   <configure name="NAME" value="ImageMagick"/>
   <configure name="LIB_VERSION" value="0x656"/>
-  <configure name="LIB_VERSION_NUMBER" value="6,5,6,10"/>
-  <configure name="RELEASE_DATE" value="2009-10-05"/>
+  <configure name="LIB_VERSION_NUMBER" value="6,5,6,9"/>
+  <configure name="RELEASE_DATE" value="2009-10-06"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>

ImageMagick/trunk/libtool

@@ -2 +2 @@
 
 # libtool - Provide generalized library-building support services.
-# Generated automatically by config.status (ImageMagick) 6.5.6-10
+# Generated automatically by config.status (ImageMagick) 6.5.6-9
 # Libtool was configured on host magick.imagemagick.org:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.

ImageMagick/trunk/magick/string.c

@@ -2373 +2373 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  SubstituteString() performs string substitution on a buffer, replacing the
-%  buffer with the substituted version. Buffer must be allocated from the heap.
+%  SubstituteString() performs string substitution on a string, replacing the
+%  string with the substituted version. Buffer must be allocated from the heap.
 %  If the string is matched and status, MagickTrue is returned otherwise
 %  MagickFalse.
@@ -2380 +2380 @@
 %  The format of the SubstituteString method is:
 %
-%      MagickBooleanType SubstituteString(char **buffer,const char *search,
+%      MagickBooleanType SubstituteString(char **string,const char *search,
 %        const char *replace)
 %
 %  A description of each parameter follows:
 %
-%    o buffer: the buffer to perform replacements on;  replaced with new
+%    o string: the string to perform replacements on;  replaced with new
 %      allocation if a replacement is made.
 %
@@ -2393 +2393 @@
 %
 */
-MagickExport MagickBooleanType SubstituteString(char **buffer,
+MagickExport MagickBooleanType SubstituteString(char **string,
   const char *search,const char *replace)
 {
@@ -2401 +2401 @@
   register char
     *p;
-
-  register size_t
-    i;
 
   size_t
@@ -2410 +2407 @@
     search_extent;
 
+  ssize_t
+    offset;
+
   status=MagickFalse;
   search_extent=0,
   replace_extent=0;
-  p=(*buffer);
-  for (i=0; *(p+i) != '\0'; i++)
+  for (p=strchr(*string,*search); p != (char *) NULL; p=strchr(p+1,*search))
   {
-    if (*(p+i) != *search)
-      continue;
-    if (strcmp(p+i,search) != 0)
+    if (search_extent == 0)
+      search_extent=strlen(search);
+    if (strncmp(p,search,search_extent) != 0)
       continue;
     /*
       We found a match.
     */
-    if (search_extent == 0)
-      search_extent=strlen(search);
+    status=MagickTrue;
     if (replace_extent == 0)
       replace_extent=strlen(replace);
@@ -2432 +2430 @@
           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)
+        offset=p-(*string);
+        extent=strlen(*string)+replace_extent-search_extent;
+        *string=(char *) ResizeQuantumMemory(*string,extent+MaxTextExtent,
+          sizeof(*p));
+        if (*string == (char *) NULL)
           ThrowFatalException(ResourceLimitFatalError,"UnableToAcquireString");
+        p=(*string)+offset;
       }
     /*
       Replace string.
     */
-    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;
+      (void) CopyMagickMemory(p+replace_extent,p+search_extent,
+        strlen(p+search_extent)+1);
+    (void) CopyMagickMemory(p,replace,replace_extent);
+    p+=replace_extent-1;
   }
   return(status);

ImageMagick/trunk/magick/version.h

@@ -31 +31 @@
 #define MagickLibVersionText  "6.5.6"
 #define MagickLibVersionNumber  2,0,0
-#define MagickLibSubversion  "-10"
-#define MagickReleaseDate  "2009-10-05"
+#define MagickLibSubversion  "-9"
+#define MagickReleaseDate  "2009-10-06"
 #define MagickChangeDate   "20091004"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"

ImageMagick/trunk/version.sh

@@ -13 +13 @@
 PACKAGE_VERSION='6.5.6'
 PACKAGE_LIB_VERSION="0x656"
-PACKAGE_RELEASE="10"
+PACKAGE_RELEASE="9"
 PACKAGE_LIB_VERSION_NUMBER="6,5,6,${PACKAGE_RELEASE}"
 PACKAGE_RELEASE_DATE=`date +%F`

VisualMagick/trunk/bin/configure.xml

@@ -9 +9 @@
   <configure name="NAME" value="ImageMagick"/>
   <configure name="LIB_VERSION" value="0x656"/>
-  <configure name="LIB_VERSION_NUMBER" value="6,5,6,10"/>
+  <configure name="LIB_VERSION_NUMBER" value="6,5,6,9"/>
   <configure name="RELEASE_DATE" value="2009-10-01"/>
   <configure name="VERSION" value="6.5.6"/>

VisualMagick/trunk/installer/inc/version.isx

@@ -19 +19 @@
 #define public MagickPackageName "ImageMagick"
 #define public MagickPackageVersion "6.5.6"
-#define public MagickPackageVersionAddendum "-10"
+#define public MagickPackageVersionAddendum "-9"
 #define public MagickPackageReleaseDate "2009-10-01"