]> granicus.if.org Git - imagemagick/commitdiff
http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=25732
authorCristy <urban-warrior@imagemagick.org>
Sat, 6 Feb 2016 01:22:03 +0000 (20:22 -0500)
committerCristy <urban-warrior@imagemagick.org>
Sat, 6 Feb 2016 01:22:03 +0000 (20:22 -0500)
MagickCore/effect.c

index cb7ea7434a605177ead2e096794aa59c6f931201..a61a803ee7734b60e9f7d22688b013758a24be31 100644 (file)
@@ -828,8 +828,8 @@ MagickExport Image *ConvolveImage(const Image *image,
   Image
     *convolve_image;
 
-  convolve_image=MorphologyApply(image,ConvolveMorphology,1,kernel_info,
-    UndefinedCompositeOp,0.0,exception);
+  convolve_image=MorphologyImage(image,ConvolveMorphology,1,kernel_info,
+    exception);
   return(convolve_image);
 }
 \f
@@ -1720,8 +1720,8 @@ MagickExport Image *LocalContrastImage(const Image *image,const double radius,
 #endif
   scanLineSize=(ssize_t) MagickMax(image->columns,image->rows);
   scanLineSize+=(2*width);
-  scanLinePixels_info=AcquireVirtualMemory(thread_count*scanLineSize,
-    sizeof(*scanLinePixels));
+  scanLinePixels_info=AcquireVirtualMemory((size_t) thread_count*
+    scanLineSize,sizeof(*scanLinePixels));
   if (scanLinePixels_info == (MemoryInfo *) NULL)
     {
       contrast_view=DestroyCacheView(contrast_view);
@@ -1742,7 +1742,7 @@ MagickExport Image *LocalContrastImage(const Image *image,const double radius,
       ThrowImageException(ResourceLimitError,"MemoryAllocationFailed");
     }
   interImage=(float *) GetVirtualMemoryBlob(interImage_info);
-  totalWeight=(width+1)*(width+1);
+  totalWeight=(float) ((width+1)*(width+1));
 
   /* Vertical Pass */
   {
@@ -1899,7 +1899,7 @@ MagickExport Image *LocalContrastImage(const Image *image,const double radius,
   image_view=DestroyCacheView(image_view);
   return(contrast_image);
 }
-
+\f
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                                             %