From: cristy <urban-warrior@git.imagemagick.org>
Date: Wed, 15 May 2013 12:20:19 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~3673
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=992f537a471552415614fd4eddf5e30ec90cc2b6;p=imagemagick

---

diff --git a/MagickCore/exception.c b/MagickCore/exception.c
index 34a01f72c..d9fc39397 100644
--- 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 bc7ac7e93..798cf4783 100644
--- 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;