(no commit message)

[imagemagick] / MagickCore / type.c

diff --git a/MagickCore/type.c b/MagickCore/type.c
index 3e1cdcf20adb377d603aa35aa9e7bf02a02a3a44..8e9d26c9923c32af0262e65cd3460c848a9ff0a5 100644 (file)
--- a/MagickCore/type.c
+++ b/MagickCore/type.c
@@ -49,6 +49,8 @@
 #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"
@@ -92,9 +94,6 @@
 #define FC_WEIGHT_HEAVY            FC_WEIGHT_BLACK
 #endif
 #endif
-#if defined(MAGICKCORE_WINDOWS_SUPPORT)
-# include "MagickCore/nt-feature.h"
-#endif
 \f
 /*
   Define declarations.
@@ -211,16 +210,14 @@ MagickExport const TypeInfo *GetTypeInfo(const char *name,
 %
 */
 
-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);
@@ -1211,7 +1208,7 @@ static MagickBooleanType LoadTypeList(const char *xml,const char *filename,
       {
         if (LocaleCompare((char *) keyword,"stealth") == 0)
           {
-            type_info->stealth=IsMagickTrue(token);
+            type_info->stealth=IsStringTrue(token);
             break;
           }
         if (LocaleCompare((char *) keyword,"stretch") == 0)