From: cristy Date: Wed, 27 Apr 2011 23:00:47 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~7623 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f998fb386edf8e3451181bdd65250fcc0961e559;p=imagemagick --- diff --git a/ChangeLog b/ChangeLog index 1f2873794..9fbc7c440 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-04-27 6.6.9-7 Cristy + * 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 * 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 e67464727..38d3083ef 100644 --- 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 a40c5f1d3..1eaa7545d 100644 --- 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