(no commit message)

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

diff --git a/config/configure.xml b/config/configure.xml
index 80ed8fb6137de30aafed08801cbe436e7203d217..928fa60bff61be7f675cad2f4689b1afd21f35e0 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,2"/>
+  <configure name="LIB_VERSION_NUMBER" value="6,6,0,1"/>
   <configure name="RELEASE_DATE" value="2010-03-04"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>

diff --git a/libtool b/libtool
index 4bb5684f5b3476b79ea2abcf441b6cf26da1058e..b840e68a4cea458be7421fff28bd218b8783378b 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-2
+# Generated automatically by config.status (ImageMagick) 6.6.0-1
 # 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/cache.c b/magick/cache.c
index 56800687e25368c417e37caa91d3ee3126258a78..5c2c20ad131be0157008209369ee7375d939be8f 100644 (file)
--- a/magick/cache.c
+++ b/magick/cache.c
@@ -4629,12 +4629,6 @@ static MagickBooleanType ReadPixelCacheIndexes(CacheInfo *cache_info,
   length=(MagickSizeType) nexus_info->region.width*sizeof(IndexPacket);
   rows=nexus_info->region.height;
   number_pixels=length*rows;
-  if ((cache_info->columns == nexus_info->region.width) &&
-      (number_pixels == (MagickSizeType) ((size_t) number_pixels)))
-    {
-      length=number_pixels;
-      rows=1UL;
-    }
   q=nexus_info->indexes;
   switch (cache_info->type)
   {
@@ -4647,6 +4641,12 @@ static MagickBooleanType ReadPixelCacheIndexes(CacheInfo *cache_info,
       /*
         Read indexes from memory.
       */
+      if ((cache_info->columns == nexus_info->region.width) &&
+          (number_pixels == (MagickSizeType) ((size_t) number_pixels)))
+        {
+          length=number_pixels;
+          rows=1UL;
+        }
       p=cache_info->indexes+offset;
       for (y=0; y < (long) rows; y++)
       {
@@ -4667,6 +4667,12 @@ static MagickBooleanType ReadPixelCacheIndexes(CacheInfo *cache_info,
             cache_info->cache_filename);
           return(MagickFalse);
         }
+      if ((cache_info->columns == nexus_info->region.width) &&
+          (number_pixels < MagickMaxBufferExtent))
+        {
+          length=number_pixels;
+          rows=1UL;
+        }
       number_pixels=(MagickSizeType) cache_info->columns*cache_info->rows;
       for (y=0; y < (long) rows; y++)
       {
@@ -4754,12 +4760,6 @@ static MagickBooleanType ReadPixelCachePixels(CacheInfo *cache_info,
   length=(MagickSizeType) nexus_info->region.width*sizeof(PixelPacket);
   rows=nexus_info->region.height;
   number_pixels=length*rows;
-  if ((cache_info->columns == nexus_info->region.width) &&
-      (number_pixels == (MagickSizeType) ((size_t) number_pixels)))
-    {
-      length=number_pixels;
-      rows=1UL;
-    }
   q=nexus_info->pixels;
   switch (cache_info->type)
   {
@@ -4772,6 +4772,12 @@ static MagickBooleanType ReadPixelCachePixels(CacheInfo *cache_info,
       /*
         Read pixels from memory.
       */
+      if ((cache_info->columns == nexus_info->region.width) &&
+          (number_pixels == (MagickSizeType) ((size_t) number_pixels)))
+        {
+          length=number_pixels;
+          rows=1UL;
+        }
       p=cache_info->pixels+offset;
       for (y=0; y < (long) rows; y++)
       {
@@ -4792,6 +4798,12 @@ static MagickBooleanType ReadPixelCachePixels(CacheInfo *cache_info,
             cache_info->cache_filename);
           return(MagickFalse);
         }
+      if ((cache_info->columns == nexus_info->region.width) &&
+          (number_pixels < MagickMaxBufferExtent))
+        {
+          length=number_pixels;
+          rows=1UL;
+        }
       for (y=0; y < (long) rows; y++)
       {
         count=ReadPixelCacheRegion(cache_info,cache_info->offset+offset*
@@ -5333,12 +5345,6 @@ static MagickBooleanType WritePixelCacheIndexes(CacheInfo *cache_info,
   length=(MagickSizeType) nexus_info->region.width*sizeof(IndexPacket);
   rows=nexus_info->region.height;
   number_pixels=(MagickSizeType) length*rows;
-  if ((cache_info->columns == nexus_info->region.width) &&
-      (number_pixels == (MagickSizeType) ((size_t) number_pixels)))
-    {
-      length=number_pixels;
-      rows=1UL;
-    }
   p=nexus_info->indexes;
   switch (cache_info->type)
   {
@@ -5351,6 +5357,12 @@ static MagickBooleanType WritePixelCacheIndexes(CacheInfo *cache_info,
       /*
         Write indexes to memory.
       */
+      if ((cache_info->columns == nexus_info->region.width) &&
+          (number_pixels == (MagickSizeType) ((size_t) number_pixels)))
+        {
+          length=number_pixels;
+          rows=1UL;
+        }
       q=cache_info->indexes+offset;
       for (y=0; y < (long) rows; y++)
       {
@@ -5371,6 +5383,12 @@ static MagickBooleanType WritePixelCacheIndexes(CacheInfo *cache_info,
             cache_info->cache_filename);
           return(MagickFalse);
         }
+      if ((cache_info->columns == nexus_info->region.width) &&
+          (number_pixels < MagickMaxBufferExtent))
+        {
+          length=number_pixels;
+          rows=1UL;
+        }
       number_pixels=(MagickSizeType) cache_info->columns*cache_info->rows;
       for (y=0; y < (long) rows; y++)
       {
@@ -5459,12 +5477,6 @@ static MagickBooleanType WritePixelCachePixels(CacheInfo *cache_info,
   length=(MagickSizeType) nexus_info->region.width*sizeof(PixelPacket);
   rows=nexus_info->region.height;
   number_pixels=length*rows;
-  if ((cache_info->columns == nexus_info->region.width) &&
-      (number_pixels == (MagickSizeType) ((size_t) number_pixels)))
-    {
-      length=number_pixels;
-      rows=1UL;
-    }
   p=nexus_info->pixels;
   switch (cache_info->type)
   {
@@ -5477,6 +5489,12 @@ static MagickBooleanType WritePixelCachePixels(CacheInfo *cache_info,
       /*
         Write pixels to memory.
       */
+      if ((cache_info->columns == nexus_info->region.width) &&
+          (number_pixels == (MagickSizeType) ((size_t) number_pixels)))
+        {
+          length=number_pixels;
+          rows=1UL;
+        }
       q=cache_info->pixels+offset;
       for (y=0; y < (long) rows; y++)
       {
@@ -5497,6 +5515,12 @@ static MagickBooleanType WritePixelCachePixels(CacheInfo *cache_info,
             cache_info->cache_filename);
           return(MagickFalse);
         }
+      if ((cache_info->columns == nexus_info->region.width) &&
+          (number_pixels < MagickMaxBufferExtent))
+        {
+          length=number_pixels;
+          rows=1UL;
+        }
       for (y=0; y < (long) rows; y++)
       {
         count=WritePixelCacheRegion(cache_info,cache_info->offset+offset*

diff --git a/magick/version.h b/magick/version.h
index 4e7a80f413a06447fc865dccdd456fad1d5e4400..0b2fcbd97f58db97ea290a85113f5ced8445c8ce 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  "-2"
+#define MagickLibAddendum  "-1"
 #define MagickLibInterface  3
 #define MagickLibMinInterface  3
 #define MagickReleaseDate  "2010-03-04"

diff --git a/version.sh b/version.sh
index 88668afebf46ce6b338dcea4c46492ef8054377d..06c00d2a61a90cbec5194128aa83b030714c7001 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="2"
+PACKAGE_RELEASE="1"
 PACKAGE_LIB_VERSION_NUMBER="6,6,0,${PACKAGE_RELEASE}"
 PACKAGE_RELEASE_DATE=`date +%F`
 PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION"