(no commit message)

diff --git a/ImageMagick.spec b/ImageMagick.spec
index fc3afeea2756d4b2eaa689fb89e77f1171b142f4..0b4275ccb13080a9bdd42980f9e3454021b70ef6 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,5 +1,5 @@
 %define VERSION  6.5.9
-%define Patchlevel  8
+%define Patchlevel  7
 
 Name:           ImageMagick
 Version:        %{VERSION}

diff --git a/config/configure.xml b/config/configure.xml
index 5ee2835e48c7bb11301bafcf0852bdee35d4f919..bc0a3cb34c3f08786c86be242e2ffee668fe7f16 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -8,7 +8,7 @@
 <configuremap>
   <configure name="NAME" value="ImageMagick"/>
   <configure name="LIB_VERSION" value="0x659"/>
-  <configure name="LIB_VERSION_NUMBER" value="6,5,9,8"/>
+  <configure name="LIB_VERSION_NUMBER" value="6,5,9,7"/>
   <configure name="RELEASE_DATE" value="2010-02-17"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>

diff --git a/libtool b/libtool
index 086a3c5b3e825b28e24b9938b1531777c2879b8f..f53615cdeb376fc20d90983865b5e2096800a7e0 100755 (executable)
--- 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.9-8
+# Generated automatically by config.status (ImageMagick) 6.5.9-7
 # 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 9d4f392f4bd88a17919f23c6b7507181f74c5f0c..4a63977ec7fa1da95edfe787306577681b69cdda 100644 (file)
--- a/magick/string.c
+++ b/magick/string.c
@@ -1334,7 +1334,7 @@ MagickExport const char *GetStringInfoPath(const StringInfo *string_info)
 %
 %  The format of the LocaleCompare method is:
 %
-%      long LocaleCompare(const char *p,const char *q)
+%      int LocaleCompare(const char *p,const char *q)
 %
 %  A description of each parameter follows:
 %
@@ -1343,7 +1343,7 @@ MagickExport const char *GetStringInfoPath(const StringInfo *string_info)
 %    o q: A pointer to a character string to compare to p.
 %
 */
-MagickExport long LocaleCompare(const char *p,const char *q)
+MagickExport int LocaleCompare(const char *p,const char *q)
 {
   if ((p == (char *) NULL) && (q == (char *) NULL))
     return(0);
@@ -1355,20 +1355,20 @@ MagickExport long LocaleCompare(const char *p,const char *q)
   return((long) strcasecmp(p,q));
 #else
   {
-    register unsigned int
+    register int
       c,
       d;
 
     for ( ; ; )
     {
-      c=(unsigned int) *((unsigned char *) p);
-      d=(unsigned int) *((unsigned char *) q);
-      if ((c == 0U) || (AsciiMap[c] != AsciiMap[d]))
+      c=(int) *((unsigned char *) p);
+      d=(int) *((unsigned char *) q);
+      if ((c == 0) || (AsciiMap[c] != AsciiMap[d]))
         break;
       p++;
       q++;
     }
-    return((long) AsciiMap[c]-AsciiMap[d]);
+    return(AsciiMap[c]-(int) AsciiMap[d]);
   }
 #endif
 }
@@ -1430,7 +1430,7 @@ MagickExport void LocaleLower(char *string)
 %
 %  The format of the LocaleNCompare method is:
 %
-%      long LocaleNCompare(const char *p,const char *q,const size_t n)
+%      int LocaleNCompare(const char *p,const char *q,const size_t n)
 %
 %  A description of each parameter follows:
 %
@@ -1441,8 +1441,7 @@ MagickExport void LocaleLower(char *string)
 %    o length: the number of characters to compare in strings p & q.
 %
 */
