(no commit message)

diff --git a/ChangeLog b/ChangeLog
index 94a1ae0bec7a3ca21fe0134524706d085f2cbbe8..1efa59db876e6904f28fc5ecb0fbeee54a2f119f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,9 @@
-
-2011-05-01  6.6.9-7 Anthony Thyssen <A.Thyssen@griffith...>
-  * Fix FX default for interpolation to Bilinear
-
 2011-04-30  6.6.9-7 Cristy  <quetzlzacatenango@image...>
   * New version 6.6.9-7.
 
+2011-04-30  6.6.9-7 Anthony Thyssen <A.Thyssen@griffith...>
+  * Fix FX default for interpolation to Bilinear.
+
 2011-04-27  6.6.9-7 Cristy  <quetzlzacatenango@image...>
   * Fix pixel interpolation for -draw image over (reference
     http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=18612).

diff --git a/ImageMagick.spec b/ImageMagick.spec
index 9241b690e1d7dd9d76d4471eefe78bad55741fe5..f4aad1ed4920b9201b3eaf7544a3ca787ad9ab17 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,5 +1,5 @@
 %global VERSION  6.6.9
-%global Patchlevel  8
+%global Patchlevel  7
 
 Name:           ImageMagick
 Version:        %{VERSION}

diff --git a/config/configure.xml b/config/configure.xml
index 9b3637f62fd4910714842eef9e38c153dae6d565..d9c1d372d25f6f5502712ea4e1d1cafe701c8cc7 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -9,7 +9,7 @@
   <configure name="NAME" value="ImageMagick"/>
   <configure name="VERSION" value="6.6.9"/>
   <configure name="LIB_VERSION" value="0x669"/>
-  <configure name="LIB_VERSION_NUMBER" value="6,6,9,8"/>
+  <configure name="LIB_VERSION_NUMBER" value="6,6,9,7"/>
   <configure name="SVN_REVISION" value="4345" />
   <configure name="RELEASE_DATE" value="2011-04-30"/>
   <configure name="CONFIGURE" value="./configure "/>

diff --git a/libtool b/libtool
index fcf481b9d5343819764955482d548fc7ffb4fc13..7b4dd920df12b80b52b0f72ad2a5da9e5ee8c79d 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.9-8
+# Generated automatically by config.status (ImageMagick) 6.6.9-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/fx.c b/magick/fx.c
index c390ce2080f4cfacac06881e866d1f6753abad22..f9f142c16cdd08bc017a5851a2b77332c20ba27b 100644 (file)
--- a/magick/fx.c
+++ b/magick/fx.c
@@ -1311,9 +1311,6 @@ static MagickRealType FxGetSymbol(FxInfo *fx_info,const ChannelType channel,
   Image
     *image;
 
-  InterpolatePixelMethod
-    interpolate_method;
-
   MagickPixelPacket
     pixel;
 
@@ -1447,10 +1444,8 @@ static MagickRealType FxGetSymbol(FxInfo *fx_info,const ChannelType channel,
         "NoSuchImage","`%s'",expression);
       return(0.0);
     }
-  interpolate_method=image->interpolate == UndefinedInterpolatePixel ?
-      BilinearInterpolatePixel : image->interpolate;
   GetMagickPixelPacket(image,&pixel);
-  (void) InterpolateMagickPixelPacket(image,fx_info->view[i],interpolate_method,
+  (void) InterpolateMagickPixelPacket(image,fx_info->view[i],image->interpolate,
     point.x,point.y,&pixel,exception);
   if ((strlen(p) > 2) &&
       (LocaleCompare(p,"intensity") != 0) &&

diff --git a/magick/version.h b/magick/version.h
index 9c481b975954e376a543484d9b529566d2918650..7d08ba884a0a0ab08e11ccafa0050d88dda3e1c8 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -31,7 +31,7 @@ extern "C" {
 #define MagickLibVersion  0x669
 #define MagickLibVersionText  "6.6.9"
 #define MagickLibVersionNumber  4,0,1
-#define MagickLibAddendum  "-8"
+#define MagickLibAddendum  "-7"
 #define MagickLibInterface  4
 #define MagickLibMinInterface  4
 #define MagickReleaseDate  "2011-04-30"

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