(no commit message)

[imagemagick] / MagickCore / magic.c

diff --git a/MagickCore/magic.c b/MagickCore/magic.c
index 71d7414179f683ff6187e7022837a4b31dd68933..f21db0f01c6a5903acd8ab6a5faa05a34fc4de8e 100644 (file)
--- a/MagickCore/magic.c
+++ b/MagickCore/magic.c
@@ -17,7 +17,7 @@
 %                                 July 2000                                   %
 %                                                                             %
 %                                                                             %
-%  Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization      %
+%  Copyright 1999-2012 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.  You may  %
@@ -43,16 +43,19 @@
 #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"
 #include "MagickCore/magic.h"
+#include "MagickCore/magic-private.h"
 #include "MagickCore/memory_.h"
 #include "MagickCore/semaphore.h"
 #include "MagickCore/string_.h"
 #include "MagickCore/string-private.h"
 #include "MagickCore/token.h"
 #include "MagickCore/utility.h"
+#include "MagickCore/utility-private.h"
 #include "MagickCore/xml-tree.h"
 \f
 /*
@@ -181,6 +184,7 @@ static const MagicMapInfo
     { "TIFF", 0, MagickString("\111\111\052\000") },
     { "TIFF64", 0, MagickString("\115\115\000\053\000\010\000\000") },
     { "TIFF64", 0, MagickString("\111\111\053\000\010\000\000\000") },
+    { "TTF", 0, MagickString("\000\001\000\000\000") },
     { "TXT", 0, MagickString("# ImageMagick pixel enumeration:") },
     { "VICAR", 0, MagickString("LBLSIZE") },
     { "VICAR", 0, MagickString("NJPL1I") },
@@ -736,7 +740,7 @@ static MagickBooleanType LoadMagicList(const char *xml,const char *filename,
             {
               if (depth > 200)
                 (void) ThrowMagickException(exception,GetMagickModule(),
-                  ConfigureError,"IncludeElementNestedTooDeeply","`%s'",token);
+                  ConfigureError,"IncludeElementNestedTooDeeply","'%s'",token);
               else
                 {
                   char
@@ -783,7 +787,7 @@ static MagickBooleanType LoadMagicList(const char *xml,const char *filename,
         status=AppendValueToLinkedList(magic_list,magic_info);
         if (status == MagickFalse)
           (void) ThrowMagickException(exception,GetMagickModule(),
-            ResourceLimitError,"MemoryAllocationFailed","`%s'",
+            ResourceLimitError,"MemoryAllocationFailed","'%s'",
             magic_info->name);
         magic_info=(MagicInfo *) NULL;
       }
@@ -819,7 +823,7 @@ static MagickBooleanType LoadMagicList(const char *xml,const char *filename,
       {
         if (LocaleCompare((char *) keyword,"stealth") == 0)
           {
-            magic_info->stealth=IsMagickTrue(token);
+            magic_info->stealth=IsStringTrue(token);
             break;
           }
         break;
@@ -963,7 +967,7 @@ static MagickBooleanType LoadMagicLists(const char *filename,
     if (magic_info == (MagicInfo *) NULL)
       {
         (void) ThrowMagickException(exception,GetMagickModule(),
-          ResourceLimitError,"MemoryAllocationFailed","`%s'",magic_info->name);
+          ResourceLimitError,"MemoryAllocationFailed","'%s'",magic_info->name);
         continue;
       }
     (void) ResetMagickMemory(magic_info,0,sizeof(*magic_info));
@@ -978,7 +982,7 @@ static MagickBooleanType LoadMagicLists(const char *filename,
     status=AppendValueToLinkedList(magic_list,magic_info);
     if (status == MagickFalse)
       (void) ThrowMagickException(exception,GetMagickModule(),
-        ResourceLimitError,"MemoryAllocationFailed","`%s'",magic_info->name);
+        ResourceLimitError,"MemoryAllocationFailed","'%s'",magic_info->name);
   }
   /*
     Load external magic map.
@@ -1015,7 +1019,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 +1065,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);