(no commit message)

diff --git a/MagickCore/Makefile.am b/MagickCore/Makefile.am
index 1f1fd89b3643f3340fdf32e64115aefa7c1736b7..8a4610e4b997b17a8511ac3a4dd83a4cb57d9bfe 100644 (file)
--- a/MagickCore/Makefile.am
+++ b/MagickCore/Makefile.am
@@ -323,6 +323,7 @@ MAGICKCORE_INCLUDE_HDRS = \
        MagickCore/locale_.h \
        MagickCore/log.h \
        MagickCore/magic.h \
+       MagickCore/magic-private.h \
        MagickCore/magick.h \
        MagickCore/magick-config.h \
        MagickCore/magick-type.h \

diff --git a/MagickCore/annotate-private.h b/MagickCore/annotate-private.h
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..f1d52ecb92e28030f2712e63736d927174bd98ef 100644 (file)
--- a/MagickCore/annotate-private.h
+++ b/MagickCore/annotate-private.h
@@ -0,0 +1,35 @@
+/*
+  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 image annotation methods.
+*/
+#ifndef _MAGICKCORE_ANNOTATE_PRIVATE_H
+#define _MAGICKCORE_ANNOTATE_PRIVATE_H
+
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
+extern MagickPrivate MagickBooleanType
+  AnnotateComponentGenesis(void);
+
+extern MagickPrivate void
+  AnnotateComponentTerminus(void);
+
+#if defined(__cplusplus) || defined(c_plusplus)
+}
+#endif
+
+#endif

diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c
index 1dcde88e46c8ad407d6c44ec3b70e0521653461f..319000de7fbeec553acd7fc3745fcf237bc3d053 100644 (file)
--- a/MagickCore/annotate.c
+++ b/MagickCore/annotate.c
@@ -44,6 +44,7 @@
 */
 #include "MagickCore/studio.h"
 #include "MagickCore/annotate.h"
+#include "MagickCore/annotate-private.h"
 #include "MagickCore/attribute.h"
 #include "MagickCore/cache-view.h"
 #include "MagickCore/client.h"
@@ -139,7 +140,7 @@ static MagickBooleanType
 %      MagickBooleanType AnnotateComponentGenesis(void)
 %
 */
