#include "MagickCore/hashmap.h"
#include "MagickCore/log.h"
#include "MagickCore/memory_.h"
+#include "MagickCore/nt-feature.h"
+#include "MagickCore/nt-base-private.h"
#include "MagickCore/option.h"
#include "MagickCore/semaphore.h"
#include "MagickCore/splay-tree.h"
#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/utility-private.h"
#include "MagickCore/xml-tree.h"
#if defined(MAGICKCORE_FONTCONFIG_DELEGATE)
# include "fontconfig/fontconfig.h"
#define FC_WEIGHT_HEAVY FC_WEIGHT_BLACK
#endif
#endif
-#if defined(MAGICKCORE_WINDOWS_SUPPORT)
-# include "MagickCore/nt-feature.h"
-#endif
\f
/*
Define declarations.
%
*/
-static inline size_t MagickMax(const size_t x,
- const size_t y)
+static inline size_t MagickMax(const size_t x,const size_t y)
{
if (x > y)
return(x);
return(y);
}
-static inline size_t MagickMin(const size_t x,
- const size_t y)
+static inline size_t MagickMin(const size_t x,const size_t y)
{
if (x < y)
return(x);
if (type_info != (const TypeInfo *) NULL)
{
(void) ThrowMagickException(exception,GetMagickModule(),TypeError,
- "FontSubstitutionRequired","`%s'",type_info->family);
+ "FontSubstitutionRequired","'%s'",type_info->family);
return(type_info);
}
if (family != (const char *) NULL)
{
if (depth > 200)
(void) ThrowMagickException(exception,GetMagickModule(),
- ConfigureError,"IncludeNodeNestedTooDeeply","`%s'",token);
+ ConfigureError,"IncludeNodeNestedTooDeeply","'%s'",token);
else
{
char
status=AddValueToSplayTree(type_list,type_info->name,type_info);
if (status == MagickFalse)
(void) ThrowMagickException(exception,GetMagickModule(),
- ResourceLimitError,"MemoryAllocationFailed","`%s'",type_info->name);
+ ResourceLimitError,"MemoryAllocationFailed","'%s'",type_info->name);
type_info=(TypeInfo *) NULL;
}
GetMagickToken(q,(const char **) NULL,token);
{
if (LocaleCompare((char *) keyword,"stealth") == 0)
{
- type_info->stealth=IsMagickTrue(token);
+ type_info->stealth=IsStringTrue(token);
break;
}
if (LocaleCompare((char *) keyword,"stretch") == 0)
static MagickBooleanType LoadTypeLists(const char *filename,
ExceptionInfo *exception)
{
-#if defined(MAGICKCORE_EMBEDDABLE_SUPPORT)
+#if defined(MAGICKCORE_ZERO_CONFIGURATION_SUPPORT)
return(LoadTypeList(TypeMap,"built-in",0,exception));
#else
char
% MagickBooleanType TypeComponentGenesis(void)
%
*/
-MagickExport MagickBooleanType TypeComponentGenesis(void)
+MagickPrivate MagickBooleanType TypeComponentGenesis(void)
{
AcquireSemaphoreInfo(&type_semaphore);
return(MagickTrue);
% void TypeComponentTerminus(void)
%
*/
-MagickExport void TypeComponentTerminus(void)
+MagickPrivate void TypeComponentTerminus(void)
{
if (type_semaphore == (SemaphoreInfo *) NULL)
AcquireSemaphoreInfo(&type_semaphore);