(no commit message)

diff --git a/ChangeLog b/ChangeLog
index 1f28737940f3cf8bf728cd31301cebae28551db3..9fbc7c4405f5f88d077cd1754a1679db1974669c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+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).
+
 2011-04-26  6.6.9-7 Glenn Randers-Pehrson <glennrp@image...>
   * Write the proper bKGD chunk value in grayscale PNG images (reference
     http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=18624).

diff --git a/magick/draw.c b/magick/draw.c
index e6746472771007da82ba3dbb05a4674788a7a831..38d3083ef1c73d7ae20e03ea46bde79190890d56 100644 (file)
--- a/magick/draw.c
+++ b/magick/draw.c
@@ -1212,7 +1212,7 @@ MagickExport MagickBooleanType DrawAffineImage(Image *image,
         inverse_affine.tx;
       point.y=(double) x*inverse_affine.rx+y*inverse_affine.sy+
         inverse_affine.ty;
-      (void) InterpolateMagickPixelPacket(image,image_view,
+      (void) InterpolateMagickPixelPacket(source,source_view,
         UndefinedInterpolatePixel,point.x,point.y,&pixel,exception);
       SetMagickPixelPacket(image,q,indexes+x_offset,&composite);
       MagickPixelCompositeOver(&pixel,pixel.opacity,&composite,

diff --git a/magick/threshold.c b/magick/threshold.c
index a40c5f1d39727d153fb0272e150bf11f9dc46388..1eaa7545d4ac422b68b9044ef082d93af8178f5a 100644 (file)
--- a/magick/threshold.c
+++ b/magick/threshold.c
@@ -1324,7 +1324,7 @@ MagickExport MagickBooleanType OrderedDitherImageChannel(Image *image,
 %      map to use, followed by zero or more numbers representing the number
 %      of color levels tho dither between.
 %
-%      Any level number less than 2 will be equivelent to 2, and means only
+%      Any level number less than 2 will be equivalent to 2, and means only
 %      binary dithering will be applied to each color channel.
 %
 %      No numbers also means a 2 level (bitmap) dither will be applied to all