-MagickExport MagickBooleanType AnnotateComponentGenesis(void)
+MagickPrivate MagickBooleanType AnnotateComponentGenesis(void)
 {
   AcquireSemaphoreInfo(&annotate_semaphore);
   return(MagickTrue);
@@ -163,7 +164,7 @@ MagickExport MagickBooleanType AnnotateComponentGenesis(void)
 %      AnnotateComponentTerminus(void)
 %
 */
-MagickExport void AnnotateComponentTerminus(void)
+MagickPrivate void AnnotateComponentTerminus(void)
 {
   if (annotate_semaphore == (SemaphoreInfo *) NULL)
     AcquireSemaphoreInfo(&annotate_semaphore);

diff --git a/MagickCore/annotate.h b/MagickCore/annotate.h
index 06957deef8f9f9a38ef1312d05b0c02ac93e4e8d..c75963abb74512df0d4b0631216cf3aada9fdc0e 100644 (file)
--- a/MagickCore/annotate.h
+++ b/MagickCore/annotate.h
@@ -25,7 +25,6 @@ extern "C" {
 #include "MagickCore/draw.h"
 
 extern MagickExport MagickBooleanType
-  AnnotateComponentGenesis(void),
   AnnotateImage(Image *,const DrawInfo *,ExceptionInfo *),
   GetMultilineTypeMetrics(Image *,const DrawInfo *,TypeMetric *,
     ExceptionInfo *),
@@ -35,9 +34,6 @@ extern MagickExport ssize_t
   FormatMagickCaption(Image *,DrawInfo *,const MagickBooleanType,TypeMetric *,
     char **,ExceptionInfo *);
 
-extern MagickExport void
-  AnnotateComponentTerminus(void);
-
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif

diff --git a/MagickCore/cache-private.h b/MagickCore/cache-private.h
index be7b24e975b126cbdd8ab6e4211c870a8b8ae8e5..5612e344dd2abcdd5fd88bef25c0c0f2e6bbe08d 100644 (file)
--- a/MagickCore/cache-private.h
+++ b/MagickCore/cache-private.h
@@ -220,6 +220,7 @@ extern MagickPrivate const void
   *GetVirtualMetacontentFromNexus(const Cache,NexusInfo *);
 
 extern MagickPrivate MagickBooleanType
+  CacheComponentGenesis(void),
   SyncAuthenticPixelCacheNexus(Image *,NexusInfo *,ExceptionInfo *);
 
 extern MagickPrivate MagickSizeType
@@ -240,14 +241,13 @@ extern MagickPrivate size_t
   GetPixelCacheChannels(const Cache);
 
 extern MagickPrivate void
+  CacheComponentTerminus(void),
   ClonePixelCacheMethods(Cache,const Cache),
+  *GetPixelCacheNexusMetacontent(const Cache,NexusInfo *),
   GetPixelCacheTileSize(const Image *,size_t *,size_t *),
   GetPixelCacheMethods(CacheMethods *),
   SetPixelCacheMethods(Cache,CacheMethods *);
 
-extern MagickPrivate void
-  *GetPixelCacheNexusMetacontent(const Cache,NexusInfo *);
-
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif

diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index 6c0d930b806873b74037833c1443c04957589e54..74318ec0d968f45bd4c23f5acfc506871cd9344d 100644 (file)
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -335,7 +335,7 @@ MagickExport const void *AcquirePixelCachePixels(const Image *image,
 %      MagickBooleanType CacheComponentGenesis(void)
 %
 */
-MagickExport MagickBooleanType CacheComponentGenesis(void)
+MagickPrivate MagickBooleanType CacheComponentGenesis(void)
 {
   AcquireSemaphoreInfo(&cache_semaphore);
   return(MagickTrue);
@@ -359,7 +359,7 @@ MagickExport MagickBooleanType CacheComponentGenesis(void)
 %      CacheComponentTerminus(void)
 %
 */
-MagickExport void CacheComponentTerminus(void)
+MagickPrivate void CacheComponentTerminus(void)
 {
   if (cache_semaphore == (SemaphoreInfo *) NULL)
     AcquireSemaphoreInfo(&cache_semaphore);

diff --git a/MagickCore/cache.h b/MagickCore/cache.h
index 22b9fce352310813e177fd878e30d76a3d35fafb..0d262e50fd1e155fe22412c6640d1a6224da6b5a 100644 (file)
--- a/MagickCore/cache.h
+++ b/MagickCore/cache.h
@@ -34,7 +34,6 @@ extern MagickExport const void
   *GetVirtualMetacontent(const Image *);
 
 extern MagickExport MagickBooleanType
-  CacheComponentGenesis(void),
   GetOneVirtualMagickPixel(const Image *,const ssize_t,const ssize_t,
     PixelInfo *,ExceptionInfo *),
   GetOneVirtualPixel(const Image *,const ssize_t,const ssize_t,PixelPacket *,
@@ -63,7 +62,6 @@ extern MagickExport VirtualPixelMethod
   SetPixelCacheVirtualMethod(const Image *,const VirtualPixelMethod);
 
 extern MagickExport void
-  CacheComponentTerminus(void),
   *GetAuthenticMetacontent(const Image *),
   *GetPixelCachePixels(Image *,MagickSizeType *,ExceptionInfo *);
 

diff --git a/MagickCore/coder-private.h b/MagickCore/coder-private.h
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..6add01e5a74018089f14d6211378df535c785eac 100644 (file)
--- a/MagickCore/coder-private.h
+++ b/MagickCore/coder-private.h
@@ -0,0 +1,35 @@
+/*
+  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 image coder methods.
+*/
+#ifndef _MAGICKCORE_CODER_PRIVATE_H
+#define _MAGICKCORE_CODER_PRIVATE_H
+
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
+extern MagickPrivate MagickBooleanType
+  CoderComponentGenesis(void);
+
+extern MagickPrivate void
+  CoderComponentTerminus(void);
+
+#if defined(__cplusplus) || defined(c_plusplus)
+}
+#endif
+
+#endif

diff --git a/MagickCore/coder.c b/MagickCore/coder.c
index ae27c58450f24ffe81a3cb4f57c7f4dac5d303ca..8fb497d3bd5e980df0de0a38c879d12aaa56ac7f 100644 (file)
--- a/MagickCore/coder.c
+++ b/MagickCore/coder.c
@@ -43,6 +43,7 @@
 #include "MagickCore/blob.h"
 #include "MagickCore/client.h"
 #include "MagickCore/coder.h"
+#include "MagickCore/coder-private.h"
 #include "MagickCore/configure.h"
 #include "MagickCore/draw.h"
 #include "MagickCore/exception.h"
@@ -252,7 +253,7 @@ static MagickBooleanType
 %      MagickBooleanType CoderComponentGenesis(void)
 %
 */
-MagickExport MagickBooleanType CoderComponentGenesis(void)
+MagickPrivate MagickBooleanType CoderComponentGenesis(void)
 {
   AcquireSemaphoreInfo(&coder_semaphore);
   return(MagickTrue);
@@ -276,7 +277,7 @@ MagickExport MagickBooleanType CoderComponentGenesis(void)
 %      CoderComponentTerminus(void)
 %
 */
-MagickExport void CoderComponentTerminus(void)
+MagickPrivate void CoderComponentTerminus(void)
 {
   if (coder_semaphore == (SemaphoreInfo *) NULL)
     AcquireSemaphoreInfo(&coder_semaphore);

diff --git a/MagickCore/coder.h b/MagickCore/coder.h
index 2d993bc117a086842af841eb4ae59af47d63fb05..9ac2eae457f2f981b380c08ba0fbcbf3da603f7a 100644 (file)
--- a/MagickCore/coder.h
+++ b/MagickCore/coder.h
@@ -45,12 +45,8 @@ extern MagickExport const CoderInfo
   **GetCoderInfoList(const char *,size_t *,ExceptionInfo *);
 
 extern MagickExport MagickBooleanType
-  CoderComponentGenesis(void),
   ListCoderInfo(FILE *,ExceptionInfo *);
 
-MagickExport void
-  CoderComponentTerminus(void);
-
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif

diff --git a/MagickCore/color-private.h b/MagickCore/color-private.h
index 63ba2965ea445d4960fd46b62bda7941ebe7fd9b..9d04e341a02cd36e2b7fd93363201e27ffb0b543 100644 (file)
--- a/MagickCore/color-private.h
+++ b/MagickCore/color-private.h
@@ -13,7 +13,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 
-  MagickCore image color methods.
+  MagickCore private image color methods.
 */
 #ifndef _MAGICKCORE_COLOR_PRIVATE_H
 #define _MAGICKCORE_COLOR_PRIVATE_H
@@ -22,6 +22,12 @@
 extern "C" {
 #endif
 
+extern MagickPrivate MagickBooleanType
+  ColorComponentGenesis(void);
+
+extern MagickPrivate void
+  ColorComponentTerminus(void);
+
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif

diff --git a/MagickCore/color.c b/MagickCore/color.c
index 81a2ead58ed09089954f51d832e37a7343d060fa..c391910c7651024d40d8d6f3bbbee6b4872a3b13 100644 (file)
--- a/MagickCore/color.c
+++ b/MagickCore/color.c
@@ -816,7 +816,7 @@ static MagickBooleanType
 %      MagickBooleanType ColorComponentGenesis(void)
 %
 */
-MagickExport MagickBooleanType ColorComponentGenesis(void)
+MagickPrivate MagickBooleanType ColorComponentGenesis(void)
 {
   AcquireSemaphoreInfo(&color_semaphore);
   return(MagickTrue);
@@ -858,7 +858,7 @@ static void *DestroyColorElement(void *color_info)
   return((void *) NULL);
 }
 
-MagickExport void ColorComponentTerminus(void)
+MagickPrivate void ColorComponentTerminus(void)
 {
   if (color_semaphore == (SemaphoreInfo *) NULL)
     AcquireSemaphoreInfo(&color_semaphore);

diff --git a/MagickCore/color.h b/MagickCore/color.h
index d56fa14321e080fc6a2d183c1ed2cd67cf53cce6..d7542f3b38480b3b7a30236d453ed9252b95f1ea 100644 (file)
--- a/MagickCore/color.h
+++ b/MagickCore/color.h
@@ -71,7 +71,6 @@ extern MagickExport const ColorInfo
   **GetColorInfoList(const char *,size_t *,ExceptionInfo *);
 
 extern MagickExport MagickBooleanType
-  ColorComponentGenesis(void),
   IsEquivalentAlpha(const Image *,const PixelPacket *,const PixelPacket *),
   IsEquivalentImage(const Image *,const Image *,ssize_t *x,ssize_t *y,
     ExceptionInfo *),
@@ -82,13 +81,12 @@ extern MagickExport MagickBooleanType
   QueryColorname(const Image *,const PixelPacket *,const ComplianceType,char *,
     ExceptionInfo *),
   QueryMagickColor(const char *,PixelInfo *,ExceptionInfo *),
-  QueryMagickColorCompliance(const char *,const ComplianceType,
-    PixelInfo *,ExceptionInfo *),
-  QueryMagickColorname(const Image *,const PixelInfo *,
-    const ComplianceType,char *,ExceptionInfo *);
+  QueryMagickColorCompliance(const char *,const ComplianceType,PixelInfo *,
+    ExceptionInfo *),
+  QueryMagickColorname(const Image *,const PixelInfo *,const ComplianceType,
+    char *,ExceptionInfo *);
 
 extern MagickExport void
-  ColorComponentTerminus(void),
   ConcatenateColorComponent(const PixelInfo *,const PixelChannel,
     const ComplianceType,char *),
   GetColorTuple(const PixelInfo *,const MagickBooleanType,char *);

diff --git a/MagickCore/configure-private.h b/MagickCore/configure-private.h
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..60ab33a1d6fe0c7e55761d6952dcaed351f8dc86 100644 (file)
--- a/MagickCore/configure-private.h
+++ b/MagickCore/configure-private.h
@@ -0,0 +1,35 @@
+/*
+  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 configure methods.
+*/
+#ifndef _MAGICKCORE_CONFIGURE_H
+#define _MAGICKCORE_CONFIGURE_H
+
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
+extern MagickPrivate MagickBooleanType
+  ConfigureComponentGenesis(void);
+
+extern MagickPrivate void
+  ConfigureComponentTerminus(void);
+
+#if defined(__cplusplus) || defined(c_plusplus)
+}
+#endif
+
+#endif

diff --git a/MagickCore/configure.c b/MagickCore/configure.c
index b9b2bee694655e1329afc91550ec9d3c02a6f09b..83051b3d5cadab66f2916f4c3393270ba2cadb2b 100644 (file)
--- a/MagickCore/configure.c
+++ b/MagickCore/configure.c
@@ -43,6 +43,7 @@
 #include "MagickCore/blob.h"
 #include "MagickCore/client.h"
 #include "MagickCore/configure.h"
+#include "MagickCore/configure-private.h"
 #include "MagickCore/exception.h"
 #include "MagickCore/exception-private.h"
 #include "MagickCore/hashmap.h"
@@ -112,7 +113,7 @@ static MagickBooleanType
 %      MagickBooleanType ConfigureComponentGenesis(void)
 %
 */
-MagickExport MagickBooleanType ConfigureComponentGenesis(void)
+MagickPrivate MagickBooleanType ConfigureComponentGenesis(void)
 {
   AcquireSemaphoreInfo(&configure_semaphore);
   return(MagickTrue);
@@ -156,7 +157,7 @@ static void *DestroyConfigureElement(void *configure_info)
   return((void *) NULL);
 }
 
-MagickExport void ConfigureComponentTerminus(void)
+MagickPrivate void ConfigureComponentTerminus(void)
 {
   if (configure_semaphore == (SemaphoreInfo *) NULL)
     AcquireSemaphoreInfo(&configure_semaphore);

diff --git a/MagickCore/configure.h b/MagickCore/configure.h
index 79caa284388216ee77b72c69023d8f7c4f029871..e44d3ca4141bd835d58663d251a660bd436860c5 100644 (file)
--- a/MagickCore/configure.h
+++ b/MagickCore/configure.h
@@ -56,11 +56,8 @@ extern MagickExport LinkedListInfo
   *GetConfigureOptions(const char *,ExceptionInfo *);
 
 extern MagickExport MagickBooleanType
-  ConfigureComponentGenesis(void),
   ListConfigureInfo(FILE *,ExceptionInfo *);
 
-extern MagickExport void
-  ConfigureComponentTerminus(void);
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }

diff --git a/MagickCore/constitute-private.h b/MagickCore/constitute-private.h
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..ac10ba5e04213ce390db1c09c144e48a454d68e6 100644 (file)
--- a/MagickCore/constitute-private.h
+++ b/MagickCore/constitute-private.h
@@ -0,0 +1,35 @@
+/*
+  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 image constitute methods.
+*/
+#ifndef _MAGICKCORE_CONSTITUTE_PRIVATE_H
+#define _MAGICKCORE_CONSTITUTE_PRIVATE_H
+
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
+extern MagickPrivate MagickBooleanType
+  ConstituteComponentGenesis(void);
+
+extern MagickPrivate void
+  ConstituteComponentTerminus(void);
+
+#if defined(__cplusplus) || defined(c_plusplus)
+}
+#endif
+
+#endif

diff --git a/MagickCore/constitute.c b/MagickCore/constitute.c
index d22fbb7eaa33300ea3b9c7fcd61550bfbbd59e4c..fbe65a345e4c208a7435b3e9b2ff91e37826b311 100644 (file)
--- a/MagickCore/constitute.c
+++ b/MagickCore/constitute.c
@@ -47,6 +47,7 @@
 #include "MagickCore/cache.h"
 #include "MagickCore/client.h"
 #include "MagickCore/constitute.h"
+#include "MagickCore/constitute-private.h"
 #include "MagickCore/delegate.h"
 #include "MagickCore/geometry.h"
 #include "MagickCore/identify.h"
@@ -95,7 +96,7 @@ static SemaphoreInfo
 %      MagickBooleanType ConstituteComponentGenesis(void)
 %
 */
-MagickExport MagickBooleanType ConstituteComponentGenesis(void)
+MagickPrivate MagickBooleanType ConstituteComponentGenesis(void)
 {
   AcquireSemaphoreInfo(&constitute_semaphore);
   return(MagickTrue);
@@ -119,7 +120,7 @@ MagickExport MagickBooleanType ConstituteComponentGenesis(void)
 %      ConstituteComponentTerminus(void)
 %
 */
-MagickExport void ConstituteComponentTerminus(void)
+MagickPrivate void ConstituteComponentTerminus(void)
 {
   if (constitute_semaphore == (SemaphoreInfo *) NULL)
     AcquireSemaphoreInfo(&constitute_semaphore);

diff --git a/MagickCore/constitute.h b/MagickCore/constitute.h
index fa6014f66beffb8af6665b5484c154261a2b5f80..8777814a99aa050cdb9120069c172f4efe770677 100644 (file)
--- a/MagickCore/constitute.h
+++ b/MagickCore/constitute.h
@@ -44,13 +44,9 @@ extern MagickExport Image
   *ReadInlineImage(const ImageInfo *,const char *,ExceptionInfo *);
 
 extern MagickExport MagickBooleanType
-  ConstituteComponentGenesis(void),
   WriteImage(const ImageInfo *,Image *,ExceptionInfo *),
   WriteImages(const ImageInfo *,Image *,const char *,ExceptionInfo *);
 
-extern MagickExport void
-  ConstituteComponentTerminus(void);
-
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif

diff --git a/MagickCore/delegate-private.h b/MagickCore/delegate-private.h
index 2d304b784b6d20c9a5ac0f13e74c91644024ca6e..c8b0a0bb3eedb0b9d89e92bb4264f6a2018035db 100644 (file)
--- a/MagickCore/delegate-private.h
+++ b/MagickCore/delegate-private.h
@@ -59,6 +59,12 @@ typedef struct _GhostInfo
     (MagickDLLCall *delete_instance)(gs_main_instance *);
 } GhostInfo;
 
+extern MagickPrivate MagickBooleanType
+  DelegateComponentGenesis(void);
+
+extern MagickPrivate void
+  DelegateComponentTerminus(void);
+
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif

diff --git a/MagickCore/delegate.c b/MagickCore/delegate.c
index b9890d490446a5378f936b707080553c9b81789b..fea264215c663f9865204ab4bf337f714cb48edf 100644 (file)
--- a/MagickCore/delegate.c
+++ b/MagickCore/delegate.c
@@ -52,6 +52,7 @@
 #include "MagickCore/configure.h"
 #include "MagickCore/constitute.h"
 #include "MagickCore/delegate.h"
+#include "MagickCore/delegate-private.h"
 #include "MagickCore/exception.h"
 #include "MagickCore/exception-private.h"
 #include "MagickCore/hashmap.h"
@@ -159,7 +160,7 @@ static MagickBooleanType
 %      MagickBooleanType DelegateComponentGenesis(void)
 %
 */
-MagickExport MagickBooleanType DelegateComponentGenesis(void)
+MagickPrivate MagickBooleanType DelegateComponentGenesis(void)
 {
   AcquireSemaphoreInfo(&delegate_semaphore);
   return(MagickTrue);
@@ -202,8 +203,7 @@ static void *DestroyDelegate(void *delegate_info)
   return((void *) NULL);
 }
 
-
-MagickExport void DelegateComponentTerminus(void)
+MagickPrivate void DelegateComponentTerminus(void)
 {
   if (delegate_semaphore == (SemaphoreInfo *) NULL)
     AcquireSemaphoreInfo(&delegate_semaphore);

diff --git a/MagickCore/delegate.h b/MagickCore/delegate.h
index daf7f8ab52e21f5306ad962e96627e1e3038b3b7..7a66a85146faf9ddd45e101a9f939433a853f593 100644 (file)
--- a/MagickCore/delegate.h
+++ b/MagickCore/delegate.h
@@ -58,14 +58,10 @@ extern MagickExport ssize_t
   GetDelegateMode(const DelegateInfo *);
 
 extern MagickExport MagickBooleanType
-  DelegateComponentGenesis(void),
   GetDelegateThreadSupport(const DelegateInfo *),
   InvokeDelegate(ImageInfo *,Image *,const char *,const char *,ExceptionInfo *),
   ListDelegateInfo(FILE *,ExceptionInfo *);
 
-extern MagickExport void
-  DelegateComponentTerminus(void);
-
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif

diff --git a/MagickCore/locale-private.h b/MagickCore/locale-private.h
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..833739fa1203e0a0f83ee6f0d86689bd893dbbe3 100644 (file)
--- a/MagickCore/locale-private.h
+++ b/MagickCore/locale-private.h
@@ -0,0 +1,35 @@
+/*
+  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 locale methods.
+*/
+#ifndef _MAGICKCORE_LOCALE_PRIVATE_H
+#define _MAGICKCORE_LOCALE_PRIVATE_H
+
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
+extern MagickPrivate MagickBooleanType
+  LocaleComponentGenesis(void);
+
+extern MagickPrivate void
+  LocaleComponentTerminus(void);
+
+#if defined(__cplusplus) || defined(c_plusplus)
+}
+#endif
+
+#endif

diff --git a/MagickCore/locale.c b/MagickCore/locale.c
index 3e87b1ef104c31c6355d4ec27a8f3909403e571c..e26ee1d96bf1c8468532c97e589b849df91fdfb7 100644 (file)
--- a/MagickCore/locale.c
+++ b/MagickCore/locale.c
@@ -47,6 +47,7 @@
 #include "MagickCore/exception-private.h"
 #include "MagickCore/hashmap.h"
 #include "MagickCore/locale_.h"
+#include "MagickCore/locale-private.h"
 #include "MagickCore/log.h"
 #include "MagickCore/memory_.h"
 #include "MagickCore/semaphore.h"
@@ -1375,7 +1376,7 @@ static MagickBooleanType LoadLocaleLists(const char *filename,
 %      MagickBooleanType LocaleComponentGenesis(void)
 %
 */
-MagickExport MagickBooleanType LocaleComponentGenesis(void)
+MagickPrivate MagickBooleanType LocaleComponentGenesis(void)
 {
   AcquireSemaphoreInfo(&locale_semaphore);
   return(MagickTrue);
@@ -1399,7 +1400,7 @@ MagickExport MagickBooleanType LocaleComponentGenesis(void)
 %      LocaleComponentTerminus(void)
 %
 */
-MagickExport void LocaleComponentTerminus(void)
+MagickPrivate void LocaleComponentTerminus(void)
 {
   if (locale_semaphore == (SemaphoreInfo *) NULL)
     AcquireSemaphoreInfo(&locale_semaphore);

diff --git a/MagickCore/locale_.h b/MagickCore/locale_.h
index 98ee0fc3c66b9d2db21b494e24be916c503456f4..0b71fc52d7a36e2a9869f896537d05c70d7e58e3 100644 (file)
--- a/MagickCore/locale_.h
+++ b/MagickCore/locale_.h
@@ -56,8 +56,7 @@ extern MagickExport LinkedListInfo
   *GetLocaleOptions(const char *,ExceptionInfo *);
 
 extern MagickExport MagickBooleanType
-  ListLocaleInfo(FILE *,ExceptionInfo *),
-  LocaleComponentGenesis(void);
+  ListLocaleInfo(FILE *,ExceptionInfo *);
 
 extern MagickExport ssize_t
   FormatLocaleFile(FILE *,const char *restrict,...)
@@ -69,9 +68,6 @@ extern MagickExport ssize_t
   FormatLocaleStringList(char *restrict,const size_t,const char *restrict,
     va_list) magick_attribute((format (printf,3,0)));
 
-extern MagickExport void
-  LocaleComponentTerminus(void);
-
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif

diff --git a/MagickCore/log-private.h b/MagickCore/log-private.h
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..d150b457e466cb5b442f8002aff48a1440fdb552 100644 (file)
--- a/MagickCore/log-private.h
+++ b/MagickCore/log-private.h
@@ -0,0 +1,38 @@
+/*
+  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 log methods.
+*/
+#ifndef _MAGICKCORE_LOG_PRIVATE_H
+#define _MAGICKCORE_LOG_PRIVATE_H
+
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
+#include <stdarg.h>
+#include "MagickCore/exception.h"
+
+extern MagickPrivate MagickBooleanType
+  LogComponentGenesis(void);
+
+extern MagickPrivate void
+  LogComponentTerminus(void);
+
+#if defined(__cplusplus) || defined(c_plusplus)
+}
+#endif
+
+#endif

diff --git a/MagickCore/log.c b/MagickCore/log.c
index 494a70cb917f9e97881c9471a1ebd3be3f7c7642..7448e24d535ace8bb95e4440b7656ca939b87bb0 100644 (file)
--- a/MagickCore/log.c
+++ b/MagickCore/log.c
@@ -47,6 +47,7 @@
 #include "MagickCore/exception-private.h"
 #include "MagickCore/hashmap.h"
 #include "MagickCore/log.h"
+#include "MagickCore/log-private.h"
 #include "MagickCore/memory_.h"
 #include "MagickCore/option.h"
 #include "MagickCore/semaphore.h"
@@ -686,7 +687,7 @@ MagickExport MagickBooleanType ListLogInfo(FILE *file,ExceptionInfo *exception)
 %      MagickBooleanType LogComponentGenesis(void)
 %
 */
-MagickExport MagickBooleanType LogComponentGenesis(void)
+MagickPrivate MagickBooleanType LogComponentGenesis(void)
 {
   AcquireSemaphoreInfo(&log_semaphore);
   return(MagickTrue);
@@ -737,7 +738,7 @@ static void *DestroyLogElement(void *log_info)
   return((void *) NULL);
 }
 
-MagickExport void LogComponentTerminus(void)
+MagickPrivate void LogComponentTerminus(void)
 {
   if (log_semaphore == (SemaphoreInfo *) NULL)
     AcquireSemaphoreInfo(&log_semaphore);

diff --git a/MagickCore/log.h b/MagickCore/log.h
index 0323476fc2b7499fd7024077e59ac9b8acd27308..27bf8afb9dd533b95e81a019f850925d2d2c58b4 100644 (file)
--- a/MagickCore/log.h
+++ b/MagickCore/log.h
@@ -75,7 +75,6 @@ extern MagickExport LogEventType
 extern MagickExport MagickBooleanType
   IsEventLogging(void),
   ListLogInfo(FILE *,ExceptionInfo *),
-  LogComponentGenesis(void),
   LogMagickEvent(const LogEventType,const char *,const char *,const size_t,
     const char *,...) 
     magick_attribute((format (printf,5,6))),
@@ -84,7 +83,6 @@ extern MagickExport MagickBooleanType
 
 extern MagickExport void
   CloseMagickLog(void),
-  LogComponentTerminus(void),
   SetLogFormat(const char *);
 
 #if defined(__cplusplus) || defined(c_plusplus)

diff --git a/MagickCore/magic-private.h b/MagickCore/magic-private.h
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..36b2fa91c9f3c8fcedbd2f08fcba2aa93d3cb641 100644 (file)
--- a/MagickCore/magic-private.h
+++ b/MagickCore/magic-private.h
@@ -0,0 +1,35 @@
+/*
+  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 magic methods.
+*/
+#ifndef _MAGICKCORE_MAGIC_PRIVATE_H
+#define _MAGICKCORE_MAGIC_PRIVATE_H
+
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
+extern MagickPrivate MagickBooleanType
+  MagicComponentGenesis(void);
+
+extern MagickPrivate void
+  MagicComponentTerminus(void);
+
+#if defined(__cplusplus) || defined(c_plusplus)
+}
+#endif
+
+#endif

diff --git a/MagickCore/magic.c b/MagickCore/magic.c
index 71d7414179f683ff6187e7022837a4b31dd68933..0409fe6be0cfdfc44419522bf5deeb0438a2b8fa 100644 (file)
--- a/MagickCore/magic.c
+++ b/MagickCore/magic.c
@@ -47,6 +47,7 @@
 #include "MagickCore/exception-private.h"
 #include "MagickCore/hashmap.h"
 #include "MagickCore/magic.h"
+#include "MagickCore/magic-private.h"
 #include "MagickCore/memory_.h"
 #include "MagickCore/semaphore.h"
 #include "MagickCore/string_.h"
@@ -1015,7 +1016,7 @@ static MagickBooleanType LoadMagicLists(const char *filename,
 %      MagickBooleanType MagicComponentGenesis(void)
 %
 */
-MagickExport MagickBooleanType MagicComponentGenesis(void)
+MagickPrivate MagickBooleanType MagicComponentGenesis(void)
 {
   AcquireSemaphoreInfo(&magic_semaphore);
   return(MagickTrue);
@@ -1061,7 +1062,7 @@ static void *DestroyMagicElement(void *magic_info)
   return((void *) NULL);
 }
 
-MagickExport void MagicComponentTerminus(void)
+MagickPrivate void MagicComponentTerminus(void)
 {
   if (magic_semaphore == (SemaphoreInfo *) NULL)
     AcquireSemaphoreInfo(&magic_semaphore);

diff --git a/MagickCore/magic.h b/MagickCore/magic.h
index 8f2dd74cf9df01ee4e684f4c66a6d312f325ba3e..ab5d88f59f3e1a51921b50813a49ddab96b31b09 100644 (file)
--- a/MagickCore/magic.h
+++ b/MagickCore/magic.h
@@ -53,16 +53,12 @@ extern MagickExport const char
   *GetMagicName(const MagicInfo *);
 
 extern MagickExport MagickBooleanType
-  ListMagicInfo(FILE *,ExceptionInfo *),
-  MagicComponentGenesis(void);
+  ListMagicInfo(FILE *,ExceptionInfo *);
 
 extern MagickExport const MagicInfo
   *GetMagicInfo(const unsigned char *,const size_t,ExceptionInfo *),
   **GetMagicInfoList(const char *,size_t *,ExceptionInfo *);
 
-extern MagickExport void
-  MagicComponentTerminus(void);
-
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif

diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h
index 2726a74e3fde3f0f6dab78f556afb7ba2dc5a8c6..60334d7b94cf6fee05d1743764d535c4bcdb04ab 100644 (file)
--- a/MagickCore/magick-config.h
+++ b/MagickCore/magick-config.h
@@ -12,7 +12,9 @@
 /* #undef AUTOTRACE_DELEGATE */
 
 /* Define if coders and filters are to be built as modules. */
-/* #undef BUILD_MODULES */
+#ifndef MAGICKCORE_BUILD_MODULES
+#define MAGICKCORE_BUILD_MODULES 1
+#endif
 
 /* Define if you have the bzip2 library */
 #ifndef MAGICKCORE_BZLIB_DELEGATE
@@ -78,7 +80,9 @@
 #endif
 
 /* Define if you have FFTW library */
-/* #undef FFTW_DELEGATE */
+#ifndef MAGICKCORE_FFTW_DELEGATE
+#define MAGICKCORE_FFTW_DELEGATE 1
+#endif
 
 /* Location of filter modules */
 #ifndef MAGICKCORE_FILTER_PATH
@@ -432,15 +436,15 @@
 #endif
 
 /* Define if you have the <lcms2.h> header file. */
-#ifndef MAGICKCORE_HAVE_LCMS2_H
-#define MAGICKCORE_HAVE_LCMS2_H 1
-#endif
+/* #undef HAVE_LCMS2_H */
 
 /* Define if you have the <lcms2/lcms2.h> header file. */
 /* #undef HAVE_LCMS2_LCMS2_H */
 
 /* Define if you have the <lcms.h> header file. */
-/* #undef HAVE_LCMS_H */
+#ifndef MAGICKCORE_HAVE_LCMS_H
+#define MAGICKCORE_HAVE_LCMS_H 1
+#endif
 
 /* Define if you have the <lcms/lcms.h> header file. */
 /* #undef HAVE_LCMS_LCMS_H */
@@ -1163,7 +1167,9 @@
 #endif
 
 /* Define if you have JBIG library */
-/* #undef JBIG_DELEGATE */
+#ifndef MAGICKCORE_JBIG_DELEGATE
+#define MAGICKCORE_JBIG_DELEGATE 1
+#endif
 
 /* Define if you have JPEG version 2 "Jasper" library */
 #ifndef MAGICKCORE_JP2_DELEGATE
@@ -1192,7 +1198,9 @@
 #endif
 
 /* Define if you have LQR library */
-/* #undef LQR_DELEGATE */
+#ifndef MAGICKCORE_LQR_DELEGATE
+#define MAGICKCORE_LQR_DELEGATE 1
+#endif
 
 /* Define if using libltdl to support dynamically loadable modules */
 #ifndef MAGICKCORE_LTDL_DELEGATE
@@ -1204,7 +1212,7 @@
 
 /* Define to the system default library search path. */
 #ifndef MAGICKCORE_LT_DLSEARCH_PATH
-#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/atlas:/usr/lib/llvm:/usr/lib64/llvm:/usr/lib64/mysql:/usr/lib64/qt-3.3/lib:/usr/lib64/tcl8.5/tclx8.4:/usr/lib64/tcl8.5:/usr/lib/wine/:/usr/lib64/wine/:/usr/lib64/xulrunner-2"
+#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/R/lib:/usr/lib64/atlas:/opt/modules/pkg/intel/f77/10.0.025/lib:/usr/lib64/llvm:/usr/local/lib:/usr/lib64/mysql:/usr/lib64/qt-3.3/lib:/usr/lib64/xulrunner-2"
 #endif
 
 /* The archive extension */
@@ -1255,7 +1263,9 @@
 /* #undef NO_MINUS_C_MINUS_O */
 
 /* Define if you have OPENEXR library */
-/* #undef OPENEXR_DELEGATE */
+#ifndef MAGICKCORE_OPENEXR_DELEGATE
+#define MAGICKCORE_OPENEXR_DELEGATE 1
+#endif
 
 /* Define to the address where bug reports for this package should be sent. */
 #ifndef MAGICKCORE_PACKAGE_BUGREPORT
@@ -1310,7 +1320,9 @@
 #endif
 
 /* Define if you have RSVG library */
-/* #undef RSVG_DELEGATE */
+#ifndef MAGICKCORE_RSVG_DELEGATE
+#define MAGICKCORE_RSVG_DELEGATE 1
+#endif
 
 /* Define to the type of arg 1 for `select'. */
 #ifndef MAGICKCORE_SELECT_TYPE_ARG1
@@ -1447,7 +1459,9 @@
 
 
 /* Define if you have WEBP library */
-/* #undef WEBP_DELEGATE */
+#ifndef MAGICKCORE_WEBP_DELEGATE
+#define MAGICKCORE_WEBP_DELEGATE 1
+#endif
 
 /* Define to use the Windows GDI32 library */
 /* #undef WINGDI32_DELEGATE */
@@ -1456,7 +1470,9 @@
 /* #undef WITH_DMALLOC */
 
 /* Define if you have WMF library */
-/* #undef WMF_DELEGATE */
+#ifndef MAGICKCORE_WMF_DELEGATE
+#define MAGICKCORE_WMF_DELEGATE 1
+#endif
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */

diff --git a/MagickCore/magick-private.h b/MagickCore/magick-private.h
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e57dbb0c93b79db2e0ec010171bd625ba365d233 100644 (file)
--- a/MagickCore/magick-private.h
+++ b/MagickCore/magick-private.h
@@ -0,0 +1,35 @@
+/*
+  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 magick methods.
+*/
+#ifndef _MAGICKCORE_MAGICK_PRIVATE_H
+#define _MAGICKCORE_MAGICK_PRIVATE_H
+
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
+extern MagickPrivate MagickBooleanType
+  MagickComponentGenesis(void);
+
+extern MagickPrivate void
+  MagickComponentTerminus(void);
+
+#if defined(__cplusplus) || defined(c_plusplus)
+}
+#endif
+
+#endif

diff --git a/MagickCore/magick.c b/MagickCore/magick.c
index e582b01582af4406d606d3191b52c5234a3ea6ee..376e9c2ed59a63ad372fde06adc338e4538b989e 100644 (file)
--- a/MagickCore/magick.c
+++ b/MagickCore/magick.c
@@ -41,34 +41,39 @@
   Include declarations.
 */
 #include "MagickCore/studio.h"
-#include "MagickCore/annotate.h"
+#include "MagickCore/annotate-private.h"
 #include "MagickCore/blob.h"
 #include "MagickCore/blob-private.h"
 #include "MagickCore/cache.h"
-#include "MagickCore/coder.h"
+#include "MagickCore/cache-private.h"
+#include "MagickCore/coder-private.h"
 #include "MagickCore/client.h"
-#include "MagickCore/coder.h"
-#include "MagickCore/configure.h"
-#include "MagickCore/constitute.h"
-#include "MagickCore/delegate.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/configure-private.h"
+#include "MagickCore/constitute-private.h"
+#include "MagickCore/delegate-private.h"
 #include "MagickCore/draw.h"
 #include "MagickCore/exception.h"
 #include "MagickCore/exception-private.h"
-#include "MagickCore/locale_.h"
-#include "MagickCore/log.h"
-#include "MagickCore/magic.h"
+#include "MagickCore/locale-private.h"
+#include "MagickCore/log-private.h"
+#include "MagickCore/magic-private.h"
 #include "MagickCore/magick.h"
+#include "MagickCore/magick-private.h"
 #include "MagickCore/memory_.h"
-#include "MagickCore/mime.h"
+#include "MagickCore/mime-private.h"
 #include "MagickCore/module.h"
+#include "MagickCore/module-private.h"
 #if defined(MAGICKCORE_WINDOWS_SUPPORT)
 # include "MagickCore/nt-feature.h"
 #endif
-#include "MagickCore/random_.h"
+#include "MagickCore/random-private.h"
 #include "MagickCore/registry.h"
+#include "MagickCore/registry-private.h"
 #include "MagickCore/resource_.h"
 #include "MagickCore/resource-private.h"
 #include "MagickCore/policy.h"
+#include "MagickCore/policy-private.h"
 #include "MagickCore/semaphore.h"
 #include "MagickCore/semaphore-private.h"
 #include "MagickCore/signature-private.h"
@@ -77,6 +82,7 @@
 #include "MagickCore/string-private.h"
 #include "MagickCore/thread_.h"
 #include "MagickCore/thread-private.h"
+#include "MagickCore/type-private.h"
 #include "MagickCore/token.h"
 #include "MagickCore/utility.h"
 #include "MagickCore/xwindow-private.h"
@@ -1060,7 +1066,7 @@ MagickExport MagickBooleanType IsMagickInstantiated(void)
 %      MagickBooleanType MagickComponentGenesis(void)
 %
 */
-MagickExport MagickBooleanType MagickComponentGenesis(void)
+MagickPrivate MagickBooleanType MagickComponentGenesis(void)
 {
   AcquireSemaphoreInfo(&magick_semaphore);
   return(MagickTrue);
@@ -1084,7 +1090,7 @@ MagickExport MagickBooleanType MagickComponentGenesis(void)
 %      void MagickComponentTerminus(void)
 %
 */
-MagickExport void MagickComponentTerminus(void)
+MagickPrivate void MagickComponentTerminus(void)
 {
   if (magick_semaphore == (SemaphoreInfo *) NULL)
     AcquireSemaphoreInfo(&magick_semaphore);

diff --git a/MagickCore/magick.h b/MagickCore/magick.h
index 6eed97775675a12162e1a7666a9629a6535d385d..a1aff1fecb47f449297826108f175c3fc6c0d98a 100644 (file)
--- a/MagickCore/magick.h
+++ b/MagickCore/magick.h
@@ -113,7 +113,6 @@ extern MagickExport MagickBooleanType
   GetMagickRawSupport(const MagickInfo *),
   GetMagickSeekableStream(const MagickInfo *),
   IsMagickInstantiated(void),
-  MagickComponentGenesis(void),
   UnregisterMagickInfo(const char *);
 
 extern const MagickExport MagickInfo
@@ -128,7 +127,6 @@ extern MagickExport MagickStatusType
   GetMagickThreadSupport(const MagickInfo *);
 
 extern MagickExport void
-  MagickComponentTerminus(void),
   MagickCoreGenesis(const char *,const MagickBooleanType),
   MagickCoreTerminus(void);
 

diff --git a/MagickCore/mime-private.h b/MagickCore/mime-private.h
index 31c2e1bdd7e8f304dfd98d7a3732d3e5573b19f8..9f501aeed8539c8adc8f67e5f22a6126375fb5b1 100644 (file)
--- a/MagickCore/mime-private.h
+++ b/MagickCore/mime-private.h
@@ -31,6 +31,12 @@ typedef enum
   LongData
 } DataType;
 
+extern MagickPrivate MagickBooleanType
+  MimeComponentGenesis(void);
+
+extern MagickPrivate void
+  MimeComponentTerminus(void);
+
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif

diff --git a/MagickCore/mime.c b/MagickCore/mime.c
index bc29e307beceebae55101ec87045dbb3215a40ef..c57b40b2d34e678b222c43c164f8fa585f9eb48a 100644 (file)
--- a/MagickCore/mime.c
+++ b/MagickCore/mime.c
@@ -1052,7 +1052,7 @@ MagickExport char *MagickToMime(const char *magick)
 %      MagickBooleanType MimeComponentGenesis(void)
 %
 */
-MagickExport MagickBooleanType MimeComponentGenesis(void)
+MagickPrivate MagickBooleanType MimeComponentGenesis(void)
 {
   AcquireSemaphoreInfo(&mime_semaphore);
   return(MagickTrue);
@@ -1097,7 +1097,7 @@ static void *DestroyMimeElement(void *mime_info)
   return((void *) NULL);
 }
 
-MagickExport void MimeComponentTerminus(void)
+MagickPrivate void MimeComponentTerminus(void)
 {
   if (mime_semaphore == (SemaphoreInfo *) NULL)
     AcquireSemaphoreInfo(&mime_semaphore);

diff --git a/MagickCore/mime.h b/MagickCore/mime.h
index f2247daf4e7bc69284333a3e65df0b261c226a34..1bca2e0450d04f7c3fc0474ad221c9bd6dbc01fd 100644 (file)
--- a/MagickCore/mime.h
+++ b/MagickCore/mime.h
@@ -35,16 +35,12 @@ extern MagickExport const char
 
 extern MagickExport MagickBooleanType
   ListMimeInfo(FILE *,ExceptionInfo *),
-  LoadMimeLists(const char *,ExceptionInfo *),
-  MimeComponentGenesis(void);
+  LoadMimeLists(const char *,ExceptionInfo *);
 
 extern MagickExport const MimeInfo
   *GetMimeInfo(const char *,const unsigned char *,const size_t,ExceptionInfo *),
   **GetMimeInfoList(const char *,size_t *,ExceptionInfo *);
 
-extern MagickExport void
-  MimeComponentTerminus(void);
-
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif

diff --git a/MagickCore/module-private.h b/MagickCore/module-private.h
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..05f4b3d70a6fb8af8a1f30ca6fc1e32a7f1ec9e9 100644 (file)
--- a/MagickCore/module-private.h
+++ b/MagickCore/module-private.h
@@ -0,0 +1,35 @@
+/*
+  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 module methods.
+*/
+#ifndef _MAGICKCORE_MODULE_PRIVATE_H
+#define _MAGICKCORE_MODULE_PRIVATE_H
+
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
+extern MagickPrivate MagickBooleanType
+  ModuleComponentGenesis(void);
+
+extern MagickPrivate void
+  ModuleComponentTerminus(void);
+
+#if defined(__cplusplus) || defined(c_plusplus)
+}
+#endif
+
+#endif

diff --git a/MagickCore/module.c b/MagickCore/module.c
index 5b1b688d5a186ff7d6ce14c605d649f7864407c0..77648f285c4834bb059f2cb870c056cb320b8553 100644 (file)
--- a/MagickCore/module.c
+++ b/MagickCore/module.c
@@ -53,6 +53,7 @@
 #include "MagickCore/magick.h"
 #include "MagickCore/memory_.h"
 #include "MagickCore/module.h"
+#include "MagickCore/module-private.h"
 #include "MagickCore/policy.h"
 #include "MagickCore/semaphore.h"
 #include "MagickCore/splay-tree.h"
@@ -1153,7 +1154,7 @@ MagickExport MagickBooleanType ListModuleInfo(FILE *file,
 %      MagickBooleanType ModuleComponentGenesis(void)
 %
 */
-MagickExport MagickBooleanType ModuleComponentGenesis(void)
+MagickPrivate MagickBooleanType ModuleComponentGenesis(void)
 {
   ExceptionInfo
     *exception;
@@ -1186,7 +1187,7 @@ MagickExport MagickBooleanType ModuleComponentGenesis(void)
 %      ModuleComponentTerminus(void)
 %
 */
-MagickExport void ModuleComponentTerminus(void)
+MagickPrivate void ModuleComponentTerminus(void)
 {
   if (module_semaphore == (SemaphoreInfo *) NULL)
     AcquireSemaphoreInfo(&module_semaphore);

diff --git a/MagickCore/module.h b/MagickCore/module.h
index 0424168f1d38dd11b83c4409ad882fb458d66cb1..bd101c219aed50c0c90f22b2d306585d65d66584 100644 (file)
--- a/MagickCore/module.h
+++ b/MagickCore/module.h
@@ -73,7 +73,6 @@ extern MagickExport MagickBooleanType
   InvokeDynamicImageFilter(const char *,Image **,const int,const char **,
     ExceptionInfo *),
   ListModuleInfo(FILE *,ExceptionInfo *),
-  ModuleComponentGenesis(void),
   OpenModule(const char *,ExceptionInfo *),
   OpenModules(ExceptionInfo *);
 
@@ -82,7 +81,6 @@ extern MagickExport ModuleInfo
 
 extern MagickExport void
   DestroyModuleList(void),
-  ModuleComponentTerminus(void),
   RegisterStaticModules(void),
   UnregisterStaticModules(void);
 

diff --git a/MagickCore/policy-private.h b/MagickCore/policy-private.h
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..3f8055a0a5546d93c380085c96d3cbfa61eb46ee 100644 (file)
--- a/MagickCore/policy-private.h
+++ b/MagickCore/policy-private.h
@@ -0,0 +1,35 @@
+/*
+  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 image color methods.
+*/
+#ifndef _MAGICKCORE_POLICY_PRIVATE_H
+#define _MAGICKCORE_POLICY_PRIVATE_H
+
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
+extern MagickPrivate MagickBooleanType
+  PolicyComponentGenesis(void);
+
+extern MagickPrivate void
+  PolicyComponentTerminus(void);
+
+#if defined(__cplusplus) || defined(c_plusplus)
+}
+#endif
+
+#endif

diff --git a/MagickCore/policy.c b/MagickCore/policy.c
index 8d20a117c1253684913d2d554b20f9b3f64060cc..27e32ed0e5287c9456e2a850b68d2793132c9957 100644 (file)
--- a/MagickCore/policy.c
+++ b/MagickCore/policy.c
@@ -50,6 +50,7 @@
 #include "MagickCore/monitor-private.h"
 #include "MagickCore/option.h"
 #include "MagickCore/policy.h"
+#include "MagickCore/policy-private.h"
 #include "MagickCore/semaphore.h"
 #include "MagickCore/string_.h"
 #include "MagickCore/token.h"
@@ -963,7 +964,7 @@ static MagickBooleanType LoadPolicyLists(const char *filename,
 %      MagickBooleanType PolicyComponentGenesis(void)
 %
 */
-MagickExport MagickBooleanType PolicyComponentGenesis(void)
+MagickPrivate MagickBooleanType PolicyComponentGenesis(void)
 {
   AcquireSemaphoreInfo(&policy_semaphore);
   return(MagickTrue);
@@ -1009,7 +1010,7 @@ static void *DestroyPolicyElement(void *policy_info)
   return((void *) NULL);
 }
 
-MagickExport void PolicyComponentTerminus(void)
+MagickPrivate void PolicyComponentTerminus(void)
 {
   if (policy_semaphore == (SemaphoreInfo *) NULL)
     AcquireSemaphoreInfo(&policy_semaphore);

diff --git a/MagickCore/policy.h b/MagickCore/policy.h
index 16854a4ac51fac513980566177d5e57111759f3f..6e994363e7edd419ab72a3256b2f8e7071c86622 100644 (file)
--- a/MagickCore/policy.h
+++ b/MagickCore/policy.h
@@ -57,11 +57,7 @@ extern MagickExport const PolicyInfo
 
 extern MagickExport MagickBooleanType
   IsRightsAuthorized(const PolicyDomain,const PolicyRights,const char *),
-  ListPolicyInfo(FILE *,ExceptionInfo *),
-  PolicyComponentGenesis(void);
-
-extern MagickExport void
-  PolicyComponentTerminus(void);
+  ListPolicyInfo(FILE *,ExceptionInfo *);
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }

diff --git a/MagickCore/random-private.h b/MagickCore/random-private.h
index fd589c87102f9e1ed5064c6e5fa77387894e2935..112faa8a4e64c5e3da723aa0df7814ca7bf3cca6 100644 (file)
--- a/MagickCore/random-private.h
+++ b/MagickCore/random-private.h
@@ -24,6 +24,12 @@ extern "C" {
 
 #include "MagickCore/thread-private.h"
 
+extern MagickPrivate MagickBooleanType
+  RandomComponentGenesis(void);
+
+extern MagickPrivate void
+  RandomComponentTerminus(void);
+
 static inline RandomInfo **DestroyRandomInfoThreadSet(
   RandomInfo **random_info)
 {

diff --git a/MagickCore/random.c b/MagickCore/random.c
index 818e7ca96444984919302a7f138a3cf8f3ce7b91..f518bb1933bed122e26a99463b7a868fd0e96569 100644 (file)
--- a/MagickCore/random.c
+++ b/MagickCore/random.c
@@ -53,6 +53,7 @@
 #include "MagickCore/memory_.h"
 #include "MagickCore/semaphore.h"
 #include "MagickCore/random_.h"
+#include "MagickCore/random-private.h"
 #include "MagickCore/resource_.h"
 #include "MagickCore/signature-private.h"
 #include "MagickCore/string_.h"
@@ -702,7 +703,7 @@ MagickExport double GetRandomValue(RandomInfo *random_info)
 %      MagickBooleanType RandomComponentGenesis(void)
 %
 */
-MagickExport MagickBooleanType RandomComponentGenesis(void)
+MagickPrivate MagickBooleanType RandomComponentGenesis(void)
 {
   AcquireSemaphoreInfo(&random_semaphore);
   return(MagickTrue);
@@ -726,7 +727,7 @@ MagickExport MagickBooleanType RandomComponentGenesis(void)
 %      RandomComponentTerminus(void)
 %
 */
-MagickExport void RandomComponentTerminus(void)
+MagickPrivate void RandomComponentTerminus(void)
 {
   if (random_semaphore == (SemaphoreInfo *) NULL)
     AcquireSemaphoreInfo(&random_semaphore);

diff --git a/MagickCore/random_-private.h b/MagickCore/random_-private.h
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..084ccb7a51b45baf656728ed3a3202197d1e52b4 100644 (file)
--- a/MagickCore/random_-private.h
+++ b/MagickCore/random_-private.h
@@ -0,0 +1,35 @@
+/*
+  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 random methods.
+*/
+#ifndef _MAGICKCORE_RANDOM_PRIVATE_H
+#define _MAGICKCORE_RANDOM_PRIVATE_H
+
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
+extern MagickPrivate MagickBooleanType
+  RandomComponentGenesis(void);
+
+extern MagickPrivate void
+  RandomComponentTerminus(void);
+
+#if defined(__cplusplus) || defined(c_plusplus)
+}
+#endif
+
+#endif

diff --git a/MagickCore/random_.h b/MagickCore/random_.h
index 06de7d199896839e233bb99810864e0dd12fb657..a9c04fe3b13bfce89aa4c5e9ada6a5680db1ec3f 100644 (file)
--- a/MagickCore/random_.h
+++ b/MagickCore/random_.h
@@ -37,9 +37,6 @@ extern MagickExport double
   GetRandomValue(RandomInfo *),
   GetPseudoRandomValue(RandomInfo *);
 
-extern MagickExport MagickBooleanType
-  RandomComponentGenesis(void);
-
 extern MagickExport RandomInfo
   *AcquireRandomInfo(void),
   *DestroyRandomInfo(RandomInfo *);
@@ -48,7 +45,6 @@ extern MagickExport StringInfo
   *GetRandomKey(RandomInfo *,const size_t);
 
 extern MagickExport void
-  RandomComponentTerminus(void),
   SeedPseudoRandomGenerator(const unsigned long),
   SetRandomKey(RandomInfo *,const size_t,unsigned char *),
   SetRandomTrueRandom(const MagickBooleanType);

diff --git a/MagickCore/registry-private.h b/MagickCore/registry-private.h
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..b914f969547e77338c57f3ed9be630d3538bc226 100644 (file)
--- a/MagickCore/registry-private.h
+++ b/MagickCore/registry-private.h
@@ -0,0 +1,35 @@
+/*
+  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 registry methods.
+*/
+#ifndef _MAGICKCORE_REGISTRY_PRIVATE_H
+#define _MAGICKCORE_REGISTRY_PRIVATE_H
+
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
+extern MagickPrivate MagickBooleanType
+  RegistryComponentGenesis(void);
+
+extern MagickPrivate void
+  RegistryComponentTerminus(void);
+
+#if defined(__cplusplus) || defined(c_plusplus)
+}
+#endif
+
+#endif

diff --git a/MagickCore/registry.c b/MagickCore/registry.c
index e3ba26b16b15d2cd6ecf92ac2333732459596dd0..e2b1562718582d62be9e4d2f9aad9e1144758198 100644 (file)
--- a/MagickCore/registry.c
+++ b/MagickCore/registry.c
@@ -47,6 +47,7 @@
 #include "MagickCore/list.h"
 #include "MagickCore/memory_.h"
 #include "MagickCore/registry.h"
+#include "MagickCore/registry-private.h"
 #include "MagickCore/splay-tree.h"
 #include "MagickCore/string_.h"
 #include "MagickCore/utility.h"
@@ -297,7 +298,7 @@ MagickExport char *GetNextImageRegistry(void)
 %      MagickBooleanType RegistryComponentGenesis(void)
 %
 */
-MagickExport MagickBooleanType RegistryComponentGenesis(void)
+MagickPrivate MagickBooleanType RegistryComponentGenesis(void)
 {
   AcquireSemaphoreInfo(&registry_semaphore);
   return(MagickTrue);
@@ -321,7 +322,7 @@ MagickExport MagickBooleanType RegistryComponentGenesis(void)
 %      void RegistryComponentTerminus(void)
 %
 */
-MagickExport void RegistryComponentTerminus(void)
+MagickPrivate void RegistryComponentTerminus(void)
 {
   if (registry_semaphore == (SemaphoreInfo *) NULL)
     AcquireSemaphoreInfo(&registry_semaphore);

diff --git a/MagickCore/registry.h b/MagickCore/registry.h
index 76869d96831b2f143884ecee44086bbaae3fde20..47b4210a65750c93dd2583de9b7798b86e00b01b 100644 (file)
--- a/MagickCore/registry.h
+++ b/MagickCore/registry.h
@@ -36,13 +36,11 @@ extern MagickExport char
 extern MagickExport MagickBooleanType
   DefineImageRegistry(const RegistryType,const char *,ExceptionInfo *),
   DeleteImageRegistry(const char *),
-  RegistryComponentGenesis(void),
   SetImageRegistry(const RegistryType,const char *,const void *,
     ExceptionInfo *);
 
 extern MagickExport void
   *GetImageRegistry(const RegistryType,const char *,ExceptionInfo *),
-  RegistryComponentTerminus(void),
   *RemoveImageRegistry(const char *),
   ResetImageRegistryIterator(void);
 

diff --git a/MagickCore/resource-private.h b/MagickCore/resource-private.h
index be042c34493859834ca1b75756ea812cb408430d..5335cf89d8604a0a05ba958a669f23eb375b746e 100644 (file)
--- a/MagickCore/resource-private.h
+++ b/MagickCore/resource-private.h
@@ -22,8 +22,12 @@
 extern "C" {
 #endif
 
+extern MagickPrivate MagickBooleanType
+  ResourceComponentGenesis(void);
+
 extern MagickPrivate void
-  AsynchronousResourceComponentTerminus(void);
+  AsynchronousResourceComponentTerminus(void),
+  ResourceComponentTerminus(void);
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }

diff --git a/MagickCore/resource.c b/MagickCore/resource.c
index 220aeda03c381bcd706df8d48f7cafb54862b167..7d640b7291c4cea19bfc50a3b9314d4dd9165da8 100644 (file)
--- a/MagickCore/resource.c
+++ b/MagickCore/resource.c
@@ -904,7 +904,7 @@ static inline MagickSizeType StringToSizeType(const char *string,
   return((MagickSizeType) value);
 }
 
-MagickExport MagickBooleanType ResourceComponentGenesis(void)
+MagickPrivate MagickBooleanType ResourceComponentGenesis(void)
 {
   char
     *limit;
@@ -1037,7 +1037,7 @@ MagickExport MagickBooleanType ResourceComponentGenesis(void)
 %      ResourceComponentTerminus(void)
 %
 */
-MagickExport void ResourceComponentTerminus(void)
+MagickPrivate void ResourceComponentTerminus(void)
 {
   if (resource_semaphore == (SemaphoreInfo *) NULL)
     AcquireSemaphoreInfo(&resource_semaphore);

diff --git a/MagickCore/resource_.h b/MagickCore/resource_.h
index 108089d93a56ca82d70bda28380dbfaa79a6fd70..6d56202ddb9635261dba4b4d73b4d385f36d55f1 100644 (file)
--- a/MagickCore/resource_.h
+++ b/MagickCore/resource_.h
@@ -44,7 +44,6 @@ extern MagickExport MagickBooleanType
   AcquireMagickResource(const ResourceType,const MagickSizeType),
   ListMagickResourceInfo(FILE *,ExceptionInfo *),
   RelinquishUniqueFileResource(const char *),
-  ResourceComponentGenesis(void),
   SetMagickResourceLimit(const ResourceType,const MagickSizeType);
 
 extern MagickExport MagickSizeType
@@ -52,8 +51,7 @@ extern MagickExport MagickSizeType
   GetMagickResourceLimit(const ResourceType);
 
 extern MagickExport void
-  RelinquishMagickResource(const ResourceType,const MagickSizeType),
-  ResourceComponentTerminus(void);
+  RelinquishMagickResource(const ResourceType,const MagickSizeType);
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }

diff --git a/MagickCore/semaphore-private.h b/MagickCore/semaphore-private.h
index 621d80d18bc24c66812d6458c9b88f3a74315452..3e9d725ac42cf949308eb26027608f15f47f3205 100644 (file)
--- a/MagickCore/semaphore-private.h
+++ b/MagickCore/semaphore-private.h
@@ -22,6 +22,12 @@
 extern "C" {
 #endif
 
+extern MagickPrivate MagickBooleanType
+  SemaphoreComponentGenesis(void);
+
+extern MagickPrivate void
+  SemaphoreComponentTerminus(void);
+
 #if defined(MAGICKCORE_THREAD_SUPPORT)
 static pthread_mutex_t
   semaphore_mutex = PTHREAD_MUTEX_INITIALIZER;

diff --git a/MagickCore/semaphore.c b/MagickCore/semaphore.c
index 3c169f147d46b93145c92866eb34d11abd03c73d..6e57f4ff39a2c2976518c9835ffe2238aae0ae35 100644 (file)
--- a/MagickCore/semaphore.c
+++ b/MagickCore/semaphore.c
@@ -335,7 +335,7 @@ MagickExport void RelinquishSemaphoreInfo(SemaphoreInfo *semaphore_info)
 %      MagickBooleanType SemaphoreComponentGenesis(void)
 %
 */
-MagickExport MagickBooleanType SemaphoreComponentGenesis(void)
+MagickPrivate MagickBooleanType SemaphoreComponentGenesis(void)
 {
   LockMagickMutex();
   UnlockMagickMutex();
@@ -360,7 +360,7 @@ MagickExport MagickBooleanType SemaphoreComponentGenesis(void)
 %      SemaphoreComponentTerminus(void)
 %
 */
-MagickExport void SemaphoreComponentTerminus(void)
+MagickPrivate void SemaphoreComponentTerminus(void)
 {
 }
 \f

diff --git a/MagickCore/semaphore.h b/MagickCore/semaphore.h
index 24cf42f6f4caffa09ca1b03a39b2a0d69a090206..8b3ba3ef5135b8b569dfbcb464521c1dbc0f73e7 100644 (file)
--- a/MagickCore/semaphore.h
+++ b/MagickCore/semaphore.h
@@ -25,9 +25,6 @@ extern "C" {
 typedef struct SemaphoreInfo
   SemaphoreInfo;
 
-extern MagickExport MagickBooleanType
-  SemaphoreComponentGenesis(void);
-
 extern MagickExport SemaphoreInfo
   *AllocateSemaphoreInfo(void);
 
@@ -36,7 +33,6 @@ extern MagickExport void
   DestroySemaphoreInfo(SemaphoreInfo **),
   LockSemaphoreInfo(SemaphoreInfo *),
   RelinquishSemaphoreInfo(SemaphoreInfo *),
-  SemaphoreComponentTerminus(void),
   UnlockSemaphoreInfo(SemaphoreInfo *);
 
 #if defined(__cplusplus) || defined(c_plusplus)

diff --git a/MagickCore/type-private.h b/MagickCore/type-private.h
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..c0380441c54dcdec677db7febcf5bf4a1142958a 100644 (file)
--- a/MagickCore/type-private.h
+++ b/MagickCore/type-private.h
@@ -0,0 +1,35 @@
+/*
+  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 image type methods.
+*/
+#ifndef _MAGICKCORE_TYPE_PRIVATE_H
+#define _MAGICKCORE_TYPE_PRIVATE_H
+
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
+extern MagickPrivate MagickBooleanType
+  TypeComponentGenesis(void);
+
+extern MagickPrivate void
+  TypeComponentTerminus(void);
+
+#if defined(__cplusplus) || defined(c_plusplus)
+}
+#endif
+
+#endif

diff --git a/MagickCore/type.c b/MagickCore/type.c
index 2d3bd1189f7098ebd993786af7dac4ce6b9fb58f..aeea227adc7377f8a65347a06be075ea2e4ca50a 100644 (file)
--- a/MagickCore/type.c
+++ b/MagickCore/type.c
@@ -55,6 +55,7 @@
 #include "MagickCore/string_.h"
 #include "MagickCore/string-private.h"
 #include "MagickCore/type.h"
+#include "MagickCore/type-private.h"
 #include "MagickCore/token.h"
 #include "MagickCore/utility.h"
 #include "MagickCore/xml-tree.h"
@@ -1349,7 +1350,7 @@ static MagickBooleanType LoadTypeLists(const char *filename,
 %      MagickBooleanType TypeComponentGenesis(void)
 %
 */
-MagickExport MagickBooleanType TypeComponentGenesis(void)
+MagickPrivate MagickBooleanType TypeComponentGenesis(void)
 {
   AcquireSemaphoreInfo(&type_semaphore);
   return(MagickTrue);
@@ -1373,7 +1374,7 @@ MagickExport MagickBooleanType TypeComponentGenesis(void)
 %      void TypeComponentTerminus(void)
 %
 */
-MagickExport void TypeComponentTerminus(void)
+MagickPrivate void TypeComponentTerminus(void)
 {
   if (type_semaphore == (SemaphoreInfo *) NULL)
     AcquireSemaphoreInfo(&type_semaphore);

diff --git a/MagickCore/type.h b/MagickCore/type.h
index 9076e8eb19c2201849805f1d9c63555ffae4c451..f500f7b09a56d84e5885cbfa6b9f4c1400c4f727 100644 (file)
--- a/MagickCore/type.h
+++ b/MagickCore/type.h
@@ -84,8 +84,7 @@ extern MagickExport char
   **GetTypeList(const char *,size_t *,ExceptionInfo *);
 
 extern MagickExport MagickBooleanType
-  ListTypeInfo(FILE *,ExceptionInfo *),
-  TypeComponentGenesis(void);
+  ListTypeInfo(FILE *,ExceptionInfo *);
 
 extern MagickExport const TypeInfo
   *GetTypeInfo(const char *,ExceptionInfo *),
@@ -93,9 +92,6 @@ extern MagickExport const TypeInfo
     const size_t,ExceptionInfo *),
   **GetTypeInfoList(const char *,size_t *,ExceptionInfo *);
 
-MagickExport void
-  TypeComponentTerminus(void);
-
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 9df5b6b15782c57f4cf1ebb515e4c379626d0660..61157d39eb101761bd71fabf70cf1b52544a5d1b 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,7 +27,7 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2011 ImageMagick Studio LLC"
-#define MagickSVNRevision  "5077"
+#define MagickSVNRevision  "exported"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  5,0,0

diff --git a/MagickCore/xwindow-private.h b/MagickCore/xwindow-private.h
index 43caa63388d3fad8f7724ee58b69ad4f0fda80e3..0a9a411fcc57d31c50fb5598bce3c25f4f5564f2 100644 (file)
--- a/MagickCore/xwindow-private.h
+++ b/MagickCore/xwindow-private.h
@@ -519,7 +519,6 @@ extern MagickExport int
 
 extern MagickExport MagickBooleanType
   XAnnotateImage(Display *,const XPixelInfo *,XAnnotateInfo *,Image *),
-  XComponentGenesis(void),
   XDrawImage(Display *,const XPixelInfo *,XDrawInfo *,Image *),
   XGetWindowColor(Display *,XWindows *,char *),
   XMagickProgressMonitor(const char *,const MagickOffsetType,
@@ -529,13 +528,15 @@ extern MagickExport MagickBooleanType
   XQueryColorDatabase(const char *,XColor *),
   XRemoteCommand(Display *,const char *,const char *);
 
+extern MagickPrivate MagickBooleanType
+  XComponentGenesis(void);
+
 extern MagickExport void
   DestroyXResources(void),
   XBestIconSize(Display *,XWindowInfo *,Image *),
   XBestPixel(Display *,const Colormap,XColor *,unsigned int,XColor *),
   XCheckRefreshWindows(Display *,XWindows *),
   XClientMessage(Display *,const Window,const Atom,const Atom,const Time),
-  XComponentTerminus(void),
   XConfigureImageColormap(Display *,XResourceInfo *,XWindows *,Image *),
   XConstrainWindowPosition(Display *,XWindowInfo *),
   XDelay(Display *,const size_t),
@@ -568,6 +569,9 @@ extern MagickExport void
   XUserPreferences(XResourceInfo *),
   XWarning(const ExceptionType,const char *,const char *);
 
+extern MagickPrivate void
+  XComponentTerminus(void);
+
 extern MagickExport Window
   XWindowByID(Display *,const Window,const size_t),
   XWindowByName(Display *,const Window,const char *),

diff --git a/MagickCore/xwindow.c b/MagickCore/xwindow.c
index 1f9000d0f7c72a9e6ca9736e6266cc0d11c7103c..4fe0de2ece403ccd99c5bdfca98ea54db2efc22c 100644 (file)
--- a/MagickCore/xwindow.c
+++ b/MagickCore/xwindow.c
@@ -1658,7 +1658,7 @@ static Window XClientWindow(Display *display,Window target_window)
 %      XComponentTerminus(void)
 %
 */
-MagickExport void XComponentTerminus(void)
+MagickPrivate void XComponentTerminus(void)
 {
   DestroyXResources();
 }
@@ -9732,7 +9732,7 @@ MagickExport Image *XImportImage(const ImageInfo *image_info,
 %      MagickBooleanType XComponentGenesis(void)
 %
 */
-MagickExport MagickBooleanType XComponentGenesis(void)
+MagickPrivate MagickBooleanType XComponentGenesis(void)
 {
   return(MagickTrue);
 }