Add items to morphology-private.h

diff --git a/magick/morphology-private.h b/magick/morphology-private.h
index e847ae01fe8641fb5847f3e977b76fc0575de6a7..0a658e93da6fffbb5db6be9f9baa43feebf08742 100644 (file)
--- a/magick/morphology-private.h
+++ b/magick/morphology-private.h
@@ -26,4 +26,7 @@ extern "C" {
 }
 #endif
 
+void
+  ZeroKernelNans(KernelInfo *);
+
 #endif

diff --git a/magick/morphology.c b/magick/morphology.c
index e694dbe60b85ba14f7b7d50ac713c914534a9766..8907ad6fc4a723f200fc32f90542fbfd4e52379c 100644 (file)
--- a/magick/morphology.c
+++ b/magick/morphology.c
@@ -106,15 +106,11 @@ static inline double MagickMax(const double x,const double y)
 #define Minimize(assign,value) assign=MagickMin(assign,value)
 #define Maximize(assign,value) assign=MagickMax(assign,value)
 
-/* Currently these are internal to this module
- * Eventually these may become 'private' to library
- * OR may become externally available to API's
- */
-static MagickExport void
+/* Currently these are only internal to this module */
+static void
   RotateKernel(KernelInfo *, double),
   ScaleKernel(KernelInfo *, double),
-  ShowKernel(KernelInfo *),
-  ZeroKernelNans(KernelInfo *);
+  ShowKernel(KernelInfo *);
 
 \f
 /*
@@ -1561,7 +1557,7 @@ MagickExport Image *MorphologyImageChannel(const Image *image,
 %                                                                             %
 %                                                                             %
 %                                                                             %
-%     R o t a t e K e r n e l                                                 %
++     R o t a t e K e r n e l                                                 %
 %                                                                             %
 %                                                                             %
 %                                                                             %
@@ -1580,8 +1576,11 @@ MagickExport Image *MorphologyImageChannel(const Image *image,
 %
 %    o angle: angle to rotate in degrees
 %
+% This function is only internel to this module, as it is not finalized,
+% especially with regard to non-orthogonal angles, and rotation of larger
+% 2D kernels.
 */
-static void RotateKernel(KernelInfo *kernel, double angle)
+MagickExport void RotateKernel(KernelInfo *kernel, double angle)
 {
   /* WARNING: Currently assumes the kernel (rightly) is horizontally symetrical
   **
@@ -1727,8 +1726,10 @@ static void RotateKernel(KernelInfo *kernel, double angle)
 %
 %    o scale: multiple all values by this, if zero normalize instead.
 %
+% This function is internal to this module only at this time, but can be
+% exported to other modules if needed.
 */
-static void ScaleKernel(KernelInfo *kernel, double scale)
+MagickExport void ScaleKernel(KernelInfo *kernel, double scale)
 {
   register unsigned long
     i;
@@ -1774,7 +1775,8 @@ static void ScaleKernel(KernelInfo *kernel, double scale)
 %
 %    o kernel: the Morphology/Convolution kernel
 %
-% FUTURE: return the information in a string for API usage.
+% This function is internal to this module only at this time. That may change
+% in the future.
 */
 static void ShowKernel(KernelInfo *kernel)
 {
@@ -1830,7 +1832,7 @@ static void ShowKernel(KernelInfo *kernel)
 %
 % FUTURE: return the information in a string for API usage.
 */
-static void ZeroKernelNans(KernelInfo *kernel)
+MagickExport void ZeroKernelNans(KernelInfo *kernel)
 {
   register unsigned long
     i;

diff --git a/magick/resize.c b/magick/resize.c
index 45617c7613f1391e4b5e81d3dd1efaf94501d92e..19b491857fc83deb69ee91c9f6fcf84f7fae4919 100644 (file)
--- a/magick/resize.c
+++ b/magick/resize.c
@@ -629,6 +629,7 @@ MagickExport ResizeFilter *AcquireResizeFilter(const Image *image,
         /*
           Gaussian is scaled by 4*ln(2) and not 4*sqrt(2/MagickPI) according to
           Paul Heckbert's paper on EWA resampling.
+          FUTURE: to be reviewed.
         */
         resize_filter->blur*=2.0*log(2.0)/sqrt(2.0/MagickPI);
         break;