Removed case that prevented rotations of rectangle kernels:w

diff --git a/ChangeLog b/ChangeLog
index 10eeb2a1f4a70bbcccb1c2ee0a032b372c96816d..398905aec3bbaef327e38d400ac70a92ff9944ce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2011-07-21  6.7.1-0 Anthony Thyssen <A.Thyssen@griffith...>
+  * Removed a case that prevented rotations of rectangle kernels.
+
 2011-07-20  6.7.1-0 Glenn Randers-Pehrson <glennrp@image...>
   * Use zlib default compression strategy instead of Z_RLE and Z_FIXED
     strategies when linking with zlib versions (prior to 1.2.0 and 1.2.2.2,

diff --git a/MagickCore/morphology.c b/MagickCore/morphology.c
index 90180b6ba1f7d3404531fd5f4469d7e52e51116e..72dfdd2680a82769af810ffda632885e74534bee 100644 (file)
--- a/MagickCore/morphology.c
+++ b/MagickCore/morphology.c
@@ -2564,7 +2564,6 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image,
       break;
   }
 
-
   if ( method == ConvolveMorphology && kernel->width == 1 )
   { /* Special handling (for speed) of vertical (blur) kernels.
     ** This performs its handling in columns rather than in rows.
@@ -3163,7 +3162,9 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image,
   GrayErode    is equivalent but with kernel values subtracted from pixels
                without the kernel rotation
   GreyDilate   is equivalent but using Maximum() instead of Minimum()
-               useing kernel rotation
+               using kernel rotation
+
+  It has thus been preserved for future implementation of those methods.
 
         case DistanceMorphology:
             /* Add kernel Value and select the minimum value found.
@@ -4366,7 +4367,6 @@ static void RotateKernelInfo(KernelInfo *kernel, double angle)
     /* These only allows a +/-90 degree rotation (by transpose) */
     /* A 180 degree rotation is useless */
     case BlurKernel:
-    case RectangleKernel:
       if ( 135.0 < angle && angle <= 225.0 )
         return;
       if ( 225.0 < angle && angle <= 315.0 )
@@ -4376,7 +4376,7 @@ static void RotateKernelInfo(KernelInfo *kernel, double angle)
     default:
       break;
   }
-  /* Attempt rotations by 45 degrees */
+  /* Attempt rotations by 45 degrees  -- 3x3 kernels only */
   if ( 22.5 < fmod(angle,90.0) && fmod(angle,90.0) <= 67.5 )
     {
       if ( kernel->width == 3 && kernel->height == 3 )
@@ -4706,16 +4706,16 @@ MagickExport void ScaleKernelInfo(KernelInfo *kernel,
 %
 %  The format of the ShowKernel method is:
 %
-%      void ShowKernelInfo(KernelInfo *kernel)
+%      void ShowKernelInfo(const KernelInfo *kernel)
 %
 %  A description of each parameter follows:
 %
 %    o kernel: the Morphology/Convolution kernel
 %
 */
-MagickExport void ShowKernelInfo(KernelInfo *kernel)
+MagickExport void ShowKernelInfo(const KernelInfo *kernel)
 {
-  KernelInfo
+  const KernelInfo
     *k;
 
   size_t

diff --git a/MagickCore/morphology.h b/MagickCore/morphology.h
index 7a74f1ae2b0dedf1702de917ce260123ca988b86..19129d0a7c2ffdd2d4f8b155a72adc71e995b12d 100644 (file)
--- a/MagickCore/morphology.h
+++ b/MagickCore/morphology.h
@@ -138,7 +138,7 @@ extern MagickExport Image
 
 extern MagickExport void
   ScaleGeometryKernelInfo(KernelInfo *,const char *),
-  ShowKernelInfo(KernelInfo *);
+  ShowKernelInfo(const KernelInfo *);
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }