(no commit message)

diff --git a/MagickCore/Makefile.am b/MagickCore/Makefile.am
index 6ca66e540a555ca118ba3b17ed106213dbd9abe9..1f1fd89b3643f3340fdf32e64115aefa7c1736b7 100644 (file)
--- a/MagickCore/Makefile.am
+++ b/MagickCore/Makefile.am
@@ -370,29 +370,48 @@ MAGICKCORE_INCLUDE_HDRS = \
 
 MAGICKCORE_NOINST_HDRS = \
        MagickCore/animate-private.h \
+       MagickCore/annotate-private.h \
        MagickCore/blob-private.h \
+       MagickCore/cache-private.h \
        MagickCore/cache-private.h \
-       MagickCore/color-private.h \
+       MagickCore/coder-private.h \
        MagickCore/colormap-private.h \
+       MagickCore/color-private.h \
+       MagickCore/color-private.h \
        MagickCore/colorspace-private.h \
        MagickCore/composite-private.h \
+       MagickCore/configure-private.h \
+       MagickCore/constitute-private.h \
+       MagickCore/delegate-private.h \
        MagickCore/delegate-private.h \
        MagickCore/display-private.h \
        MagickCore/draw-private.h \
        MagickCore/exception-private.h \
        MagickCore/fx-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/methods-private.h \
+       MagickCore/mime-private.h \
        MagickCore/mime-private.h \
+       MagickCore/module-private.h \
        MagickCore/monitor-private.h \
        MagickCore/morphology-private.h \
        MagickCore/nt-base.h \
        MagickCore/nt-feature.h \
+       MagickCore/policy-private.h \
        MagickCore/quantum-private.h \
+       MagickCore/random_-private.h \
        MagickCore/random-private.h \
+       MagickCore/registry-private.h \
        MagickCore/resample-private.h \
        MagickCore/resize-private.h \
+       MagickCore/resource-private.h \
        MagickCore/resource-private.h \
+       MagickCore/semaphore-private.h \
        MagickCore/semaphore-private.h \
        MagickCore/signature-private.h \
        MagickCore/static.h \
@@ -402,8 +421,9 @@ MAGICKCORE_NOINST_HDRS = \
        MagickCore/thread_.h \
        MagickCore/thread-private.h \
        MagickCore/token-private.h \
-       MagickCore/xwindow-private.h \
-       MagickCore/vms.h
+       MagickCore/type-private.h \
+       MagickCore/vms.h \
+       MagickCore/xwindow-private.h
 
 MAGICKCORE_EXTRA_DIST = \
        MagickCore/MagickCore-config.in \

diff --git a/MagickCore/annotate-private.h b/MagickCore/annotate-private.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index 5c11862d9364947d2ea4ad40e50bc54f6a374778..6c0d930b806873b74037833c1443c04957589e54 100644 (file)
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -180,7 +180,7 @@ static SplayTreeInfo
 %    o number_threads: the number of nexus threads.
 %
 */
