(no commit message)

diff --git a/ImageMagick.spec b/ImageMagick.spec
index 8fce0f6b5acb77970569217742c7fd2a8a0e3103..2bf9570d811f70c76856536736727f629b57b1b5 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,5 +1,5 @@
 %define VERSION  6.6.1
-%define Patchlevel  7
+%define Patchlevel  6
 
 Name:           ImageMagick
 Version:        %{VERSION}

diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs
index b3f7f419f34a0c492a9c97c08dfa6da41354d1f3..36e9422e784cc54523c722d2e3308f33af8a4b7c 100644 (file)
--- a/PerlMagick/Magick.xs
+++ b/PerlMagick/Magick.xs
@@ -10496,7 +10496,9 @@ Mogrify(ref,...)
             color_matrix[j]=(double) SvNV(*(av_fetch(av,j,0)));
           for ( ; j < (long) (order*order); j++)
             color_matrix[j]=0.0;
-          kernel_info=AcquireKernelInfo((const char *) NULL);
+          kernel_info=AcquireKernelInfo("1");
+          if (kernel == (KernelInfo *) NULL)
+            break;
           kernel_info->width=order;
           kernel_info->height=order;
           kernel_info->values=color_matrix;

diff --git a/config/configure.xml b/config/configure.xml
index 893dcb8d1b73115c6553be74045912cc1f692fd3..51cdc41f3dc564192a03414f73742034a64189b9 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="0x661"/>
-  <configure name="LIB_VERSION_NUMBER" value="6,6,1,7"/>
+  <configure name="LIB_VERSION_NUMBER" value="6,6,1,6"/>
   <configure name="RELEASE_DATE" value="2010-05-07"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>

diff --git a/libtool b/libtool
index 7d3e443bbbf8cfe6bb8c9b8705d09700ec260793..1609b6e23e6ba687c4aa1009cf11ecf4ca21dc05 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.1-7
+# Generated automatically by config.status (ImageMagick) 6.6.1-6
 # 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/deprecate.c b/magick/deprecate.c
index 52d1f45a2386345afc4cf62f2a3f02d479daf92d..fff84a80e9c8d302bd7407325d2a9f7193d66ced 100644 (file)
--- a/magick/deprecate.c
+++ b/magick/deprecate.c
@@ -5238,7 +5238,9 @@ MagickExport Image *RecolorImage(const Image *image,const unsigned long order,
   Image
     *recolor_image;
 
-  kernel_info=AcquireKernelInfo((const char *) NULL);
+  kernel_info=AcquireKernelInfo("1");
+  if (kernel_info == (KernelInfo *) NULL)
+    return((Image *) NULL);
   kernel_info->width=order;
   kernel_info->height=order;
   kernel_info->values=(double *) color_matrix;

diff --git a/magick/version.h b/magick/version.h
index a9a6268c1b754f9c97f1c4a2bbfa2f61ca4f55d9..6473098dfcb4ced1e6a0a45c3b6f4f8d6f7035f0 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -30,7 +30,7 @@ extern "C" {
 #define MagickLibVersion  0x661
 #define MagickLibVersionText  "6.6.1"
 #define MagickLibVersionNumber  3,0,0
-#define MagickLibAddendum  "-7"
+#define MagickLibAddendum  "-6"
 #define MagickLibInterface  3
 #define MagickLibMinInterface  3
 #define MagickReleaseDate  "2010-05-07"

diff --git a/version.sh b/version.sh
index 3ab00f0f514cb0799fb3ff4485efdd08446178f0..eb0d7b5649ac6616e0bd6b2891b93635e629ece2 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.1'
 PACKAGE_LIB_VERSION="0x661"
-PACKAGE_RELEASE="7"
+PACKAGE_RELEASE="6"
 PACKAGE_LIB_VERSION_NUMBER="6,6,1,${PACKAGE_RELEASE}"
 PACKAGE_RELEASE_DATE=`date +%F`
 PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION"

diff --git a/wand/mogrify.c b/wand/mogrify.c
index 8aa1c1b8cdfb7810ebd3a8f2f2b2fe1095f80589..76f6e374b7a1cc01a71120562ed40a95f9f35d74 100644 (file)
--- a/wand/mogrify.c
+++ b/wand/mogrify.c
@@ -2236,7 +2236,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
             p=argv[i+1];
             GetMagickToken(p,&p,token);
             method=(MorphologyMethod) ParseMagickOption(MagickMorphologyOptions,
-                      MagickFalse,token);
+              MagickFalse,token);
             iterations=1L;
             GetMagickToken(p,&p,token);
             if ((*p == ':') || (*p == ','))
@@ -2245,8 +2245,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
               iterations=StringToLong(p);
             kernel=AcquireKernelInfo(argv[i+2]);
             if (kernel == (KernelInfo *) NULL)
-              ThrowWandFatalException(ResourceLimitFatalError,
-                "MemoryAllocationFailed",(*image)->filename);
+              break;
             if ( GetImageArtifact(*image,"showkernel") != (const char *) NULL)
               ShowKernelInfo(kernel);  /* display the kernel to stderr */
             morphology_image=MorphologyImageChannel(*image,channel,method,