morphology re-sync
diff --git a/magick/geometry.h b/magick/geometry.h
index 86268fd..cca2b1e 100644
--- a/magick/geometry.h
+++ b/magick/geometry.h
@@ -48,11 +48,11 @@
ChiNegative = 0x0080,
PercentValue = 0x1000,
AspectValue = 0x2000,
- NormalizeValue = 0x2000, /* see ScaleKernelValue() in morphology.c */
+ NormalizeValue = 0x2000, /* see ScaleKernelValue() in morphology.c */
LessValue = 0x4000,
GreaterValue = 0x8000,
MinimumValue = 0x10000,
- CorrelateNormalizeValue = 0x10000, /* see ScaleKernelValue() */
+ CorrelateNormalizeValue = 0x10000, /* see ScaleKernelValue() */
AreaValue = 0x20000,
DecimalValue = 0x40000,
#undef AllValues
diff --git a/magick/morphology.c b/magick/morphology.c
index b957684..40a512a 100644
--- a/magick/morphology.c
+++ b/magick/morphology.c
@@ -108,8 +108,8 @@
/* Currently these are only internal to this module */
static void
- RotateKernelInfo(KernelInfo *,double),
- ScaleKernelInfo(KernelInfo *,const double,const GeometryFlags);
+ RotateKernelInfo(KernelInfo *, double),
+ ScaleKernelInfo(KernelInfo *, const double, const MagickStatusType);
static KernelInfo
*CloneKernelInfo(const KernelInfo *);
@@ -1993,8 +1993,8 @@
% This function is internal to this module only at this time, but can be
% exported to other modules if needed.
*/
-static void ScaleKernelInfo(KernelInfo *kernel,const double scaling_factor,
- const GeometryFlags normalize_flags)
+static void ScaleKernelInfo(KernelInfo *kernel, const double scaling_factor,
+ const GeometryFlags normalize_flags)
{
register long
i;