(no commit message)

[imagemagick] / magick / static.c

diff --git a/magick/static.c b/magick/static.c
index 2da5e7ea76875a7654e07c8a8ad72a44c6b34567..08a1c285fe8e6b5e2aa875c2931a5f3255a0c392 100644 (file)
--- a/magick/static.c
+++ b/magick/static.c
@@ -17,7 +17,7 @@
 %                                 March 2000                                  %
 %                                                                             %
 %                                                                             %
-%  Copyright 1999-2009 ImageMagick Studio LLC, a non-profit organization      %
+%  Copyright 1999-2010 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  %
@@ -95,6 +95,7 @@ MagickExport MagickBooleanType InvokeStaticImageFilter(const char *tag,
   rights=ReadPolicyRights;
   if (IsRightsAuthorized(FilterPolicyDomain,rights,tag) == MagickFalse)
     {
+      errno=EPERM;
       (void) ThrowMagickException(exception,GetMagickModule(),PolicyError,
         "NotAuthorized","`%s'",tag);
       return(MagickFalse);
@@ -106,7 +107,7 @@ MagickExport MagickBooleanType InvokeStaticImageFilter(const char *tag,
   (void) exception;
 #else
   {
-    extern unsigned long
+    extern size_t
       analyzeImage(Image **,const int,char **,ExceptionInfo *);
 
     ImageFilterHandler
@@ -115,9 +116,12 @@ MagickExport MagickBooleanType InvokeStaticImageFilter(const char *tag,
     image_filter=(ImageFilterHandler *) NULL;
     if (LocaleCompare("analyze",tag) == 0)
       image_filter=(ImageFilterHandler *) analyzeImage;
-    if (image_filter != (ImageFilterHandler *) NULL)
+    if (image_filter == (ImageFilterHandler *) NULL)
+      (void) ThrowMagickException(exception,GetMagickModule(),ModuleError,
+        "UnableToLoadModule","`%s'",tag);
+    else
       {
-        unsigned long
+        size_t
           signature;
 
         if ((*image)->debug != MagickFalse)
@@ -130,7 +134,8 @@ MagickExport MagickBooleanType InvokeStaticImageFilter(const char *tag,
         if (signature != MagickImageFilterSignature)
           {
             (void) ThrowMagickException(exception,GetMagickModule(),ModuleError,
-              "ImageFilterSignatureMismatch","`%s': %8lx != %8lx",tag,signature,
+              "ImageFilterSignatureMismatch","`%s': %8lx != %8lx",tag,
+              (unsigned long) signature,(unsigned long)
               MagickImageFilterSignature);
             return(MagickFalse);
           }
@@ -166,6 +171,7 @@ MagickExport void RegisterStaticModules(void)
   (void) RegisterARTImage();
   (void) RegisterAVSImage();
   (void) RegisterBMPImage();
+  (void) RegisterCALSImage();
   (void) RegisterCAPTIONImage();
   (void) RegisterCINImage();
   (void) RegisterCIPImage();
@@ -177,6 +183,7 @@ MagickExport void RegisterStaticModules(void)
   (void) RegisterCUTImage();
   (void) RegisterDCMImage();
   (void) RegisterDDSImage();
+  (void) RegisterDEBUGImage();
   (void) RegisterDIBImage();
 #if defined(MAGICKCORE_DJVU_DELEGATE)
   (void) RegisterDJVUImage();
@@ -242,6 +249,7 @@ MagickExport void RegisterStaticModules(void)
   (void) RegisterPCXImage();
   (void) RegisterPDBImage();
   (void) RegisterPDFImage();
+  (void) RegisterPESImage();
   (void) RegisterPICTImage();
   (void) RegisterPIXImage();
   (void) RegisterPLASMAImage();
@@ -331,6 +339,7 @@ MagickExport void UnregisterStaticModules(void)
   UnregisterAVSImage();
   UnregisterBMPImage();
   UnregisterBRAILLEImage();
+  UnregisterCALSImage();
   UnregisterCAPTIONImage();
   UnregisterCINImage();
   UnregisterCIPImage();
@@ -342,6 +351,7 @@ MagickExport void UnregisterStaticModules(void)
   UnregisterCUTImage();
   UnregisterDCMImage();
   UnregisterDDSImage();
+  UnregisterDEBUGImage();
   UnregisterDIBImage();
 #if defined(MAGICKCORE_DJVU_DELEGATE)
   UnregisterDJVUImage();
@@ -407,6 +417,7 @@ MagickExport void UnregisterStaticModules(void)
   UnregisterPCXImage();
   UnregisterPDBImage();
   UnregisterPDFImage();
+  UnregisterPESImage();
   UnregisterPICTImage();
   UnregisterPIXImage();
   UnregisterPLASMAImage();