From: anthony <anthony@git.imagemagick.org>
Date: Wed, 19 May 2010 12:45:51 +0000 (+0000)
Subject: Minor bug fix for FreiChen
X-Git-Tag: 7.0.1-0~9428
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6915d06ec7b0378b511434c075dcaf5e7e477f86;p=imagemagick

Minor bug fix for FreiChen
---

diff --git a/magick/morphology.c b/magick/morphology.c
index 5c6492242..384a8903e 100644
--- a/magick/morphology.c
+++ b/magick/morphology.c
@@ -659,8 +659,10 @@ MagickExport KernelInfo *AcquireKernelInfo(const char *kernel_string)
 %
 %    FreiChen:{type},{angle}
 %      Frei-Chen Edge Detector is a set of 9 unique convolution kernels that
-%      are specially weighted. After applying each to the original image, the
-%      results is then added together.
+%      are specially weighted.  They should not be normalized. After applying
+%      each to the original image, the results is then added together.  The
+%      square root of the resulting image is the cosine of the edge, and the
+%      direction of the feature detection.
 %
 %        Type 1: |  1,   sqrt(2),  1 |
 %                |  0,     0,      0 | / 2*sqrt(2)
@@ -674,7 +676,7 @@ MagickExport KernelInfo *AcquireKernelInfo(const char *kernel_string)
 %                |    1,     0,   -1    | / 2*sqrt(2)
 %                | -sqrt(2), 1,    0    |
 %
-%        Type 4: | sqrt(2), -1,     1    |
+%        Type 4: | sqrt(2), -1,     0    |
 %                |   -1,     0,     1    | / 2*sqrt(2)
 %                |    0,     1, -sqrt(2) |
 %
@@ -701,9 +703,6 @@ MagickExport KernelInfo *AcquireKernelInfo(const char *kernel_string)
 %      The first 4 are for edge detection, the next 4 are for line detection
 %      and the last is to add a average component to the results.
 %
-%      The '{angle}' argument is not normally used but provided for
-%      convenience of generating other kernels from these kernels.
-%
 %
 %  Boolean Kernels
 %
@@ -1268,6 +1267,8 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type,
         break;
       }
     case FreiChenKernel:
+      /* http://www.math.tau.ac.il/~turkel/notes/edge_detectors.pdf */
+      /* http://ltswww.epfl.ch/~courstiv/exos_labos/sol3.pdf */
       { switch ( (int) args->rho ) {
           default:
           case 1:
@@ -1298,7 +1299,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type,
             ScaleKernelInfo(kernel, 1.0/2.0*MagickSQ2, NoValue);
             break;
           case 4:
-            kernel=ParseKernelArray("3: 2,-1,1  -1,0,1  0,1,-2");
+            kernel=ParseKernelArray("3: 2,-1,0  -1,0,1  0,1,-2");
             if (kernel == (KernelInfo *) NULL)
               return(kernel);
             kernel->values[0] = +MagickSQ2;
@@ -1331,7 +1332,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type,
             ScaleKernelInfo(kernel, 1.0/6.0, NoValue);
             break;
           case 9:
-            kernel=ParseKernelArray("3: 1,1,1  1,1,1  1,1,1");
+            kernel=ParseKernelName("3: 1,1,1  1,1,1  1,1,1");
             if (kernel == (KernelInfo *) NULL)
               return(kernel);
             ScaleKernelInfo(kernel, 1.0/3.0, NoValue);