(no commit message)

diff --git a/MagickCore/Makefile.am b/MagickCore/Makefile.am
index 783beeac3fdf5e9ddb8d1171f67db7c42d6e2369..54354e2d38a5f3dafc4753d047b1a27574294d32 100644 (file)
--- a/MagickCore/Makefile.am
+++ b/MagickCore/Makefile.am
@@ -127,6 +127,7 @@ MAGICKCORE_BASE_SRCS = \
        MagickCore/fx-private.h \
        MagickCore/gem.c \
        MagickCore/gem.h \
+       MagickCore/gem-private.h \
        MagickCore/geometry.c \
        MagickCore/geometry.h \
        MagickCore/hashmap.c \
@@ -157,6 +158,7 @@ MAGICKCORE_BASE_SRCS = \
        MagickCore/magick.h \
        MagickCore/matrix.c \
        MagickCore/matrix.h \
+       MagickCore/matrix-private.h \
        MagickCore/memory.c \
        MagickCore/memory_.h \
        MagickCore/methods.h \
@@ -251,6 +253,7 @@ MAGICKCORE_BASE_SRCS = \
        MagickCore/type.h \
        MagickCore/utility.c \
        MagickCore/utility.h \
+       MagickCore/utility-private.h \
        MagickCore/version.c \
        MagickCore/version.h \
        MagickCore/vms.h \
@@ -390,12 +393,14 @@ MAGICKCORE_NOINST_HDRS = \
        MagickCore/draw-private.h \
        MagickCore/exception-private.h \
        MagickCore/fx-private.h \
+       MagickCore/gem-private.h \
        MagickCore/image-private.h \
        MagickCore/locale-private.h \
        MagickCore/log-private.h \
        MagickCore/mac.h \
        MagickCore/magick-private.h \
        MagickCore/magic-private.h \
+       MagickCore/matrix-private.h \
        MagickCore/methods-private.h \
        MagickCore/mime-private.h \
        MagickCore/mime-private.h \
@@ -424,6 +429,7 @@ MAGICKCORE_NOINST_HDRS = \
        MagickCore/thread-private.h \
        MagickCore/token-private.h \
        MagickCore/type-private.h \
+       MagickCore/utility-private.h \
        MagickCore/vms.h \
        MagickCore/widget-private.h \
        MagickCore/xwindow-private.h

diff --git a/MagickCore/accelerate.c b/MagickCore/accelerate.c
index 88974229c63486e29a2814424c5ee9e58c981e1b..61c61bf3d375f1dfab1d4d32e79db1ee988959c3 100644 (file)
--- a/MagickCore/accelerate.c
+++ b/MagickCore/accelerate.c
@@ -53,6 +53,7 @@
 #include "MagickCore/accelerate.h"
 #include "MagickCore/artifact.h"
 #include "MagickCore/cache.h"
+#include "MagickCore/cache-private.h"
 #include "MagickCore/cache-view.h"
 #include "MagickCore/color-private.h"
 #include "MagickCore/enhance.h"

diff --git a/MagickCore/animate.c b/MagickCore/animate.c
index c73ec1f35c770d33ef8e8c1f2699d9b7a9a30fdb..b79c0d6c023ba6beef2096c0575a9af31f6252e8 100644 (file)
--- a/MagickCore/animate.c
+++ b/MagickCore/animate.c
@@ -67,6 +67,7 @@
 #include "MagickCore/string-private.h"
 #include "MagickCore/transform.h"
 #include "MagickCore/utility.h"
+#include "MagickCore/utility-private.h"
 #include "MagickCore/version.h"
 #include "MagickCore/widget.h"
 #include "MagickCore/widget-private.h"

diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c
index c14137944ca13147c3c120246d27ffdd66b749a9..0def9c980b0b978d70c13e52be027ddc02e7ee64 100644 (file)
--- a/MagickCore/annotate.c
+++ b/MagickCore/annotate.c
@@ -73,6 +73,7 @@
 #include "MagickCore/transform.h"
 #include "MagickCore/type.h"
 #include "MagickCore/utility.h"
+#include "MagickCore/utility-private.h"
 #include "MagickCore/xwindow.h"
 #include "MagickCore/xwindow-private.h"
 #if defined(MAGICKCORE_FREETYPE_DELEGATE)

diff --git a/MagickCore/blob.c b/MagickCore/blob.c
index 1e0b5af196f1595c87a3853f91228dc4f4cdaf97..33b0ddb5ac1b57474fbe87efe34ad98885c3f3e6 100644 (file)
--- a/MagickCore/blob.c
+++ b/MagickCore/blob.c
@@ -62,6 +62,7 @@
 #include "MagickCore/string-private.h"
 #include "MagickCore/token.h"
 #include "MagickCore/utility.h"
+#include "MagickCore/utility-private.h"
 #if defined(MAGICKCORE_HAVE_MMAP_FILEIO) && !defined(MAGICKCORE_WINDOWS_SUPPORT)
 # include <sys/mman.h>
 #endif

diff --git a/MagickCore/cache-private.h b/MagickCore/cache-private.h
index 5612e344dd2abcdd5fd88bef25c0c0f2e6bbe08d..efdd39a28ef8b94dd2d36c9104bd0262143980a9 100644 (file)
--- a/MagickCore/cache-private.h
+++ b/MagickCore/cache-private.h
@@ -217,11 +217,13 @@ extern MagickPrivate const Quantum
   *GetVirtualPixelsNexus(const Cache,NexusInfo *);
 
 extern MagickPrivate const void
+  *AcquirePixelCachePixels(const Image *,MagickSizeType *,ExceptionInfo *),
   *GetVirtualMetacontentFromNexus(const Cache,NexusInfo *);
 
 extern MagickPrivate MagickBooleanType
   CacheComponentGenesis(void),
-  SyncAuthenticPixelCacheNexus(Image *,NexusInfo *,ExceptionInfo *);
+  SyncAuthenticPixelCacheNexus(Image *,NexusInfo *,ExceptionInfo *),
+  SyncImagePixelCache(Image *,ExceptionInfo *);
 
 extern MagickPrivate MagickSizeType
   GetPixelCacheNexusExtent(const Cache,NexusInfo *);
@@ -240,10 +242,15 @@ extern MagickPrivate Quantum
 extern MagickPrivate size_t
   GetPixelCacheChannels(const Cache);
 
+extern MagickPrivate VirtualPixelMethod
+  GetPixelCacheVirtualMethod(const Image *),
+  SetPixelCacheVirtualMethod(const Image *,const VirtualPixelMethod);
+
 extern MagickPrivate void
   CacheComponentTerminus(void),
   ClonePixelCacheMethods(Cache,const Cache),
   *GetPixelCacheNexusMetacontent(const Cache,NexusInfo *),
