(no commit message)

diff --git a/ImageMagick.spec b/ImageMagick.spec
index 6260e836d6c96bb9807a622bffdaf68490595d78..8a8842b59d9f8ddec46e1c685f21dbfb8f57d832 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,5 +1,5 @@
 %define VERSION  6.6.0
-%define Patchlevel  8
+%define Patchlevel  7
 
 Name:           ImageMagick
 Version:        %{VERSION}

diff --git a/coders/dcm.c b/coders/dcm.c
index b393c5d4507e71f9e21959e77fa7ca019b9e2654..2ed758d1a021d6080fb3fdcfdb246982134caea9 100644 (file)
--- a/coders/dcm.c
+++ b/coders/dcm.c
@@ -3353,7 +3353,6 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
             (void) SetImageProperty(image,attribute,(char *) data);
           }
         attribute=DestroyString(attribute);
-        data=(unsigned char *) RelinquishMagickMemory(data);
       }
     if (image_info->verbose != MagickFalse)
       {
@@ -3386,6 +3385,8 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
             (void) fprintf(stdout,"\n");
           }
       }
+    if (data != (unsigned char *) NULL)
+      data=(unsigned char *) RelinquishMagickMemory(data);
     if (EOFBlob(image) != MagickFalse)
       {
         ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile",

diff --git a/config/configure.xml b/config/configure.xml
index d78339587ab73c1e0868cb0df78140b7eb2574cd..27de18fea6e918ef03078b490c4ee3240f7efa33 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,8"/>
+  <configure name="LIB_VERSION_NUMBER" value="6,6,0,7"/>
   <configure name="RELEASE_DATE" value="2010-03-18"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>

diff --git a/libtool b/libtool
index 5ef32209cd641dd689c436d7acac2abb479896d0..1f1036e88202477e6b1d3169811ffb96ac1a55a0 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-8
+# Generated automatically by config.status (ImageMagick) 6.6.0-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/version.h b/magick/version.h
index b477b363b775fe327d80fafda0f58f13ea1807df..7e00e193bd203c576f491cf60e5540309c2cb774 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -30,7 +30,7 @@ extern "C" {
 #define MagickLibVersion  0x660
 #define MagickLibVersionText  "6.6.0"
 #define MagickLibVersionNumber  3,0,0
-#define MagickLibAddendum  "-8"
+#define MagickLibAddendum  "-7"
 #define MagickLibInterface  3
 #define MagickLibMinInterface  3
 #define MagickReleaseDate  "2010-03-18"

diff --git a/version.sh b/version.sh
index 035acb9fdfe117d5e555678532598b1091cd12b9..fa0b643ff27343a8915d25a72905ea97c8f8ccdf 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="8"
+PACKAGE_RELEASE="7"
 PACKAGE_LIB_VERSION_NUMBER="6,6,0,${PACKAGE_RELEASE}"
 PACKAGE_RELEASE_DATE=`date +%F`
 PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION"