From: cristy <urban-warrior@git.imagemagick.org>
Date: Thu, 10 Apr 2014 00:13:05 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~2465
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0d8101ece7374fabd33e1478b17d785a8ff049f7;p=imagemagick

---

diff --git a/MagickCore/configure.c b/MagickCore/configure.c
index dd984b8dc..a3f10e3ad 100644
--- a/MagickCore/configure.c
+++ b/MagickCore/configure.c
@@ -1106,7 +1106,8 @@ MagickExport MagickBooleanType ListConfigureInfo(FILE *file,
 %  The format of the LoadConfigureCache method is:
 %
 %      MagickBooleanType LoadConfigureCache(LinkedListInfo *configure_cache,
-%        const char *xml,const char *filename,const size_t depth,ExceptionInfo *exception)
+%        const char *xml,const char *filename,const size_t depth,
+%        ExceptionInfo *exception)
 %
 %  A description of each parameter follows:
 %
diff --git a/MagickCore/delegate.c b/MagickCore/delegate.c
index c393949c8..04defce0e 100644
--- a/MagickCore/delegate.c
+++ b/MagickCore/delegate.c
@@ -212,7 +212,7 @@ static LinkedListInfo *AcquireDelegateCache(const char *filename,
 %                                                                             %
 %                                                                             %
 %                                                                             %
-+   D e l e g a t e C o m p o n e n t T e r m i n u s                         %
++   D e l e g a t e C o m p o n e n t G e n e s i s                           %
 %                                                                             %
 %                                                                             %
 %                                                                             %
diff --git a/MagickCore/magick.c b/MagickCore/magick.c
index 55cb67185..70a90aad9 100644
--- a/MagickCore/magick.c
+++ b/MagickCore/magick.c
@@ -853,7 +853,7 @@ static MagickBooleanType IsMagickTreeInstantiated(ExceptionInfo *exception)
             *magick_info;
 
           magick_list=NewSplayTree(CompareSplayTreeString,(void *(*)(void *))
-            NULL, DestroyMagickNode);
+            NULL,DestroyMagickNode);
           if (magick_list == (SplayTreeInfo *) NULL)
             ThrowFatalException(ResourceLimitFatalError,
               "MemoryAllocationFailed");
diff --git a/MagickCore/mime.c b/MagickCore/mime.c
index 6db567e3c..e677aff17 100644
--- a/MagickCore/mime.c
+++ b/MagickCore/mime.c
@@ -764,14 +764,14 @@ MagickExport MagickBooleanType ListMimeInfo(FILE *file,ExceptionInfo *exception)
 %                                                                             %
 %                                                                             %
 %                                                                             %
-+   L o a d M i m e L i s t                                                   %
++   L o a d M i m e C a c h e                                                 %
 %                                                                             %
 %                                                                             %
 %                                                                             %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  LoadMimeCache() loads the magic configurations which provides a mapping
-%  between magic attributes and a magic name.
+%  LoadMimeCache() loads the mime configurations which provides a mapping
+%  between mime attributes and a mime name.
 %
 %  The format of the LoadMimeCache method is:
 %
@@ -959,7 +959,8 @@ static MagickBooleanType LoadMimeCache(LinkedListInfo *mime_cache,
     if (attribute != (const char *) NULL)
       mime_info->priority=(ssize_t) strtol(attribute,(char **) NULL,0);
     attribute=GetXMLTreeAttribute(mime,"stealth");
-    mime_info->stealth=IsStringTrue(attribute);
+    if (attribute != (const char *) NULL)
+      mime_info->stealth=IsStringTrue(attribute);
     attribute=GetXMLTreeAttribute(mime,"type");
     if (attribute != (const char *) NULL)
       mime_info->type=ConstantString(attribute);