From: cristy Date: Sat, 3 Sep 2011 01:38:02 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~7094 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5ff4eaf57b3cd47d0371f204f865cbba614674a0;p=imagemagick --- diff --git a/MagickCore/Makefile.am b/MagickCore/Makefile.am index 1f1fd89b3..8a4610e4b 100644 --- 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 e69de29bb..f1d52ecb9 100644 --- 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 1dcde88e4..319000de7 100644 --- 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 06957deef..c75963abb 100644 --- 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 be7b24e97..5612e344d 100644 --- 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 6c0d930b8..74318ec0d 100644 --- 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 22b9fce35..0d262e50f 100644 --- 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 e69de29bb..6add01e5a 100644 --- 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 ae27c5845..8fb497d3b 100644 --- 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 2d993bc11..9ac2eae45 100644 --- 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 63ba2965e..9d04e341a 100644 --- 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 81a2ead58..c391910c7 100644 --- 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 d56fa1432..d7542f3b3 100644 --- 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 e69de29bb..60ab33a1d 100644 --- 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 b9b2bee69..83051b3d5 100644 --- 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 79caa2843..e44d3ca41 100644 --- 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 e69de29bb..ac10ba5e0 100644 --- 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 d22fbb7ea..fbe65a345 100644 --- 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 fa6014f66..8777814a9 100644 --- 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 2d304b784..c8b0a0bb3 100644 --- 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 b9890d490..fea264215 100644 --- 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 daf7f8ab5..7a66a8514 100644 --- 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 e69de29bb..833739fa1 100644 --- 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 3e87b1ef1..e26ee1d96 100644 --- 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 98ee0fc3c..0b71fc52d 100644 --- 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 e69de29bb..d150b457e 100644 --- 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 +#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 494a70cb9..7448e24d5 100644 --- 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 0323476fc..27bf8afb9 100644 --- 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 e69de29bb..36b2fa91c 100644 --- 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 71d741417..0409fe6be 100644 --- 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 8f2dd74cf..ab5d88f59 100644 --- 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 2726a74e3..60334d7b9 100644 --- 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 header file. */ -#ifndef MAGICKCORE_HAVE_LCMS2_H -#define MAGICKCORE_HAVE_LCMS2_H 1 -#endif +/* #undef HAVE_LCMS2_H */ /* Define if you have the header file. */ /* #undef HAVE_LCMS2_LCMS2_H */ /* Define if you have the header file. */ -/* #undef HAVE_LCMS_H */ +#ifndef MAGICKCORE_HAVE_LCMS_H +#define MAGICKCORE_HAVE_LCMS_H 1 +#endif /* Define if you have the 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 e69de29bb..e57dbb0c9 100644 --- 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 e582b0158..376e9c2ed 100644 --- 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 6eed97775..a1aff1fec 100644 --- 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 31c2e1bdd..9f501aeed 100644 --- 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 bc29e307b..c57b40b2d 100644 --- 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 f2247daf4..1bca2e045 100644 --- 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 e69de29bb..05f4b3d70 100644 --- 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 5b1b688d5..77648f285 100644 --- 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 0424168f1..bd101c219 100644 --- 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 e69de29bb..3f8055a0a 100644 --- 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 8d20a117c..27e32ed0e 100644 --- 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 16854a4ac..6e994363e 100644 --- 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 fd589c871..112faa8a4 100644 --- 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 818e7ca96..f518bb193 100644 --- 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 e69de29bb..084ccb7a5 100644 --- 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 06de7d199..a9c04fe3b 100644 --- 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 e69de29bb..b914f9695 100644 --- 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 e3ba26b16..e2b156271 100644 --- 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(®istry_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(®istry_semaphore); diff --git a/MagickCore/registry.h b/MagickCore/registry.h index 76869d968..47b4210a6 100644 --- 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 be042c344..5335cf89d 100644 --- 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 220aeda03..7d640b729 100644 --- 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 108089d93..6d56202dd 100644 --- 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 621d80d18..3e9d725ac 100644 --- 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 3c169f147..6e57f4ff3 100644 --- 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) { } diff --git a/MagickCore/semaphore.h b/MagickCore/semaphore.h index 24cf42f6f..8b3ba3ef5 100644 --- 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 e69de29bb..c0380441c 100644 --- 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 2d3bd1189..aeea227ad 100644 --- 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 9076e8eb1..f500f7b09 100644 --- 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 9df5b6b15..61157d39e 100644 --- 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 43caa6338..0a9a411fc 100644 --- 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 1f9000d0f..4fe0de2ec 100644 --- 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); }