(no commit message)

diff --git a/ImageMagick.spec b/ImageMagick.spec
index fbd113f2259ac52c54ef4229a089355754add87c..f00e218e0199e372b2cd77ff150e5570eaa4a005 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,5 +1,5 @@
 %define VERSION  6.6.1
-%define Patchlevel  9
+%define Patchlevel  8
 
 Name:           ImageMagick
 Version:        %{VERSION}

diff --git a/config/configure.xml b/config/configure.xml
index f7d54bfd68244b781071e01d4760be9a8618b31f..f69dcb69fb1a44396f8ab5c3b1222cb08e00dc74 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,9"/>
+  <configure name="LIB_VERSION_NUMBER" value="6,6,1,8"/>
   <configure name="RELEASE_DATE" value="2010-05-13"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>

diff --git a/libtool b/libtool
index a15be0ebb6eedc3cf57bd65eefa7d3facaa9f86b..bc21cefa174562a3d903a48265764ebbbe0b7ed8 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-9
+# Generated automatically by config.status (ImageMagick) 6.6.1-8
 # 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/stream.c b/magick/stream.c
index 37bcc084ce55330eee4355683788435b4365d120..4d92ceb9973ca5330c6b0fb73dea106712d903fa 100644 (file)
--- a/magick/stream.c
+++ b/magick/stream.c
@@ -1084,6 +1084,9 @@ extern "C" {
 static size_t WriteStreamImage(const Image *image,const void *pixels,
   const size_t columns)
 {
+  CacheInfo
+    *cache_info;
+
   RectangleInfo
     extract_info;
 
@@ -1109,8 +1112,10 @@ static size_t WriteStreamImage(const Image *image,const void *pixels,
     case QuantumPixel: packet_size=sizeof(Quantum); break;
     case ShortPixel: packet_size=sizeof(unsigned short); break;
   }
+  cache_info=(CacheInfo *) image->cache;
+  assert(cache_info->signature == MagickSignature);
   packet_size*=strlen(stream_info->map);
-  length=packet_size*image->columns;
+  length=packet_size*cache_info->columns*cache_info->rows;
   if (image != stream_info->image)
     {
       ImageInfo

diff --git a/magick/version.h b/magick/version.h
index c3593adde93425b9280d429267cc8673451966c9..4a970db583a957f1490ce3f00ea62ede5ec757ee 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  "-9"
+#define MagickLibAddendum  "-8"
 #define MagickLibInterface  3
 #define MagickLibMinInterface  3
 #define MagickReleaseDate  "2010-05-13"

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