commit c663dbd90626c1e7389f93b6e4c0814e8efedc20
author cristy <urban-warrior@git.imagemagick.org> Fri Sep 16 19:43:14 2011 +0000
committer cristy <urban-warrior@git.imagemagick.org> Fri Sep 16 19:43:14 2011 +0000
tree db744f6399551f9d3e83ebe1ed9126e931525d25
parent b58014f3d29ae4bec533c6a117a79b5b64c8c1fb

MagickCore/animate.c

diff --git a/MagickCore/animate.c b/MagickCore/animate.c
index 97a3df1..baa6196 100644
--- a/MagickCore/animate.c
+++ b/MagickCore/animate.c
@@ -543,8 +543,14 @@
       status=XSaveImage(display,resource_info,windows,*image,exception);
       if (status == MagickFalse)
         {
-          XNoticeWidget(display,windows,"Unable to write X image:",
-            (*image)->filename);
+          char
+            message[MaxTextExtent];
+
+          (void) FormatLocaleString(message,MaxTextExtent,"%s:%s",
+            exception->reason != (char *) NULL ? exception->reason : "",
+            exception->description != (char *) NULL ? exception->description :
+            "");
+          XNoticeWidget(display,windows,"Unable to save file:",message);
           break;
         }
       break;

MagickCore/display.c

diff --git a/MagickCore/display.c b/MagickCore/display.c
index 555cbe6..150fb7a 100644
--- a/MagickCore/display.c
+++ b/MagickCore/display.c
@@ -7209,8 +7209,14 @@
       status=XSaveImage(display,resource_info,windows,*image,exception);
       if (status == MagickFalse)
         {
-          XNoticeWidget(display,windows,"Unable to write X image:",
-            (*image)->filename);
+          char
+            message[MaxTextExtent];
+
+          (void) FormatLocaleString(message,MaxTextExtent,"%s:%s",
+            exception->reason != (char *) NULL ? exception->reason : "",
+            exception->description != (char *) NULL ? exception->description :
+            "");
+          XNoticeWidget(display,windows,"Unable to save file:",message);
           break;
         }
       break;
@@ -7223,8 +7229,14 @@
       status=XPrintImage(display,resource_info,windows,*image,exception);
       if (status == MagickFalse)
         {
-          XNoticeWidget(display,windows,"Unable to print X image:",
-            (*image)->filename);
+          char
+            message[MaxTextExtent];
+
+          (void) FormatLocaleString(message,MaxTextExtent,"%s:%s",
+            exception->reason != (char *) NULL ? exception->reason : "",
+            exception->description != (char *) NULL ? exception->description :
+            "");
+          XNoticeWidget(display,windows,"Unable to print file:",message);
           break;
         }
       break;

MagickCore/semaphore.c

diff --git a/MagickCore/semaphore.c b/MagickCore/semaphore.c
index 6e57f4f..b39e56b 100644
--- a/MagickCore/semaphore.c
+++ b/MagickCore/semaphore.c
@@ -151,6 +151,17 @@
         ThrowFatalException(ResourceLimitFatalError,
           "UnableToInitializeSemaphore");
       }
+#if defined(MAGICKCORE_DEBUG)
+#if defined(PTHREAD_MUTEX_ERRORCHECK)
+    status=pthread_mutex_settype(&mutex_info,PTHREAD_MUTEX_ERRORCHECK);
+    if (status != 0)
+      {
+        errno=status;
+        ThrowFatalException(ResourceLimitFatalError,
+          "UnableToInitializeSemaphore");
+      }
+#endif
+#endif
     status=pthread_mutex_init(&semaphore_info->mutex,&mutex_info);
     if (status != 0)
       {