(no commit message)

diff --git a/ImageMagick.spec b/ImageMagick.spec
index 7a2a7030686d4bcc84364656bdd2627febee5ca4..3c224b5f8324b430da7bd5d161371190390ff08d 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,5 +1,5 @@
 %define VERSION  6.6.0
-%define Patchlevel  3
+%define Patchlevel  2
 
 Name:           ImageMagick
 Version:        %{VERSION}

diff --git a/config/configure.xml b/config/configure.xml
index 05792158ba4c023e048359edc72071ec3ca29450..d1c142bfb14f34ae303f37452766699fffff1f56 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="0x660"/>
-  <configure name="LIB_VERSION_NUMBER" value="6,6,0,3"/>
+  <configure name="LIB_VERSION_NUMBER" value="6,6,0,2"/>
   <configure name="RELEASE_DATE" value="2010-03-05"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>

diff --git a/libtool b/libtool
index d9595fb6ce5deb984301f404581f1f90016f6c75..4bb5684f5b3476b79ea2abcf441b6cf26da1058e 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.6.0-3
+# Generated automatically by config.status (ImageMagick) 6.6.0-2
 # 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/morphology.c b/magick/morphology.c
index 61d10419ccbf87f077e5133330628f75d1a6ca43..e49af0c264e3c5fc77ff71a345409ba1cf10ae3b 100644 (file)
--- a/magick/morphology.c
+++ b/magick/morphology.c
@@ -108,12 +108,7 @@ static inline double MagickMax(const double x,const double y)
 
 /* Currently these are only internal to this module */
 static void
-  RotateKernelInfo(KernelInfo *, double),
-  ScaleKernelInfo(KernelInfo *, const double, const MagickStatusType);
-
-static KernelInfo
-  *CloneKernelInfo(const KernelInfo *);
-
+  RotateKernelInfo(KernelInfo *, double);
 \f
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -946,7 +941,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type,
 %    o kernel: the Morphology/Convolution kernel to be cloned
 %
 */
-MagickBooleanType KernelInfo *CloneKernelInfo(const KernelInfo *kernel)
+MagickExport KernelInfo *CloneKernelInfo(const KernelInfo *kernel)
 {
   register long
     i;
@@ -1026,11 +1021,11 @@ MagickExport KernelInfo *DestroyKernelInfo(KernelInfo *kernel)
 %
 %  The format of the MorphologyImage method is:
 %
-%      Image *MorphologyImage(const Image *image, MorphologyMethod method,
-%        const long iterations, KernelInfo *kernel, ExceptionInfo *exception)
+%      Image *MorphologyImage(const Image *image,MorphologyMethod method,
+%        const long iterations,KernelInfo *kernel,ExceptionInfo *exception)
 %      Image *MorphologyImageChannel(const Image *image, const ChannelType
-%        channel, MorphologyMethod method, const long iterations, KernelInfo
-%        *kernel, ExceptionInfo *exception)
+%        channel,MorphologyMethod method,const long iterations,
+%        KernelInfo *kernel,ExceptionInfo *exception)
 %
 %  A description of each parameter follows:
 %
@@ -1537,9 +1532,9 @@ MagickExport Image *MorphologyImage(const Image *image, const MorphologyMethod
 }
 
 
-MagickExport Image *MorphologyImageChannel(const Image *image, const
-  ChannelType channel, const MorphologyMethod method, const long
-  iterations, const KernelInfo *kernel, ExceptionInfo *exception)
+MagickExport Image *MorphologyImageChannel(const Image *image,
+  const ChannelType channel,const MorphologyMethod method,
+  const long iterations,const KernelInfo *kernel,ExceptionInfo *exception)
 {
   long
     count;

diff --git a/magick/version.h b/magick/version.h
index 0cdc4632b190e6ab9f89714fd62f4a790220389b..a19630f926b43d1922876da6c53ca31d6ecb93ca 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -30,11 +30,11 @@ extern "C" {
 #define MagickLibVersion  0x660
 #define MagickLibVersionText  "6.6.0"
 #define MagickLibVersionNumber  3,0,0
-#define MagickLibAddendum  "-3"
+#define MagickLibAddendum  "-2"
 #define MagickLibInterface  3
 #define MagickLibMinInterface  3
 #define MagickReleaseDate  "2010-03-05"
-#define MagickChangeDate   "20100227"
+#define MagickChangeDate   "20100305"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickHomeURL  "file:///usr/local/share/doc/ImageMagick-6.6.0/index.html"
 #if (MAGICKCORE_QUANTUM_DEPTH == 8)

diff --git a/version.sh b/version.sh
index b26dbcc63c90f14762b238d811c75e21fbd21a3c..88668afebf46ce6b338dcea4c46492ef8054377d 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.6.0'
 PACKAGE_LIB_VERSION="0x660"
-PACKAGE_RELEASE="3"
+PACKAGE_RELEASE="2"
 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 27b0fa38fd7e8d0a7b18cb70741eb9a6323c0851..87580f8cdb0d4c3533f56586f4f267d08cd43789 100644 (file)
--- a/wand/mogrify.c
+++ b/wand/mogrify.c
@@ -2201,7 +2201,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
             const char
               *p;
 
-            unsigned long
+            long
               iterations;
 
             Image
@@ -2214,12 +2214,12 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
             GetMagickToken(p,&p,token);
             method=(MorphologyMethod) ParseMagickOption(MagickMorphologyOptions,
                       MagickFalse,token);
-            iterations = 1UL;
+            iterations=1L;
             GetMagickToken(p,&p,token);
-            if ( (*p == ':') || (*p == ','))
+            if ((*p == ':') || (*p == ','))
               GetMagickToken(p,&p,token);
-            if ( (*p != '\0') )
-              iterations = StringToLong(p);
+            if ((*p != '\0'))
+              iterations=StringToLong(p);
             kernel=AcquireKernelInfo(argv[i+2]);
             if (kernel == (KernelInfo *) NULL)
               ThrowWandFatalException(ResourceLimitFatalError,