(no commit message)

diff --git a/MagickCore/effect.c b/MagickCore/effect.c
index 0594a1693c384c0e909424243f8a74eea9654cc5..20f65f1769175b34636acf065825f3e3575bb6b5 100644 (file)
--- a/MagickCore/effect.c
+++ b/MagickCore/effect.c
@@ -1247,7 +1247,8 @@ MagickExport Image *ConvolveImage(const Image *image,const size_t order,
   width=order;
   if ((width % 2) == 0)
     ThrowImageException(OptionError,"KernelWidthMustBeAnOddNumber");
-  convolve_image=CloneImage(image,0,0,MagickTrue,exception);
+  convolve_image=CloneImage(image,image->columns,image->rows,MagickTrue,
+    exception);
   if (convolve_image == (Image *) NULL)
     return((Image *) NULL);
   if (SetImageStorageClass(convolve_image,DirectClass) == MagickFalse)
@@ -1335,7 +1336,7 @@ MagickExport Image *ConvolveImage(const Image *image,const size_t order,
       continue;
     p=GetCacheViewVirtualPixels(image_view,-((ssize_t) width/2L),y-(ssize_t)
       (width/2L),image->columns+width,width,exception);
-    q=GetCacheViewAuthenticPixels(convolve_view,0,y,convolve_image->columns,1,
+    q=QueueCacheViewAuthenticPixels(convolve_view,0,y,convolve_image->columns,1,
       exception);
     if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
       {

diff --git a/MagickCore/image.c b/MagickCore/image.c
index 7f25d9fcbcdd5bf9010e31ecf51ed69e1bf337de..6978ea9de4e55ec252fc8a19f0dd28734d13ad92 100644 (file)
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -2770,8 +2770,7 @@ MagickExport MagickBooleanType SetImageBackgroundColor(Image *image)
 %
 %  The format of the SetImageColor method is:
 %
-%      MagickBooleanType SetImageColor(Image *image,
-%        const PixelInfo *color)
+%      MagickBooleanType SetImageColor(Image *image,const PixelInfo *color)
 %
 %  A description of each parameter follows:
 %
@@ -2937,8 +2936,8 @@ MagickExport MagickBooleanType SetImageClipMask(Image *image,
 %
 %  The format of the SetImageExtent method is:
 %
-%      MagickBooleanType SetImageExtent(Image *image,
-%        const size_t columns,const size_t rows)
+%      MagickBooleanType SetImageExtent(Image *image,const size_t columns,
+%        const size_t rows)
 %
 %  A description of each parameter follows:
 %
@@ -2949,8 +2948,8 @@ MagickExport MagickBooleanType SetImageClipMask(Image *image,
 %    o rows:  The image height in pixels.
 %
 */
-MagickExport MagickBooleanType SetImageExtent(Image *image,
-  const size_t columns,const size_t rows)
+MagickExport MagickBooleanType SetImageExtent(Image *image,const size_t columns,
+  const size_t rows)
 {
   if ((columns == 0) || (rows == 0))
     return(MagickFalse);