From: cristy <urban-warrior@git.imagemagick.org>
Date: Mon, 19 Dec 2011 23:58:54 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~6520
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a0dc96a5df0a380c9ef855cc7f2a5f264bec8af3;p=imagemagick

---

diff --git a/MagickCore/xwindow.c b/MagickCore/xwindow.c
index 0e998f3fb..429621739 100644
--- a/MagickCore/xwindow.c
+++ b/MagickCore/xwindow.c
@@ -9740,7 +9740,8 @@ MagickPrivate Window XWindowByProperty(Display *display,const Window window,
 %
 %  The format of the XImportImage method is:
 %
-%      Image *XImportImage(const ImageInfo *image_info,XImportInfo *ximage_info)
+%      Image *XImportImage(const ImageInfo *image_info,XImportInfo *ximage_info,
+%        ExceptionInfo *exception)
 %
 %  A description of each parameter follows:
 %
@@ -9748,9 +9749,11 @@ MagickPrivate Window XWindowByProperty(Display *display,const Window window,
 %
 %    o ximage_info: Specifies a pointer to an XImportInfo structure.
 %
+%    o exception: return any errors or warnings in this structure.
+%
 */
 MagickPrivate Image *XImportImage(const ImageInfo *image_info,
-  XImportInfo *ximage_info)
+  XImportInfo *ximage_info,ExceptionInfo *exception)
 {
   assert(image_info != (const ImageInfo *) NULL);
   assert(image_info->signature == MagickSignature);
@@ -9758,6 +9761,8 @@ MagickPrivate Image *XImportImage(const ImageInfo *image_info,
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
       image_info->filename);
   assert(ximage_info != (XImportInfo *) NULL);
+  assert(exception != (ExceptionInfo *) NULL);
+  assert(exception->signature == MagickSignature);
   return((Image *) NULL);
 }
 #endif