(no commit message)

diff --git a/coders/bmp.c b/coders/bmp.c
index 0da5ca997a80400d69e677697c4251563d4ecd9a..b54f2d78625403d11479c28038f9a44b8b339f45 100644 (file)
--- a/coders/bmp.c
+++ b/coders/bmp.c
@@ -1178,6 +1178,7 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception)
             q->blue=ScaleCharToQuantum(*p++);
             q->green=ScaleCharToQuantum(*p++);
             q->red=ScaleCharToQuantum(*p++);
+            SetOpacityPixelComponent(q,OpaqueOpacity);
             q++;
           }
           if (SyncAuthenticPixels(image,exception) == MagickFalse)

diff --git a/magick/module.c b/magick/module.c
index 46976cbc4a5537f7d86fee54385b01278327bfc6..85be72b503b3e5973256d8b58543e404fd37b2db 100644 (file)
--- a/magick/module.c
+++ b/magick/module.c
@@ -988,6 +988,7 @@ MagickExport MagickBooleanType InvokeDynamicImageFilter(const char *tag,
   /*
     Execute the module.
   */
+  ClearMagickException(exception);
   image_filter=(ImageFilterHandler *) lt_dlsym(handle,name);
   if (image_filter == (ImageFilterHandler *) NULL)
     (void) ThrowMagickException(exception,GetMagickModule(),ModuleError,
@@ -1005,23 +1006,17 @@ MagickExport MagickBooleanType InvokeDynamicImageFilter(const char *tag,
         (void) LogMagickEvent(ModuleEvent,GetMagickModule(),"\"%s\" completes",
           tag);
       if (signature != MagickImageFilterSignature)
-        {
-          (void) ThrowMagickException(exception,GetMagickModule(),ModuleError,
-            "ImageFilterSignatureMismatch","`%s': %8lx != %8lx",tag,signature,
-            MagickImageFilterSignature);
-          return(MagickFalse);
-        }
+        (void) ThrowMagickException(exception,GetMagickModule(),ModuleError,
+          "ImageFilterSignatureMismatch","`%s': %8lx != %8lx",tag,signature,
+          MagickImageFilterSignature);
     }
   /*
     Close the module.
   */
   if (lt_dlclose(handle) != 0)
-    {
-      (void) ThrowMagickException(exception,GetMagickModule(),ModuleWarning,
-        "UnableToCloseModule","`%s': %s",name,lt_dlerror());
-      return(MagickFalse);
-    }
-  return(MagickTrue);
+    (void) ThrowMagickException(exception,GetMagickModule(),ModuleWarning,
+      "UnableToCloseModule","`%s': %s",name,lt_dlerror());
+  return(exception->severity < ErrorException ? MagickTrue : MagickFalse);
 }
 \f
 /*