Hann and Welch miss-spelling corrections.
diff --git a/MagickCore/option.c b/MagickCore/option.c
index 1774378..077f7a1 100644
--- a/MagickCore/option.c
+++ b/MagickCore/option.c
@@ -1022,7 +1022,8 @@
{ "Cubic", CubicFilter, UndefinedOptionFlag, MagickFalse },
{ "Gaussian", GaussianFilter, UndefinedOptionFlag, MagickFalse },
{ "Hamming", HammingFilter, UndefinedOptionFlag, MagickFalse },
- { "Hanning", HanningFilter, UndefinedOptionFlag, MagickFalse },
+ { "Hann", HannFilter, UndefinedOptionFlag, MagickFalse },
+ { "Hanning", HannFilter, UndefinedOptionFlag, MagickTrue }, /*misspell*/
{ "Hermite", HermiteFilter, UndefinedOptionFlag, MagickFalse },
{ "Jinc", JincFilter, UndefinedOptionFlag, MagickFalse },
{ "Kaiser", KaiserFilter, UndefinedOptionFlag, MagickFalse },
@@ -1041,7 +1042,8 @@
{ "SincFast", SincFastFilter, UndefinedOptionFlag, MagickFalse },
{ "Spline", SplineFilter, UndefinedOptionFlag, MagickFalse },
{ "Triangle", TriangleFilter, UndefinedOptionFlag, MagickFalse },
- { "Welsh", WelshFilter, UndefinedOptionFlag, MagickFalse },
+ { "Welch", WelchFilter, UndefinedOptionFlag, MagickFalse },
+ { "Welsh", WelchFilter, UndefinedOptionFlag, MagickTrue }, /*misspell*/
{ (char *) NULL, UndefinedFilter, UndefinedOptionFlag, MagickFalse }
},
FunctionOptions[] =
diff --git a/MagickCore/resample.h b/MagickCore/resample.h
index 89316bf..377a19f 100644
--- a/MagickCore/resample.h
+++ b/MagickCore/resample.h
@@ -36,7 +36,7 @@
BoxFilter,
TriangleFilter,
HermiteFilter,
- HanningFilter,
+ HannFilter,
HammingFilter,
BlackmanFilter,
GaussianFilter,
@@ -48,7 +48,7 @@
SincFilter,
SincFastFilter,
KaiserFilter,
- WelshFilter,
+ WelchFilter,
ParzenFilter,
BohmanFilter,
BartlettFilter,
@@ -68,8 +68,12 @@
Backward compatibility for the more correctly named Jinc Filter. Original
source of this filter is from "zoom" but it refers to a reference by Pratt,
who does not actualy name the filter.
+
+ also miss-spellings of common filters
*/
-#define BesselFilter JincFilter
+#define BesselFilter JincFilter
+#define WelshFilter WelchFilter
+#define HanningFilter HannFilter
typedef struct _ResampleFilter
ResampleFilter;
diff --git a/MagickCore/resize.c b/MagickCore/resize.c
index 1ff0705..ea24983 100644
--- a/MagickCore/resize.c
+++ b/MagickCore/resize.c
@@ -267,7 +267,7 @@
return(exp((double)(-resize_filter->coefficient[1]*x*x)));
}
-static double Hanning(const double x,
+static double Hann(const double x,
const ResizeFilter *magick_unused(resize_filter))
{
/*
@@ -493,11 +493,11 @@
return(0.0);
}
-static double Welsh(const double x,
+static double Welch(const double x,
const ResizeFilter *magick_unused(resize_filter))
{
/*
- Welsh parabolic windowing filter.
+ Welch parabolic windowing filter.
*/
if (x < 1.0)
return(1.0-x*x);
@@ -527,8 +527,8 @@
% Gaussian Sinc Jinc (Bessel)
%
% Windowed Sinc/Jinc Filters
-% Blackman Hanning Hamming
-% Kaiser Lanczos
+% Blackman Hann Hamming
+% Kaiser Lanczos Welch
%
% Special Purpose Filters
% Cubic SincFast LanczosSharp Lanczos2 Lanczos2Sharp
@@ -732,8 +732,8 @@
{ BoxFilter, BoxFilter }, /* Box averaging filter */
{ TriangleFilter, BoxFilter }, /* Linear interpolation filter */
{ HermiteFilter, BoxFilter }, /* Hermite interpolation filter */
- { SincFastFilter, HanningFilter }, /* Hanning -- cosine-sinc */
- { SincFastFilter, HammingFilter }, /* Hamming -- '' variation */
+ { SincFastFilter, HannFilter }, /* Hann -- cosine-sinc */
+ { SincFastFilter, HammingFilter }, /* Hamming -- '' variation */
{ SincFastFilter, BlackmanFilter }, /* Blackman -- 2*cosine-sinc */
{ GaussianFilter, BoxFilter }, /* Gaussian blur filter */
{ QuadraticFilter, BoxFilter }, /* Quadratic Gaussian approx */
@@ -744,7 +744,7 @@
{ SincFilter, BoxFilter }, /* Raw 4-lobed Sinc function */
{ SincFastFilter, BoxFilter }, /* Raw fast sinc ("Pade"-type) */
{ SincFastFilter, KaiserFilter }, /* Kaiser -- square root-sinc */
- { SincFastFilter, WelshFilter }, /* Welsh -- parabolic-sinc */
+ { SincFastFilter, WelchFilter }, /* Welch -- parabolic-sinc */
{ SincFastFilter, CubicFilter }, /* Parzen -- cubic-sinc */
{ SincFastFilter, BohmanFilter }, /* Bohman -- 2*cosine-sinc */
{ SincFastFilter, TriangleFilter }, /* Bartlett -- triangle-sinc */
@@ -789,7 +789,7 @@
{ Box, 0.5, 0.5, 0.0, 0.0 }, /* Box */
{ Triangle, 1.0, 1.0, 0.0, 0.0 }, /* Triangle */
{ CubicBC, 1.0, 1.0, 0.0, 0.0 }, /* Hermite (cubic B=C=0) */
- { Hanning, 1.0, 1.0, 0.0, 0.0 }, /* Hanning, cosine window */
+ { Hann, 1.0, 1.0, 0.0, 0.0 }, /* Hann, cosine window */
{ Hamming, 1.0, 1.0, 0.0, 0.0 }, /* Hamming, '' variation */
{ Blackman, 1.0, 1.0, 0.0, 0.0 }, /* Blackman, 2*cosine window */
{ Gaussian, 2.0, 1.5, 0.0, 0.0 }, /* Gaussian */
@@ -801,7 +801,7 @@
{ Sinc, 4.0, 1.0, 0.0, 0.0 }, /* Raw 4-lobed Sinc */
{ SincFast, 4.0, 1.0, 0.0, 0.0 }, /* Raw fast sinc ("Pade"-type) */
{ Kaiser, 1.0, 1.0, 0.0, 0.0 }, /* Kaiser (square root window) */
- { Welsh, 1.0, 1.0, 0.0, 0.0 }, /* Welsh (parabolic window) */
+ { Welch, 1.0, 1.0, 0.0, 0.0 }, /* Welch (parabolic window) */
{ CubicBC, 2.0, 2.0, 1.0, 0.0 }, /* Parzen (B-Spline window) */
{ Bohman, 1.0, 1.0, 0.0, 0.0 }, /* Bohman, 2*Cosine window */
{ Triangle, 1.0, 1.0, 0.0, 0.0 }, /* Bartlett (triangle window) */