-MagickExport Cache AcquirePixelCache(const size_t number_threads)
+MagickPrivate Cache AcquirePixelCache(const size_t number_threads)
 {
   CacheInfo
     *cache_info;
@@ -246,7 +246,7 @@ MagickExport Cache AcquirePixelCache(const size_t number_threads)
 %    o number_threads: the number of nexus threads.
 %
 */
-MagickExport NexusInfo **AcquirePixelCacheNexus(const size_t number_threads)
+MagickPrivate NexusInfo **AcquirePixelCacheNexus(const size_t number_threads)
 {
   NexusInfo
     **nexus_info;
@@ -493,7 +493,7 @@ static MagickBooleanType ClipPixelCacheNexus(Image *image,
 %    o cache: the pixel cache.
 %
 */
-MagickExport Cache ClonePixelCache(const Cache cache)
+MagickPrivate Cache ClonePixelCache(const Cache cache)
 {
   CacheInfo
     *clone_info;
@@ -1225,7 +1225,7 @@ static MagickBooleanType ClonePixelCachePixels(CacheInfo *clone_info,
 %    o cache: the pixel cache.
 %
 */
-MagickExport void ClonePixelCacheMethods(Cache clone,const Cache cache)
+MagickPrivate void ClonePixelCacheMethods(Cache clone,const Cache cache)
 {
   CacheInfo
     *cache_info,
@@ -1377,7 +1377,7 @@ static inline void RelinquishPixelCachePixels(CacheInfo *cache_info)
   cache_info->metacontent=(void *) NULL;
 }
 
-MagickExport Cache DestroyPixelCache(Cache cache)
+MagickPrivate Cache DestroyPixelCache(Cache cache)
 {
   CacheInfo
     *cache_info;
@@ -1470,7 +1470,7 @@ static inline void RelinquishCacheNexusPixels(NexusInfo *nexus_info)
   nexus_info->mapped=MagickFalse;
 }
 
-MagickExport NexusInfo **DestroyPixelCacheNexus(NexusInfo **nexus_info,
+MagickPrivate NexusInfo **DestroyPixelCacheNexus(NexusInfo **nexus_info,
   const size_t number_threads)
 {
   register ssize_t
@@ -1640,7 +1640,7 @@ static inline MagickBooleanType IsPixelAuthentic(const CacheInfo *cache_info,
   return(status);
 }
 
-MagickExport Quantum *GetAuthenticPixelCacheNexus(Image *image,
+MagickPrivate Quantum *GetAuthenticPixelCacheNexus(Image *image,
   const ssize_t x,const ssize_t y,const size_t columns,const size_t rows,
   NexusInfo *nexus_info,ExceptionInfo *exception)
 {
@@ -2481,7 +2481,7 @@ static MagickBooleanType GetOneVirtualPixelFromCache(const Image *image,
 %    o cache: the pixel cache.
 %
 */
-MagickExport ColorspaceType GetPixelCacheColorspace(const Cache cache)
+MagickPrivate ColorspaceType GetPixelCacheColorspace(const Cache cache)
 {
   CacheInfo
     *cache_info;
@@ -2517,7 +2517,7 @@ MagickExport ColorspaceType GetPixelCacheColorspace(const Cache cache)
 %    o cache_methods: Specifies a pointer to a CacheMethods structure.
 %
 */
-MagickExport void GetPixelCacheMethods(CacheMethods *cache_methods)
+MagickPrivate void GetPixelCacheMethods(CacheMethods *cache_methods)
 {
   assert(cache_methods != (CacheMethods *) NULL);
   (void) ResetMagickMemory(cache_methods,0,sizeof(*cache_methods));
@@ -2562,7 +2562,7 @@ MagickExport void GetPixelCacheMethods(CacheMethods *cache_methods)
 %    o nexus_info: the nexus info.
 %
 */
-MagickExport MagickSizeType GetPixelCacheNexusExtent(const Cache cache,
+MagickPrivate MagickSizeType GetPixelCacheNexusExtent(const Cache cache,
   NexusInfo *nexus_info)
 {
   CacheInfo
@@ -2606,7 +2606,7 @@ MagickExport MagickSizeType GetPixelCacheNexusExtent(const Cache cache,
 %    o nexus_info: the cache nexus to return the meta-content.
 %
 */
-MagickExport void *GetPixelCacheNexusMetacontent(const Cache cache,
+MagickPrivate void *GetPixelCacheNexusMetacontent(const Cache cache,
   NexusInfo *nexus_info)
 {
   CacheInfo
@@ -2646,7 +2646,7 @@ MagickExport void *GetPixelCacheNexusMetacontent(const Cache cache,
 %    o nexus_info: the cache nexus to return the pixels.
 %
 */
-MagickExport Quantum *GetPixelCacheNexusPixels(const Cache cache,
+MagickPrivate Quantum *GetPixelCacheNexusPixels(const Cache cache,
   NexusInfo *nexus_info)
 {
   CacheInfo
@@ -2732,7 +2732,7 @@ MagickExport void *GetPixelCachePixels(Image *image,MagickSizeType *length,
 %    o cache: the pixel cache.
 %
 */
-MagickExport ClassType GetPixelCacheStorageClass(const Cache cache)
+MagickPrivate ClassType GetPixelCacheStorageClass(const Cache cache)
 {
   CacheInfo
     *cache_info;
@@ -2773,7 +2773,7 @@ MagickExport ClassType GetPixelCacheStorageClass(const Cache cache)
 %    o height: the optimize cache tile height in pixels.
 %
 */
-MagickExport void GetPixelCacheTileSize(const Image *image,size_t *width,
+MagickPrivate void GetPixelCacheTileSize(const Image *image,size_t *width,
   size_t *height)
 {
   CacheInfo
@@ -2813,7 +2813,7 @@ MagickExport void GetPixelCacheTileSize(const Image *image,size_t *width,
 %    o image: the image.
 %
 */
-MagickExport CacheType GetPixelCacheType(const Image *image)
+MagickPrivate CacheType GetPixelCacheType(const Image *image)
 {
   CacheInfo
     *cache_info;
@@ -2934,7 +2934,7 @@ static const void *GetVirtualMetacontentFromCache(const Image *image)
 %    o nexus_info: the cache nexus to return the meta-content.
 %
 */
-MagickExport const void *GetVirtualMetacontentFromNexus(const Cache cache,
+MagickPrivate const void *GetVirtualMetacontentFromNexus(const Cache cache,
   NexusInfo *nexus_info)
 {
   CacheInfo
@@ -3125,7 +3125,7 @@ static inline MagickModulo VirtualPixelModulo(const ssize_t offset,
   return(modulo);
 }
 
-MagickExport const Quantum *GetVirtualPixelsFromNexus(const Image *image,
+MagickPrivate const Quantum *GetVirtualPixelsFromNexus(const Image *image,
   const VirtualPixelMethod virtual_pixel_method,const ssize_t x,const ssize_t y,
   const size_t columns,const size_t rows,NexusInfo *nexus_info,
   ExceptionInfo *exception)
@@ -3744,7 +3744,7 @@ static const Quantum *GetVirtualPixelsCache(const Image *image)
 %    o nexus_info: the cache nexus to return the colormap pixels.
 %
 */
-MagickExport const Quantum *GetVirtualPixelsNexus(const Cache cache,
+MagickPrivate const Quantum *GetVirtualPixelsNexus(const Cache cache,
   NexusInfo *nexus_info)
 {
   CacheInfo
@@ -4357,7 +4357,7 @@ MagickExport MagickBooleanType PersistPixelCache(Image *image,
 %    o exception: return any errors or warnings in this structure.
 %
 */
-MagickExport Quantum *QueueAuthenticNexus(Image *image,const ssize_t x,
+MagickPrivate Quantum *QueueAuthenticNexus(Image *image,const ssize_t x,
   const ssize_t y,const size_t columns,const size_t rows,NexusInfo *nexus_info,
   ExceptionInfo *exception)
 {
@@ -4843,7 +4843,7 @@ static MagickBooleanType ReadPixelCachePixels(CacheInfo *cache_info,
 %    o cache_info: the pixel cache.
 %
 */
-MagickExport Cache ReferencePixelCache(Cache cache)
+MagickPrivate Cache ReferencePixelCache(Cache cache)
 {
   CacheInfo
     *cache_info;
@@ -4881,7 +4881,7 @@ MagickExport Cache ReferencePixelCache(Cache cache)
 %    o cache_methods: Specifies a pointer to a CacheMethods structure.
 %
 */
-MagickExport void SetPixelCacheMethods(Cache cache,CacheMethods *cache_methods)
+MagickPrivate void SetPixelCacheMethods(Cache cache,CacheMethods *cache_methods)
 {
   CacheInfo
     *cache_info;
@@ -5168,7 +5168,7 @@ MagickExport VirtualPixelMethod SetPixelCacheVirtualMethod(const Image *image,
 %    o exception: return any errors or warnings in this structure.
 %
 */
-MagickExport MagickBooleanType SyncAuthenticPixelCacheNexus(Image *image,
+MagickPrivate MagickBooleanType SyncAuthenticPixelCacheNexus(Image *image,
   NexusInfo *nexus_info,ExceptionInfo *exception)
 {
   CacheInfo

diff --git a/MagickCore/coder-private.h b/MagickCore/coder-private.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/MagickCore/configure-private.h b/MagickCore/configure-private.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/MagickCore/constitute-private.h b/MagickCore/constitute-private.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/MagickCore/locale-private.h b/MagickCore/locale-private.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/MagickCore/log-private.h b/MagickCore/log-private.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/MagickCore/magic-private.h b/MagickCore/magic-private.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/MagickCore/magick-private.h b/MagickCore/magick-private.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/MagickCore/methods-private.h b/MagickCore/methods-private.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/MagickCore/module-private.h b/MagickCore/module-private.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/MagickCore/policy-private.h b/MagickCore/policy-private.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/MagickCore/random_-private.h b/MagickCore/random_-private.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/MagickCore/registry-private.h b/MagickCore/registry-private.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/MagickCore/type-private.h b/MagickCore/type-private.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 72648d67fb30be05de0a8e3501e0b5163733849d..9df5b6b15782c57f4cf1ebb515e4c379626d0660 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-08-31"
+#define MagickReleaseDate  "2011-09-02"
 #define MagickChangeDate   "20110801"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)

diff --git a/Makefile.in b/Makefile.in
index 3d8ea656ae29c1a234666b82396b713410689ec8..49f7e9318d8829901ca6f01fb4bf56d0257f17c7 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -4171,29 +4171,48 @@ MAGICKCORE_INCLUDE_HDRS = \
 
 MAGICKCORE_NOINST_HDRS = \
        MagickCore/animate-private.h \
+       MagickCore/annotate-private.h \
        MagickCore/blob-private.h \
+       MagickCore/cache-private.h \
        MagickCore/cache-private.h \
-       MagickCore/color-private.h \
+       MagickCore/coder-private.h \
        MagickCore/colormap-private.h \
+       MagickCore/color-private.h \
+       MagickCore/color-private.h \
        MagickCore/colorspace-private.h \
        MagickCore/composite-private.h \
+       MagickCore/configure-private.h \
+       MagickCore/constitute-private.h \
+       MagickCore/delegate-private.h \
        MagickCore/delegate-private.h \
        MagickCore/display-private.h \
        MagickCore/draw-private.h \
        MagickCore/exception-private.h \
        MagickCore/fx-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/methods-private.h \
+       MagickCore/mime-private.h \
        MagickCore/mime-private.h \
+       MagickCore/module-private.h \
        MagickCore/monitor-private.h \
        MagickCore/morphology-private.h \
        MagickCore/nt-base.h \
        MagickCore/nt-feature.h \
+       MagickCore/policy-private.h \
        MagickCore/quantum-private.h \
+       MagickCore/random_-private.h \
        MagickCore/random-private.h \
+       MagickCore/registry-private.h \
        MagickCore/resample-private.h \
        MagickCore/resize-private.h \
+       MagickCore/resource-private.h \
        MagickCore/resource-private.h \
+       MagickCore/semaphore-private.h \
        MagickCore/semaphore-private.h \
        MagickCore/signature-private.h \
        MagickCore/static.h \
@@ -4203,8 +4222,9 @@ MAGICKCORE_NOINST_HDRS = \
        MagickCore/thread_.h \
        MagickCore/thread-private.h \
        MagickCore/token-private.h \
-       MagickCore/xwindow-private.h \
-       MagickCore/vms.h
+       MagickCore/type-private.h \
+       MagickCore/vms.h \
+       MagickCore/xwindow-private.h
 
 MAGICKCORE_EXTRA_DIST = \
        MagickCore/MagickCore-config.in \

diff --git a/config/configure.xml b/config/configure.xml
index 11c7c7d338a7d069e1d353298acb06bb22cd4ca2..bb3cc421832b8c0da3a43ac8d355e16a98e75928 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -11,7 +11,7 @@
   <configure name="LIB_VERSION" value="0x700"/>
   <configure name="LIB_VERSION_NUMBER" value="7,0,0,0"/>
   <configure name="SVN_REVISION" value="5077" />
-  <configure name="RELEASE_DATE" value="2011-08-31"/>
+  <configure name="RELEASE_DATE" value="2011-09-02"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>