+  *GetPixelCachePixels(Image *,MagickSizeType *,ExceptionInfo *),
   GetPixelCacheTileSize(const Image *,size_t *,size_t *),
   GetPixelCacheMethods(CacheMethods *),
   SetPixelCacheMethods(Cache,CacheMethods *);

diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index 74318ec0d968f45bd4c23f5acfc506871cd9344d..d24a07a57dd1d7f250734ac50e4e4d9971a8119c 100644 (file)
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -66,6 +66,7 @@
 #include "MagickCore/string-private.h"
 #include "MagickCore/thread-private.h"
 #include "MagickCore/utility.h"
+#include "MagickCore/utility-private.h"
 #if defined(MAGICKCORE_ZLIB_DELEGATE)
 #include "zlib.h"
 #endif
@@ -297,7 +298,7 @@ MagickPrivate NexusInfo **AcquirePixelCacheNexus(const size_t number_threads)
 %    o exception: return any errors or warnings in this structure.
 %
 */
-MagickExport const void *AcquirePixelCachePixels(const Image *image,
+MagickPrivate const void *AcquirePixelCachePixels(const Image *image,
   MagickSizeType *length,ExceptionInfo *exception)
 {
   CacheInfo
@@ -2687,7 +2688,7 @@ MagickPrivate Quantum *GetPixelCacheNexusPixels(const Cache cache,
 %    o exception: return any errors or warnings in this structure.
 %
 */
-MagickExport void *GetPixelCachePixels(Image *image,MagickSizeType *length,
+MagickPrivate void *GetPixelCachePixels(Image *image,MagickSizeType *length,
   ExceptionInfo *exception)
 {
   CacheInfo
@@ -2850,7 +2851,7 @@ MagickPrivate CacheType GetPixelCacheType(const Image *image)
 %    o image: the image.
 %
 */
-MagickExport VirtualPixelMethod GetPixelCacheVirtualMethod(const Image *image)
+MagickPrivate VirtualPixelMethod GetPixelCacheVirtualMethod(const Image *image)
 {
   CacheInfo
     *cache_info;
@@ -5118,7 +5119,7 @@ static Quantum *SetPixelCacheNexusPixels(const Image *image,
 %    o virtual_pixel_method: choose the type of virtual pixel.
 %
 */
-MagickExport VirtualPixelMethod SetPixelCacheVirtualMethod(const Image *image,
+MagickPrivate VirtualPixelMethod SetPixelCacheVirtualMethod(const Image *image,
   const VirtualPixelMethod virtual_pixel_method)
 {
   CacheInfo
@@ -5316,7 +5317,7 @@ MagickExport MagickBooleanType SyncAuthenticPixels(Image *image,
 %                                                                             %
 %                                                                             %
 %                                                                             %
-%   S y n c I m a g e P i x e l C a c h e                                     %
++   S y n c I m a g e P i x e l C a c h e                                     %
 %                                                                             %
 %                                                                             %
 %                                                                             %
@@ -5338,7 +5339,7 @@ MagickExport MagickBooleanType SyncAuthenticPixels(Image *image,
 %    o exception: return any errors or warnings in this structure.
 %
 */
-MagickExport MagickBooleanType SyncImagePixelCache(Image *image,
+MagickPrivate MagickBooleanType SyncImagePixelCache(Image *image,
   ExceptionInfo *exception)
 {
   CacheInfo

diff --git a/MagickCore/cache.h b/MagickCore/cache.h
index 0d262e50fd1e155fe22412c6640d1a6224da6b5a..a511519c6e09cfe1908287145f22aed4474f758a 100644 (file)
--- a/MagickCore/cache.h
+++ b/MagickCore/cache.h
@@ -30,7 +30,6 @@ extern MagickExport const Quantum
   *GetVirtualPixelQueue(const Image *);
 
 extern MagickExport const void
-  *AcquirePixelCachePixels(const Image *,MagickSizeType *,ExceptionInfo *),
   *GetVirtualMetacontent(const Image *);
 
 extern MagickExport MagickBooleanType
@@ -44,8 +43,7 @@ extern MagickExport MagickBooleanType
     ExceptionInfo *),
   PersistPixelCache(Image *,const char *,const MagickBooleanType,
     MagickOffsetType *,ExceptionInfo *),
-  SyncAuthenticPixels(Image *,ExceptionInfo *),
-  SyncImagePixelCache(Image *,ExceptionInfo *);
+  SyncAuthenticPixels(Image *,ExceptionInfo *);
 
 extern MagickExport MagickSizeType
   GetImageExtent(const Image *);
@@ -57,13 +55,8 @@ extern MagickExport Quantum
   *QueueAuthenticPixels(Image *,const ssize_t,const ssize_t,const size_t,
     const size_t,ExceptionInfo *);
 
-extern MagickExport VirtualPixelMethod
-  GetPixelCacheVirtualMethod(const Image *),
-  SetPixelCacheVirtualMethod(const Image *,const VirtualPixelMethod);
-
 extern MagickExport void
-  *GetAuthenticMetacontent(const Image *),
-  *GetPixelCachePixels(Image *,MagickSizeType *,ExceptionInfo *);
+  *GetAuthenticMetacontent(const Image *);
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }

diff --git a/MagickCore/coder.c b/MagickCore/coder.c
index 8fb497d3bd5e980df0de0a38c879d12aaa56ac7f..2b411ee06e945910cbca264b35e26aa057bfe8ae 100644 (file)
--- a/MagickCore/coder.c
+++ b/MagickCore/coder.c
@@ -57,6 +57,7 @@
 #include "MagickCore/splay-tree.h"
 #include "MagickCore/token.h"
 #include "MagickCore/utility.h"
+#include "MagickCore/utility-private.h"
 #include "MagickCore/xml-tree.h"
 \f
 /*

diff --git a/MagickCore/color.c b/MagickCore/color.c
index c391910c7651024d40d8d6f3bbbee6b4872a3b13..960cb12d68763b0a4025f1c72d94c700105ac59a 100644 (file)
--- a/MagickCore/color.c
+++ b/MagickCore/color.c
@@ -52,6 +52,7 @@
 #include "MagickCore/exception.h"
 #include "MagickCore/exception-private.h"
 #include "MagickCore/gem.h"
+#include "MagickCore/gem-private.h"
 #include "MagickCore/geometry.h"
 #include "MagickCore/image-private.h"
 #include "MagickCore/memory_.h"
@@ -66,6 +67,7 @@
 #include "MagickCore/string_.h"
 #include "MagickCore/token.h"
 #include "MagickCore/utility.h"
+#include "MagickCore/utility-private.h"
 #include "MagickCore/xml-tree.h"
 \f
 /*

diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c
index 02483fde84f0e6a7053de886645d709d8f8a5331..ec6c3ab7e616d543c3530c1599bee4da0d3da42f 100644 (file)
--- a/MagickCore/colorspace.c
+++ b/MagickCore/colorspace.c
@@ -53,6 +53,7 @@
 #include "MagickCore/image.h"
 #include "MagickCore/image-private.h"
 #include "MagickCore/gem.h"
+#include "MagickCore/gem-private.h"
 #include "MagickCore/memory_.h"
 #include "MagickCore/monitor.h"
 #include "MagickCore/monitor-private.h"

diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index 22252238da75f40d290b41041139e406a476852e..6f9c7e1467f100f72651d56010707092ef0cea0e 100644 (file)
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -72,6 +72,7 @@
 #include "MagickCore/string_.h"
 #include "MagickCore/thread-private.h"
 #include "MagickCore/utility.h"
+#include "MagickCore/utility-private.h"
 #include "MagickCore/version.h"
 \f
 /*

diff --git a/MagickCore/configure.c b/MagickCore/configure.c
index 83051b3d5cadab66f2916f4c3393270ba2cadb2b..6049bb0fab3ec102c64e2ddd5dd59b40973010aa 100644 (file)
--- a/MagickCore/configure.c
+++ b/MagickCore/configure.c
@@ -53,6 +53,7 @@
 #include "MagickCore/string_.h"
 #include "MagickCore/token.h"
 #include "MagickCore/utility.h"
+#include "MagickCore/utility-private.h"
 #include "MagickCore/xml-tree.h"
 \f
 /*

diff --git a/MagickCore/constitute.c b/MagickCore/constitute.c
index fbe65a345e4c208a7435b3e9b2ff91e37826b311..e2d0e298116475721da3187471759cc008bd1d53 100644 (file)
--- a/MagickCore/constitute.c
+++ b/MagickCore/constitute.c
@@ -74,6 +74,7 @@
 #include "MagickCore/timer.h"
 #include "MagickCore/transform.h"
 #include "MagickCore/utility.h"
+#include "MagickCore/utility-private.h"
 \f
 static SemaphoreInfo
   *constitute_semaphore = (SemaphoreInfo *) NULL;

diff --git a/MagickCore/delegate.c b/MagickCore/delegate.c
index fea264215c663f9865204ab4bf337f714cb48edf..2f475959d64d5c41ca268efdbbff6d08b6006242 100644 (file)
--- a/MagickCore/delegate.c
+++ b/MagickCore/delegate.c
@@ -64,6 +64,7 @@
 #include "MagickCore/string_.h"
 #include "MagickCore/token.h"
 #include "MagickCore/utility.h"
+#include "MagickCore/utility-private.h"
 #include "MagickCore/xml-tree.h"
 \f
 /*

diff --git a/MagickCore/display.c b/MagickCore/display.c
index d0308b2d58ed71e5b96f880ad1be07f7dfda62d7..84c09bbc9c2c384df0282d8c94f03ff267211b92 100644 (file)
--- a/MagickCore/display.c
+++ b/MagickCore/display.c
@@ -85,6 +85,7 @@
 #include "MagickCore/transform.h"
 #include "MagickCore/threshold.h"
 #include "MagickCore/utility.h"
+#include "MagickCore/utility-private.h"
 #include "MagickCore/version.h"
 #include "MagickCore/widget.h"
 #include "MagickCore/widget-private.h"

diff --git a/MagickCore/distort.c b/MagickCore/distort.c
index 4d46fd3d546a689117d66d22e66043947bff3044..6413c53ed56153f4b915f95a16d30dd542dc7a79 100644 (file)
--- a/MagickCore/distort.c
+++ b/MagickCore/distort.c
@@ -54,6 +54,7 @@
 #include "MagickCore/image.h"
 #include "MagickCore/list.h"
 #include "MagickCore/matrix.h"
+#include "MagickCore/matrix-private.h"
 #include "MagickCore/memory_.h"
 #include "MagickCore/monitor-private.h"
 #include "MagickCore/option.h"

diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c
index d6c70a265610bdab527f292c73abf1b1e5b63793..fe3079ad84521ff26caf339d7c1cdbf2f16571aa 100644 (file)
--- a/MagickCore/enhance.c
+++ b/MagickCore/enhance.c
@@ -53,6 +53,7 @@
 #include "MagickCore/exception-private.h"
 #include "MagickCore/fx.h"
 #include "MagickCore/gem.h"
+#include "MagickCore/gem-private.h"
 #include "MagickCore/geometry.h"
 #include "MagickCore/histogram.h"
 #include "MagickCore/image.h"

diff --git a/MagickCore/exception.c b/MagickCore/exception.c
index 509a585a5a73c7cf39551c4bb1f01036907a12bb..47c9d297654592a1eecc2534d40f1e69f9a7424e 100644 (file)
--- a/MagickCore/exception.c
+++ b/MagickCore/exception.c
@@ -51,6 +51,7 @@
 #include "MagickCore/memory_.h"
 #include "MagickCore/string_.h"
 #include "MagickCore/utility.h"
+#include "MagickCore/utility-private.h"
 \f
 /*
   Forward declarations.
@@ -936,10 +937,10 @@ MagickExport MagickBooleanType ThrowException(ExceptionInfo *exception,
 %
 */
 
-MagickExport MagickBooleanType ThrowMagickExceptionList(
-  ExceptionInfo *exception,const char *module,const char *function,
-  const size_t line,const ExceptionType severity,const char *tag,
-  const char *format,va_list operands)
+static MagickBooleanType ThrowMagickExceptionList(ExceptionInfo *exception,
+  const char *module,const char *function,const size_t line,
+  const ExceptionType severity,const char *tag,const char *format,
+  va_list operands)
 {
   char
     message[MaxTextExtent],

diff --git a/MagickCore/exception.h b/MagickCore/exception.h
index de24d7e020fa677a1a95c282627803dfe9b8074b..b979323de5ae54e862755ff1cfe3fa9e7698a0c5 100644 (file)
--- a/MagickCore/exception.h
+++ b/MagickCore/exception.h
@@ -154,10 +154,7 @@ extern MagickExport MagickBooleanType
     const char *),
   ThrowMagickException(ExceptionInfo *,const char *,const char *,const size_t,
     const ExceptionType,const char *,const char *,...)
-    magick_attribute((format (printf,7,8))),
-  ThrowMagickExceptionList(ExceptionInfo *,const char *,const char *,
-    const size_t,const ExceptionType,const char *,const char *,va_list)
-    magick_attribute((format (printf,7,0)));
+    magick_attribute((format (printf,7,8)));
 
 extern MagickExport void
   CatchException(ExceptionInfo *),

diff --git a/MagickCore/gem-private.h b/MagickCore/gem-private.h
new file mode 100644 (file)
index 0000000..a50a38b
--- /dev/null
+++ b/MagickCore/gem-private.h
@@ -0,0 +1,39 @@
+/*
+  Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
+  dedicated to making software imaging solutions freely available.
+  
+  You may not use this file except in compliance with the License.
+  obtain a copy of the License at
+  
+    http://www.imagemagick.org/script/license.php
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+  MagickCore private graphic gems methods.
+*/
+#ifndef _MAGICKCORE_GEM_PRIVATE_H
+#define _MAGICKCORE_GEM_PRIVATE_H
+
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
+extern MagickPrivate void
+  ConvertHSBToRGB(const double,const double,const double,Quantum *,Quantum *,
+    Quantum *),
+  ConvertHWBToRGB(const double,const double,const double,Quantum *,Quantum *,
+    Quantum *),
+  ConvertRGBToHSB(const Quantum,const Quantum,const Quantum,double *,double *,
+    double *),
+  ConvertRGBToHWB(const Quantum,const Quantum,const Quantum,double *,double *,
+    double *);
+
+#if defined(__cplusplus) || defined(c_plusplus)
+}
+#endif
+
+#endif

diff --git a/MagickCore/gem.c b/MagickCore/gem.c
index cf479c1844584242a9747f03422c58b7689ef06f..9ac8e133bd2593700ed4d558822af421b32f7189 100644 (file)
--- a/MagickCore/gem.c
+++ b/MagickCore/gem.c
@@ -44,6 +44,7 @@
 #include "MagickCore/color-private.h"
 #include "MagickCore/draw.h"
 #include "MagickCore/gem.h"
+#include "MagickCore/gem-private.h"
 #include "MagickCore/image.h"
 #include "MagickCore/image-private.h"
 #include "MagickCore/log.h"
@@ -83,7 +84,7 @@
 %    o red, green, blue: A pointer to a pixel component of type Quantum.
 %
 */
-MagickExport void ConvertHSBToRGB(const double hue,const double saturation,
+MagickPrivate void ConvertHSBToRGB(const double hue,const double saturation,
   const double brightness,Quantum *red,Quantum *green,Quantum *blue)
 {
   MagickRealType
@@ -266,7 +267,7 @@ MagickExport void ConvertHSLToRGB(const double hue,const double saturation,
 %    o red, green, blue: A pointer to a pixel component of type Quantum.
 %
 */
-MagickExport void ConvertHWBToRGB(const double hue,const double whiteness,
+MagickPrivate void ConvertHWBToRGB(const double hue,const double whiteness,
   const double blackness,Quantum *red,Quantum *green,Quantum *blue)
 {
   MagickRealType
@@ -343,7 +344,7 @@ MagickExport void ConvertHWBToRGB(const double hue,const double whiteness,
 %      component of the HSB color space.
 %
 */
-MagickExport void ConvertRGBToHSB(const Quantum red,const Quantum green,
+MagickPrivate void ConvertRGBToHSB(const Quantum red,const Quantum green,
   const Quantum blue,double *hue,double *saturation,double *brightness)
 {
   MagickRealType
@@ -506,7 +507,7 @@ MagickExport void ConvertRGBToHSL(const Quantum red,const Quantum green,
 %      component of the HWB color space.
 %
 */
-MagickExport void ConvertRGBToHWB(const Quantum red,const Quantum green,
+MagickPrivate void ConvertRGBToHWB(const Quantum red,const Quantum green,
   const Quantum blue,double *hue,double *whiteness,double *blackness)
 {
   long

diff --git a/MagickCore/gem.h b/MagickCore/gem.h
index 27796f938f3ad377a606e87c2d28c9991aa00ca8..de71255c3900b915f6bd8084126af940e9a009a5 100644 (file)
--- a/MagickCore/gem.h
+++ b/MagickCore/gem.h
@@ -13,10 +13,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 
-  MagickCore private graphic gems methods.
+  MagickCore graphic gems methods.
 */
-#ifndef _MAGICKCORE_GEM_PRIVATE_H
-#define _MAGICKCORE_GEM_PRIVATE_H
+#ifndef _MAGICKCORE_GEM_H
+#define _MAGICKCORE_GEM_H
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
@@ -36,17 +36,9 @@ extern MagickExport size_t
   GetOptimalKernelWidth2D(const double,const double);
 
 extern MagickExport void
-  ConvertHSBToRGB(const double,const double,const double,Quantum *,Quantum *,
-    Quantum *),
   ConvertHSLToRGB(const double,const double,const double,Quantum *,Quantum *,
     Quantum *),
-  ConvertHWBToRGB(const double,const double,const double,Quantum *,Quantum *,
-    Quantum *),
-  ConvertRGBToHSB(const Quantum,const Quantum,const Quantum,double *,double *,
-    double *),
   ConvertRGBToHSL(const Quantum,const Quantum,const Quantum,double *,double *,
-    double *),
-  ConvertRGBToHWB(const Quantum,const Quantum,const Quantum,double *,double *,
     double *);
 
 #if defined(__cplusplus) || defined(c_plusplus)

diff --git a/MagickCore/identify.c b/MagickCore/identify.c
index b9fe6642dc91cec62a6b4272b3aa9b69f645c64a..4bcbad715df5bc60ce65d47278c2faf8cb169576 100644 (file)
--- a/MagickCore/identify.c
+++ b/MagickCore/identify.c
@@ -92,6 +92,7 @@
 #include "MagickCore/string-private.h"
 #include "MagickCore/timer.h"
 #include "MagickCore/utility.h"
+#include "MagickCore/utility-private.h"
 #include "MagickCore/version.h"
 #if defined(MAGICKCORE_LCMS_DELEGATE)
 #if defined(MAGICKCORE_HAVE_LCMS_LCMS2_H)

diff --git a/MagickCore/image.c b/MagickCore/image.c
index b1a34f4ddfbaede520338fa929cb48e366cbc0df..2bb3af2c92af8c5ea77d980591d7ce1f1c90892d 100644 (file)
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -92,6 +92,7 @@
 #include "MagickCore/threshold.h"
 #include "MagickCore/timer.h"
 #include "MagickCore/utility.h"
+#include "MagickCore/utility-private.h"
 #include "MagickCore/version.h"
 #include "MagickCore/xwindow-private.h"
 \f

diff --git a/MagickCore/locale.c b/MagickCore/locale.c
index e26ee1d96bf1c8468532c97e589b849df91fdfb7..00d45ce5b21e62a2acee08d139ff189d01b67e8e 100644 (file)
--- a/MagickCore/locale.c
+++ b/MagickCore/locale.c
@@ -55,6 +55,7 @@
 #include "MagickCore/string_.h"
 #include "MagickCore/token.h"
 #include "MagickCore/utility.h"
+#include "MagickCore/utility-private.h"
 #include "MagickCore/xml-tree.h"
 \f
 /*

diff --git a/MagickCore/log.c b/MagickCore/log.c
index 7448e24d535ace8bb95e4440b7656ca939b87bb0..7dc947f744c7f1c48628365dc405a3f387eb5a07 100644 (file)
--- a/MagickCore/log.c
+++ b/MagickCore/log.c
@@ -58,6 +58,7 @@
 #include "MagickCore/thread_.h"
 #include "MagickCore/thread-private.h"
 #include "MagickCore/utility.h"
+#include "MagickCore/utility-private.h"
 #include "MagickCore/version.h"
 #include "MagickCore/xml-tree.h"
 \f

diff --git a/MagickCore/magic.c b/MagickCore/magic.c
index 0409fe6be0cfdfc44419522bf5deeb0438a2b8fa..20c91db7da2baac423e30f28fa1f8c06df0e9feb 100644 (file)
--- a/MagickCore/magic.c
+++ b/MagickCore/magic.c
@@ -54,6 +54,7 @@
 #include "MagickCore/string-private.h"
 #include "MagickCore/token.h"
 #include "MagickCore/utility.h"
+#include "MagickCore/utility-private.h"
 #include "MagickCore/xml-tree.h"
 \f
 /*

diff --git a/MagickCore/magick.c b/MagickCore/magick.c
index 376e9c2ed59a63ad372fde06adc338e4538b989e..7c69645b75aafbc7e0982cb0909c997a2e531e16 100644 (file)
--- a/MagickCore/magick.c
+++ b/MagickCore/magick.c
@@ -85,6 +85,7 @@
 #include "MagickCore/type-private.h"
 #include "MagickCore/token.h"
 #include "MagickCore/utility.h"
+#include "MagickCore/utility-private.h"
 #include "MagickCore/xwindow-private.h"
 \f
 /*

diff --git a/MagickCore/matrix-private.h b/MagickCore/matrix-private.h
new file mode 100644 (file)
index 0000000..fe3f539
--- /dev/null
+++ b/MagickCore/matrix-private.h
@@ -0,0 +1,36 @@
+/*
+  Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
+  dedicated to making software imaging solutions freely available.
+  
+  You may not use this file except in compliance with the License.
+  obtain a copy of the License at
+  
+    http://www.imagemagick.org/script/license.php
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+  MagickCore private graphic matrix methods.
+*/
+#ifndef _MAGICKCORE_MATRIX_PRIVATE_H
+#define _MAGICKCORE_MATRIX_PRIVATE_H
+
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
+extern MagickPrivate MagickBooleanType
+  GaussJordanElimination(double **,double **,const size_t,const size_t);
+
+extern MagickPrivate void
+  LeastSquaresAddTerms(double **,double **,const double *,const double *,
+    const size_t, const size_t);
+
+#if defined(__cplusplus) || defined(c_plusplus)
+}
+#endif
+
+#endif

diff --git a/MagickCore/matrix.c b/MagickCore/matrix.c
index db6d69cfcf962235981b9592963c707f9da898b8..23aa0ce8afedab0d8142db0aa213b71cfd0745bf 100644 (file)
--- a/MagickCore/matrix.c
+++ b/MagickCore/matrix.c
@@ -41,6 +41,7 @@
 */
 #include "MagickCore/studio.h"
 #include "MagickCore/matrix.h"
+#include "MagickCore/matrix-private.h"
 #include "MagickCore/memory_.h"
 #include "MagickCore/utility.h"
 \f
@@ -176,7 +177,7 @@ MagickExport double **AcquireMagickMatrix(const size_t number_rows,
 %  details see    http://en.wikipedia.org/wiki/Gauss-Jordan_elimination
 %
 */
-MagickExport MagickBooleanType GaussJordanElimination(double **matrix,
+MagickPrivate MagickBooleanType GaussJordanElimination(double **matrix,
   double **vectors,const size_t rank,const size_t number_vectors)
 {
 #define GaussJordanSwap(x,y) \
@@ -354,7 +355,7 @@ MagickExport MagickBooleanType GaussJordanElimination(double **matrix,
 %     RelinquishMagickMatrix(vectors,2UL);
 %
 */
-MagickExport void LeastSquaresAddTerms(double **matrix,double **vectors,
+MagickPrivate void LeastSquaresAddTerms(double **matrix,double **vectors,
   const double *terms,const double *results,const size_t rank,
   const size_t number_vectors)
 {

diff --git a/MagickCore/matrix.h b/MagickCore/matrix.h
index 1ec1df7500b540be4121c26d2b3675e7fac7c780..b54d113119819a7fba039dba18ffe5d56e4a5b8c 100644 (file)
--- a/MagickCore/matrix.h
+++ b/MagickCore/matrix.h
@@ -26,13 +26,6 @@ extern MagickExport double
   **AcquireMagickMatrix(const size_t,const size_t),
   **RelinquishMagickMatrix(double **,const size_t);
 
-extern MagickExport MagickBooleanType
-  GaussJordanElimination(double **,double **,const size_t,const size_t);
-
-extern MagickExport void
-  LeastSquaresAddTerms(double **,double **,const double *,const double *,
-    const size_t, const size_t);
-
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif

diff --git a/MagickCore/mime.c b/MagickCore/mime.c
index c57b40b2d34e678b222c43c164f8fa585f9eb48a..4fa6b47f190421918063c54f93947e3862c6ee3b 100644 (file)
--- a/MagickCore/mime.c
+++ b/MagickCore/mime.c
@@ -52,6 +52,7 @@
 #include "MagickCore/string_.h"
 #include "MagickCore/token.h"
 #include "MagickCore/utility.h"
+#include "MagickCore/utility-private.h"
 #include "MagickCore/xml-tree.h"
 \f
 /*

diff --git a/MagickCore/module.c b/MagickCore/module.c
index 77648f285c4834bb059f2cb870c056cb320b8553..27103c7a2b26d8bdcb1c9767819bd022bff3041d 100644 (file)
--- a/MagickCore/module.c
+++ b/MagickCore/module.c
@@ -61,6 +61,7 @@
 #include "MagickCore/string_.h"
 #include "MagickCore/token.h"
 #include "MagickCore/utility.h"
+#include "MagickCore/utility-private.h"
 #if defined(MAGICKCORE_MODULES_SUPPORT)
 #if defined(MAGICKCORE_LTDL_DELEGATE)
 #include "ltdl.h"

diff --git a/MagickCore/montage.c b/MagickCore/montage.c
index af46c4a82d6b2af51a04c4989f19dfd88e2b2875..62c4633a17232fba0e8e331563014e4473e02418 100644 (file)
--- a/MagickCore/montage.c
+++ b/MagickCore/montage.c
@@ -69,6 +69,7 @@
 #include "MagickCore/resource_.h"
 #include "MagickCore/string_.h"
 #include "MagickCore/utility.h"
+#include "MagickCore/utility-private.h"
 #include "MagickCore/version.h"
 \f
 /*

diff --git a/MagickCore/morphology.c b/MagickCore/morphology.c
index 0c76037bf67cfcaf96627ee1b5f1e56ef2300c34..dabe4b8bad9feed78f55720a99c3b4a309272dfc 100644 (file)
--- a/MagickCore/morphology.c
+++ b/MagickCore/morphology.c
@@ -78,6 +78,7 @@
 #include "MagickCore/string-private.h"
 #include "MagickCore/token.h"
 #include "MagickCore/utility.h"
+#include "MagickCore/utility-private.h"
 \f
 
 /*

diff --git a/MagickCore/policy.c b/MagickCore/policy.c
index 27e32ed0e5287c9456e2a850b68d2793132c9957..747ce5214c76999f8e9d80bdb6f002191d78e134 100644 (file)
--- a/MagickCore/policy.c
+++ b/MagickCore/policy.c
@@ -55,6 +55,7 @@
 #include "MagickCore/string_.h"
 #include "MagickCore/token.h"
 #include "MagickCore/utility.h"
+#include "MagickCore/utility-private.h"
 #include "MagickCore/xml-tree.h"
 \f
 /*

diff --git a/MagickCore/property.c b/MagickCore/property.c
index 460c85b6c897b2193b668b46fc51a9c480c2d9b7..90dce9469401feb85f42361c353717aca14bedba 100644 (file)
--- a/MagickCore/property.c
+++ b/MagickCore/property.c
@@ -75,6 +75,7 @@
 #include "MagickCore/string-private.h"
 #include "MagickCore/token.h"
 #include "MagickCore/utility.h"
+#include "MagickCore/utility-private.h"
 #include "MagickCore/version.h"
 #include "MagickCore/xml-tree.h"
 \f

diff --git a/MagickCore/resample.c b/MagickCore/resample.c
index 7da164c1774a526d05bdfeff7d2c97d382d5c537..37c138243ca3012b450741dad6eeaf2552de2e36 100644 (file)
--- a/MagickCore/resample.c
+++ b/MagickCore/resample.c
@@ -62,6 +62,7 @@
 #include "MagickCore/transform.h"
 #include "MagickCore/signature-private.h"
 #include "MagickCore/utility.h"
+#include "MagickCore/utility-private.h"
 /*
   EWA Resampling Options
 */

diff --git a/MagickCore/resize.c b/MagickCore/resize.c
index e88ff06b33b196702bdec742703e97f680be81fb..83367a413a8c669919bc3ed5de477eb06b05752b 100644 (file)
--- a/MagickCore/resize.c
+++ b/MagickCore/resize.c
@@ -70,6 +70,7 @@
 #include "MagickCore/string-private.h"
 #include "MagickCore/thread-private.h"
 #include "MagickCore/utility.h"
+#include "MagickCore/utility-private.h"
 #include "MagickCore/version.h"
 #if defined(MAGICKCORE_LQR_DELEGATE)
 #include <lqr.h>

diff --git a/MagickCore/resource.c b/MagickCore/resource.c
index 7d640b7291c4cea19bfc50a3b9314d4dd9165da8..4601ac59787589a0d1227ad1517df9619e66f133 100644 (file)
--- a/MagickCore/resource.c
+++ b/MagickCore/resource.c
@@ -62,6 +62,7 @@
 #include "MagickCore/thread-private.h"
 #include "MagickCore/token.h"
 #include "MagickCore/utility.h"
+#include "MagickCore/utility-private.h"
 \f
 /*
   Typedef declarations.

diff --git a/MagickCore/token.c b/MagickCore/token.c
index cc74f37de3ce1002d019d022d42b4e6087aaec85..b313d965ac0ef22fa1fc661ad4a54200d2152f56 100644 (file)
--- a/MagickCore/token.c
+++ b/MagickCore/token.c
@@ -50,6 +50,7 @@
 #include "MagickCore/token.h"
 #include "MagickCore/token-private.h"
 #include "MagickCore/utility.h"
+#include "MagickCore/utility-private.h"
 \f
 /*
   Typedef declaractions.

diff --git a/MagickCore/type.c b/MagickCore/type.c
index aeea227adc7377f8a65347a06be075ea2e4ca50a..62e3ce471473356d46ec6fcbf9600c99948b7cdf 100644 (file)
--- a/MagickCore/type.c
+++ b/MagickCore/type.c
@@ -58,6 +58,7 @@
 #include "MagickCore/type-private.h"
 #include "MagickCore/token.h"
 #include "MagickCore/utility.h"
+#include "MagickCore/utility-private.h"
 #include "MagickCore/xml-tree.h"
 #if defined(MAGICKCORE_FONTCONFIG_DELEGATE)
 # include "fontconfig/fontconfig.h"

diff --git a/MagickCore/utility-private.h b/MagickCore/utility-private.h
new file mode 100644 (file)
index 0000000..0cf53ba
--- /dev/null
+++ b/MagickCore/utility-private.h
@@ -0,0 +1,44 @@
+/*
+  Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
+  dedicated to making software imaging solutions freely available.
+  
+  You may not use this file except in compliance with the License.
+  obtain a copy of the License at
+  
+    http://www.imagemagick.org/script/license.php
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+  MagickCore private utility methods.
+*/
+#ifndef _MAGICKCORE_UTILITY_PRIVATE_H
+#define _MAGICKCORE_UTILITY_PRIVATE_H
+
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
+extern MagickPrivate char
+  **GetPathComponents(const char *,size_t *),
+  **ListFiles(const char *,const char *,size_t *);
+
+extern MagickPrivate MagickBooleanType
+  GetExecutionPath(char *,const size_t);
+
+extern MagickPrivate ssize_t
+  GetMagickPageSize(void);
+
+extern MagickPrivate void
+  ChopPathComponents(char *,const size_t),
+  ExpandFilename(char *),
+  MagickDelay(const MagickSizeType);
+
+#if defined(__cplusplus) || defined(c_plusplus)
+}
+#endif
+
+#endif

diff --git a/MagickCore/utility.c b/MagickCore/utility.c
index b369536e204b26f2486fadbf6437a8169f867eee..2cd8787dc543dac91ef9b3472541619d8e20a42a 100644 (file)
--- a/MagickCore/utility.c
+++ b/MagickCore/utility.c
@@ -58,6 +58,7 @@
 #include "MagickCore/string_.h"
 #include "MagickCore/token.h"
 #include "MagickCore/utility.h"
+#include "MagickCore/utility-private.h"
 #if defined(MAGICKCORE_HAVE_PROCESS_H)
 #include <process.h>
 #endif
@@ -564,7 +565,7 @@ MagickExport char *Base64Encode(const unsigned char *blob,
 %    o components:  The number of components to chop.
 %
 */
-MagickExport void ChopPathComponents(char *path,const size_t components)
+MagickPrivate void ChopPathComponents(char *path,const size_t components)
 {
   register ssize_t
     i;
@@ -596,7 +597,7 @@ MagickExport void ChopPathComponents(char *path,const size_t components)
 %      path.
 %
 */
-MagickExport void ExpandFilename(char *path)
+MagickPrivate void ExpandFilename(char *path)
 {
   char
     expand_path[MaxTextExtent];
@@ -937,7 +938,7 @@ MagickExport MagickBooleanType ExpandFilenames(int *number_arguments,
 %    o extent: the maximum extent of the path.
 %
 */
-MagickExport MagickBooleanType GetExecutionPath(char *path,const size_t extent)
+MagickPrivate MagickBooleanType GetExecutionPath(char *path,const size_t extent)
 {
   char
     *directory;
@@ -1059,7 +1060,7 @@ MagickExport MagickBooleanType GetExecutionPath(char *path,const size_t extent)
 %      ssize_t GetMagickPageSize()
 %
 */
-MagickExport ssize_t GetMagickPageSize(void)
+MagickPrivate ssize_t GetMagickPageSize(void)
 {
   static ssize_t
     page_size = -1;
@@ -1450,7 +1451,7 @@ MagickExport void GetPathComponent(const char *path,PathType type,
 %    o number_components:  return the number of components in the list
 %
 */
-MagickExport char **GetPathComponents(const char *path,
+MagickPrivate char **GetPathComponents(const char *path,
   size_t *number_components)
 {
   char
@@ -1682,7 +1683,7 @@ static inline int MagickReadDirectory(DIR *directory,struct dirent *entry,
 #endif
 }
 
-MagickExport char **ListFiles(const char *directory,const char *pattern,
+MagickPrivate char **ListFiles(const char *directory,const char *pattern,
   size_t *number_entries)
 {
   char
@@ -1803,7 +1804,7 @@ MagickExport char **ListFiles(const char *directory,const char *pattern,
 %      returning.
 %
 */
-MagickExport void MagickDelay(const MagickSizeType milliseconds)
+MagickPrivate void MagickDelay(const MagickSizeType milliseconds)
 {
   if (milliseconds == 0)
     return;
@@ -1868,7 +1869,6 @@ MagickExport void MagickDelay(const MagickSizeType milliseconds)
 %
 %   o  label:  This character string is the label.
 %
-%
 */
 MagickExport size_t MultilineCensus(const char *label)
 {

diff --git a/MagickCore/utility.h b/MagickCore/utility.h
index d8d308fd7dedbcf4b9f7644b052f680e72af680c..e22a721ccb22754c689896418eb0ab231ede4408 100644 (file)
--- a/MagickCore/utility.h
+++ b/MagickCore/utility.h
@@ -36,9 +36,7 @@ typedef enum
 } PathType;
 
 extern MagickExport char
-  *Base64Encode(const unsigned char *,const size_t,size_t *),
-  **GetPathComponents(const char *,size_t *),
-  **ListFiles(const char *,const char *,size_t *);
+  *Base64Encode(const unsigned char *,const size_t,size_t *);
 
 extern MagickExport FILE
   *OpenMagickStream(const char *,const char *);
@@ -52,25 +50,18 @@ extern MagickExport MagickBooleanType
   AcquireUniqueSymbolicLink(const char *,char *),
   ExpandFilenames(int *,char ***),
   GetPathAttributes(const char *,void *),
-  GetExecutionPath(char *,const size_t),
   IsMagickTrue(const char *),
   IsPathAccessible(const char *);
 
 extern MagickExport size_t
   MultilineCensus(const char *);
 
-extern MagickExport ssize_t
-  GetMagickPageSize(void);
-
 extern MagickExport unsigned char
   *Base64Decode(const char *, size_t *);
 
 extern MagickExport void
   AppendImageFormat(const char *,char *),
-  ChopPathComponents(char *,const size_t),
-  ExpandFilename(char *),
-  GetPathComponent(const char *,PathType,char *),
-  MagickDelay(const MagickSizeType);
+  GetPathComponent(const char *,PathType,char *);
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }

diff --git a/MagickCore/version.c b/MagickCore/version.c
index 869ccfb54b850cfc3df485d1daaeb178f5e65f71..579191abb221183b9a201b52d2b8ece0a5d6f461 100644 (file)
--- a/MagickCore/version.c
+++ b/MagickCore/version.c
@@ -45,6 +45,7 @@
 #include "MagickCore/option.h"
 #include "MagickCore/string_.h"
 #include "MagickCore/utility.h"
+#include "MagickCore/utility-private.h"
 #include "MagickCore/version.h"
 \f
 /*

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 61157d39eb101761bd71fabf70cf1b52544a5d1b..c85ce25cecf35281b748d31e37f24346484a59d1 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -34,7 +34,7 @@ extern "C" {
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  5
 #define MagickLibMinInterface  5
-#define MagickReleaseDate  "2011-09-02"
+#define MagickReleaseDate  "2011-09-03"
 #define MagickChangeDate   "20110801"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)

diff --git a/MagickCore/widget.c b/MagickCore/widget.c
index 6d745d131b27ca88b1eff890056f99f96c79d29d..708d5519279d1527548d4bd2fedad6db75946f5d 100644 (file)
--- a/MagickCore/widget.c
+++ b/MagickCore/widget.c
@@ -52,6 +52,7 @@
 #include "MagickCore/string_.h"
 #include "MagickCore/token.h"
 #include "MagickCore/utility.h"
+#include "MagickCore/utility-private.h"
 #include "MagickCore/xwindow-private.h"
 #include "MagickCore/widget.h"
 #include "MagickCore/widget-private.h"

diff --git a/MagickCore/xml-tree.c b/MagickCore/xml-tree.c
index f7395c5d9153519bae6d4a24cf96b8173adbfc39..8baa482c64cc43560e2973715c805674f2beb774 100644 (file)
--- a/MagickCore/xml-tree.c
+++ b/MagickCore/xml-tree.c
@@ -59,6 +59,7 @@
 #include "MagickCore/token-private.h"
 #include "MagickCore/xml-tree.h"
 #include "MagickCore/utility.h"
+#include "MagickCore/utility-private.h"
 \f
 /*
   Define declarations.

diff --git a/MagickCore/xwindow.c b/MagickCore/xwindow.c
index 262f52167acf26d188e3100e1dc08866c2bf78ad..4304c161f69aa331e117399e19bed4a159f6deb7 100644 (file)
--- a/MagickCore/xwindow.c
+++ b/MagickCore/xwindow.c
@@ -76,6 +76,7 @@
 #include "MagickCore/string-private.h"
 #include "MagickCore/transform.h"
 #include "MagickCore/utility.h"
+#include "MagickCore/utility-private.h"
 #include "MagickCore/widget.h"
 #include "MagickCore/widget-private.h"
 #include "MagickCore/xwindow.h"

diff --git a/Makefile.in b/Makefile.in
index f8f5b557697adca37b2cac7c854b3a66f816f39f..10f99cfd32747131b6975b7f9fa4c76d0a2a7e3c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -407,19 +407,20 @@ am__MagickCore_libMagickCore_la_SOURCES_DIST =  \
        MagickCore/exception-private.h MagickCore/feature.c \
        MagickCore/feature.h MagickCore/fourier.c MagickCore/fourier.h \
        MagickCore/fx.c MagickCore/fx.h MagickCore/fx-private.h \
-       MagickCore/gem.c MagickCore/gem.h MagickCore/geometry.c \
-       MagickCore/geometry.h MagickCore/hashmap.c \
-       MagickCore/hashmap.h MagickCore/histogram.c \
-       MagickCore/histogram.h MagickCore/identify.c \
-       MagickCore/identify.h MagickCore/image.c MagickCore/image.h \
-       MagickCore/image-private.h MagickCore/image-view.c \
-       MagickCore/image-view.h MagickCore/layer.c MagickCore/layer.h \
-       MagickCore/list.c MagickCore/list.h MagickCore/locale.c \
-       MagickCore/locale_.h MagickCore/log.c MagickCore/log.h \
-       MagickCore/mac.h MagickCore/magic.c MagickCore/magic.h \
-       MagickCore/magick.c MagickCore/magick-config.h \
-       MagickCore/magick-type.h MagickCore/magick.h \
-       MagickCore/matrix.c MagickCore/matrix.h MagickCore/memory.c \
+       MagickCore/gem.c MagickCore/gem.h MagickCore/gem-private.h \
+       MagickCore/geometry.c MagickCore/geometry.h \
+       MagickCore/hashmap.c MagickCore/hashmap.h \
+       MagickCore/histogram.c MagickCore/histogram.h \
+       MagickCore/identify.c MagickCore/identify.h MagickCore/image.c \
+       MagickCore/image.h MagickCore/image-private.h \
+       MagickCore/image-view.c MagickCore/image-view.h \
+       MagickCore/layer.c MagickCore/layer.h MagickCore/list.c \
+       MagickCore/list.h MagickCore/locale.c MagickCore/locale_.h \
+       MagickCore/log.c MagickCore/log.h MagickCore/mac.h \
+       MagickCore/magic.c MagickCore/magic.h MagickCore/magick.c \
+       MagickCore/magick-config.h MagickCore/magick-type.h \
+       MagickCore/magick.h MagickCore/matrix.c MagickCore/matrix.h \
+       MagickCore/matrix-private.h MagickCore/memory.c \
        MagickCore/memory_.h MagickCore/methods.h MagickCore/mime.c \
        MagickCore/mime.h MagickCore/module.c MagickCore/module.h \
        MagickCore/monitor.c MagickCore/monitor.h \
@@ -461,7 +462,8 @@ am__MagickCore_libMagickCore_la_SOURCES_DIST =  \
        MagickCore/token-private.h MagickCore/transform.c \
        MagickCore/transform.h MagickCore/threshold.c \
        MagickCore/threshold.h MagickCore/type.c MagickCore/type.h \
-       MagickCore/utility.c MagickCore/utility.h MagickCore/version.c \
+       MagickCore/utility.c MagickCore/utility.h \
+       MagickCore/utility-private.h MagickCore/version.c \
        MagickCore/version.h MagickCore/vms.h MagickCore/widget.c \
        MagickCore/widget.h MagickCore/widget-private.h \
        MagickCore/xml-tree.c MagickCore/xml-tree.h \
@@ -3934,6 +3936,7 @@ MAGICKCORE_BASE_SRCS = \
        MagickCore/fx-private.h \
        MagickCore/gem.c \
        MagickCore/gem.h \
+       MagickCore/gem-private.h \
        MagickCore/geometry.c \
        MagickCore/geometry.h \
        MagickCore/hashmap.c \
@@ -3964,6 +3967,7 @@ MAGICKCORE_BASE_SRCS = \
        MagickCore/magick.h \
        MagickCore/matrix.c \
        MagickCore/matrix.h \
+       MagickCore/matrix-private.h \
        MagickCore/memory.c \
        MagickCore/memory_.h \
        MagickCore/methods.h \
@@ -4058,6 +4062,7 @@ MAGICKCORE_BASE_SRCS = \
        MagickCore/type.h \
        MagickCore/utility.c \
        MagickCore/utility.h \
+       MagickCore/utility-private.h \
        MagickCore/version.c \
        MagickCore/version.h \
        MagickCore/vms.h \
@@ -4192,12 +4197,14 @@ MAGICKCORE_NOINST_HDRS = \
        MagickCore/draw-private.h \
        MagickCore/exception-private.h \
        MagickCore/fx-private.h \
+       MagickCore/gem-private.h \
        MagickCore/image-private.h \
        MagickCore/locale-private.h \
        MagickCore/log-private.h \
        MagickCore/mac.h \
        MagickCore/magick-private.h \
        MagickCore/magic-private.h \
+       MagickCore/matrix-private.h \
        MagickCore/methods-private.h \
        MagickCore/mime-private.h \
        MagickCore/mime-private.h \
@@ -4226,6 +4233,7 @@ MAGICKCORE_NOINST_HDRS = \
        MagickCore/thread-private.h \
        MagickCore/token-private.h \
        MagickCore/type-private.h \
+       MagickCore/utility-private.h \
        MagickCore/vms.h \
        MagickCore/widget-private.h \
        MagickCore/xwindow-private.h

diff --git a/filters/analyze.c b/filters/analyze.c
index 4ff40f32e1619fbe4326798a25e5e9eda7ab95ca..4cb46a374565a32a192ad829854e3881ccc56fff 100644 (file)
--- a/filters/analyze.c
+++ b/filters/analyze.c
@@ -165,7 +165,7 @@ ModuleExport size_t analyzeImage(Image **images,const int argc,
         }
       for (x=0; x < (ssize_t) image->columns; x++)
       {
-        ConvertRGBToHSB(GetPixelRed(image,p),GetPixelGreen(image,p),
+        ConvertRGBToHSL(GetPixelRed(image,p),GetPixelGreen(image,p),
           GetPixelBlue(image,p),&hue,&saturation,&brightness);
         brightness*=QuantumRange;
         brightness_sum_x+=brightness;