-MagickExport long LocaleNCompare(const char *p,const char *q,
-  const size_t length)
+MagickExport int LocaleNCompare(const char *p,const char *q,const size_t length)
 {
   if (p == (char *) NULL)
     return(-1);
@@ -1452,7 +1451,7 @@ MagickExport long LocaleNCompare(const char *p,const char *q,
   return((long) strncasecmp(p,q,length));
 #else
   {
-    register unsigned int
+    register int
       c,
       d;
 
@@ -1461,16 +1460,16 @@ MagickExport long LocaleNCompare(const char *p,const char *q,
 
     for (n=length; n != 0; n--)
     {
-      c=(unsigned int) *((unsigned char *) p);
-      d=(unsigned int) *((unsigned char *) q);
+      c=(int) *((unsigned char *) p);
+      d=(int) *((unsigned char *) q);
       if (AsciiMap[c] != AsciiMap[d])
-        return(AsciiMap[c]-AsciiMap[d]);
-      if (c == 0U)
-        return(0L);
+        return(AsciiMap[c]-(int) AsciiMap[d]);
+      if (c == 0)
+        return(0);
       p++;
       q++;
     }
-    return(0L);
+    return(0);
   }
 #endif
 }
@@ -2396,7 +2395,7 @@ MagickExport MagickBooleanType SubstituteString(char **string,
         /*
           Make room for the replacement string.
         */
-        offset=p-(*string);
+        offset=(ssize_t) (p-(*string));
         extent=strlen(*string)+replace_extent-search_extent+1;
         *string=(char *) ResizeQuantumMemory(*string,extent+MaxTextExtent,
           sizeof(*p));

diff --git a/magick/string_.h b/magick/string_.h
index 1b978f18e8a315b87591949618a465ac9c9e2d2b..afad01c39a1d869ed4b688d9634e4d032075bcc1 100644 (file)
--- a/magick/string_.h
+++ b/magick/string_.h
@@ -59,23 +59,23 @@ extern MagickExport char
 extern MagickExport const char
   *GetStringInfoPath(const StringInfo *);
 
+extern MagickExport int
+  CompareStringInfo(const StringInfo *,const StringInfo *),
+  LocaleCompare(const char *,const char *),
+  LocaleNCompare(const char *,const char *,const size_t);
+
 extern MagickExport long
   FormatMagickSize(const MagickSizeType,const MagickBooleanType,char *),
   FormatMagickString(char *,const size_t,const char *,...)
     magick_attribute((format (printf,3,4))),
   FormatMagickStringList(char *,const size_t,const char *,va_list)
     magick_attribute((format (printf,3,0))),
-  FormatMagickTime(const time_t,const size_t,char *),
-  LocaleCompare(const char *,const char *),
-  LocaleNCompare(const char *,const char *,const size_t);
+  FormatMagickTime(const time_t,const size_t,char *);
 
 extern MagickExport MagickBooleanType
   ConcatenateString(char **,const char *),
   SubstituteString(char **,const char *,const char *);
 
-extern MagickExport int
-  CompareStringInfo(const StringInfo *,const StringInfo *);
-
 extern MagickExport size_t
   ConcatenateMagickString(char *,const char *,const size_t)
     magick_attribute((nonnull)),

diff --git a/magick/version.h b/magick/version.h
index da0ccec27a4925a5c802775303dfde52680d44b5..5748f5721adcb0cac76b5bdbba0b81cffcb3cae0 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -30,7 +30,7 @@ extern "C" {
 #define MagickLibVersion  0x659
 #define MagickLibVersionText  "6.5.9"
 #define MagickLibVersionNumber  3,0,0
-#define MagickLibAddendum  "-8"
+#define MagickLibAddendum  "-7"
 #define MagickLibInterface  3
 #define MagickLibMinInterface  3
 #define MagickReleaseDate  "2010-02-17"

diff --git a/version.sh b/version.sh
index cdd08bfd3a67a82d20c50275b45d05c20ba28ceb..bf63f7990937088f817903c2e84505c82e6fb2de 100644 (file)
--- a/version.sh
+++ b/version.sh
@@ -12,7 +12,7 @@ PACKAGE_NAME='ImageMagick'
 # PACKAGE_NAME (e.g. "1.0.0").
 PACKAGE_VERSION='6.5.9'
 PACKAGE_LIB_VERSION="0x659"
-PACKAGE_RELEASE="8"
+PACKAGE_RELEASE="7"
 PACKAGE_LIB_VERSION_NUMBER="6,5,9,${PACKAGE_RELEASE}"
 PACKAGE_RELEASE_DATE=`date +%F`
 PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION"