(no commit message)

diff --git a/MagickCore/exception.c b/MagickCore/exception.c
index 34a01f72c2e8d13bd2f90d4213763e77180433f3..d9fc39397aa3dc1f55cd99fbdc490311459a0ca4 100644 (file)
--- a/MagickCore/exception.c
+++ b/MagickCore/exception.c
@@ -939,9 +939,12 @@ MagickExport MagickBooleanType ThrowException(ExceptionInfo *exception,
     p->description=ConstantString(description);
   p->signature=MagickSignature;
   (void) AppendValueToLinkedList((LinkedListInfo *) exception->exceptions,p);
-  exception->severity=p->severity;
-  exception->reason=p->reason;
-  exception->description=p->description;
+  if (p->severity >= exception->severity)
+    {
+      exception->severity=p->severity;
+      exception->reason=p->reason;
+      exception->description=p->description;
+    }
   UnlockSemaphoreInfo(exception->semaphore);
   return(MagickTrue);
 }

diff --git a/MagickCore/morphology.c b/MagickCore/morphology.c
index bc7ac7e936ce2d14f29ac6fdbfc0196231f3a4e8..798cf47838202a381ad912a6ebef594cbf90dcc2 100644 (file)
--- a/MagickCore/morphology.c
+++ b/MagickCore/morphology.c
@@ -3904,7 +3904,6 @@ MagickPrivate Image *MorphologyApply(const Image *image,
           }
           if ( changed < 0 )
             goto error_cleanup;
-          #pragma omp flush(changed)
           kernel_changed += changed;
           method_changed += changed;