(no commit message)

diff --git a/ImageMagick.spec b/ImageMagick.spec
index 584bce60f645175196d2fca975b017f2c8398b03..49c19a36c13e9defbb56b7b1e5036e1e7d0bc379 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,5 +1,5 @@
 %define VERSION  6.5.6
-%define Patchlevel  10
+%define Patchlevel  9
 
 Name:           ImageMagick
 Version:        %{VERSION}

diff --git a/config/configure.xml b/config/configure.xml
index d1609d2333698c2aedd3511a58350168041a5dbd..ad557b54cfa091fbe9ee51836c9d73b688f8f050 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="0x656"/>
-  <configure name="LIB_VERSION_NUMBER" value="6,5,6,10"/>
+  <configure name="LIB_VERSION_NUMBER" value="6,5,6,9"/>
   <configure name="RELEASE_DATE" value="2009-10-06"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>

diff --git a/libtool b/libtool
index 5560e405b23833e240d5a83b1638a4eb29a98df4..fa2e69b11baf80542124d54318926018d822a69f 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.5.6-10
+# Generated automatically by config.status (ImageMagick) 6.5.6-9
 # 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/composite.c b/magick/composite.c
index 345b3464774a4c310b2d7f29cae00fcddfcaf263..d9c6ccb9683dc81d027f27b28afa50081c972314 100644 (file)
--- a/magick/composite.c
+++ b/magick/composite.c
@@ -1358,12 +1358,10 @@ MagickExport MagickBooleanType CompositeImageChannel(Image *image,
     }
     case CopyCompositeOp:
     {
-      if ((x_offset+(long) composite_image->columns) < 0)
+      if ((x_offset < 0) || (y_offset < 0))
         break;
       if ((x_offset+(long) composite_image->columns) >= (long) image->columns)
         break;
-      if ((y_offset+(long) composite_image->rows) < 0)
-        break;
       if ((y_offset+(long) composite_image->rows) >= (long) image->rows)
         break;
       status=MagickTrue;

diff --git a/magick/version.h b/magick/version.h
index 748ec077cf1b070ada1798d0c6efef95fe88761d..756e8b067ab3e3a4cc7a8cc240aff7b4463b199f 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -30,7 +30,7 @@ extern "C" {
 #define MagickLibVersion  0x656
 #define MagickLibVersionText  "6.5.6"
 #define MagickLibVersionNumber  2,0,0
-#define MagickLibSubversion  "-10"
+#define MagickLibSubversion  "-9"
 #define MagickReleaseDate  "2009-10-06"
 #define MagickChangeDate   "20091004"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"

diff --git a/version.sh b/version.sh
index 99870a451640d4d10edcb76c71402478be08dddd..ceb46d7a715e5eadd11bdd83736a405d1c24b67f 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.5.6'
 PACKAGE_LIB_VERSION="0x656"
-PACKAGE_RELEASE="10"
+PACKAGE_RELEASE="9"
 PACKAGE_LIB_VERSION_NUMBER="6,5,6,${PACKAGE_RELEASE}"
 PACKAGE_RELEASE_DATE=`date +%F`
 PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION"