...

[imagemagick] / MagickCore / display.h

diff --git a/MagickCore/display.h b/MagickCore/display.h
index 93492ef291c63d8bf7d0034e0c7ed6cdd76fe1ec..da859b7487fa6494e5eff4eb846ba6c8c5687c07 100644 (file)
--- a/MagickCore/display.h
+++ b/MagickCore/display.h
@@ -1,5 +1,5 @@
 /*
 /*

-  Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
+  Copyright 1999-2017 ImageMagick Studio LLC, a non-profit organization

   dedicated to making software imaging solutions freely available.
   
   You may not use this file except in compliance with the License.
   dedicated to making software imaging solutions freely available.
   
   You may not use this file except in compliance with the License.


@@ -15,8 +15,8 @@
 
   MagickCore methods to interactively display and edit an image.
 */
 
   MagickCore methods to interactively display and edit an image.
 */

-#ifndef _MAGICKCORE_DISPLAY_H
-#define _MAGICKCORE_DISPLAY_H
+#ifndef MAGICKCORE_DISPLAY_H
+#define MAGICKCORE_DISPLAY_H

 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {


@@ -27,17 +27,6 @@ extern MagickExport MagickBooleanType
   RemoteDisplayCommand(const ImageInfo *,const char *,const char *,
     ExceptionInfo *);
 
   RemoteDisplayCommand(const ImageInfo *,const char *,const char *,
     ExceptionInfo *);
 

-#if defined(MAGICKCORE_X11_DELEGATE)
-#include "MagickCore/xwindow.h"
-
-extern MagickExport Image
-  *XDisplayImage(Display *,XResourceInfo *,char **,int,Image **,size_t *,
-    ExceptionInfo *);
-
-extern MagickExport MagickBooleanType XDisplayBackgroundImage(Display *,
-  XResourceInfo *,Image *,ExceptionInfo *);
-#endif
-

 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif