From 1ffe998321b6521d5bbfca23016efe72d9ceb6df Mon Sep 17 00:00:00 2001 From: cristy Date: Sat, 13 Apr 2013 16:46:51 +0000 Subject: [PATCH] --- MagickCore/annotate.c | 5 +++-- MagickCore/xwindow-private.h | 17 ++++++++++------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c index 04434cd26..0e864bac4 100644 --- a/MagickCore/annotate.c +++ b/MagickCore/annotate.c @@ -1890,8 +1890,9 @@ static MagickBooleanType RenderPostscript(Image *image, % o exception: return any errors or warnings in this structure. % */ -static MagickBooleanType RenderX11(Image *image,const DrawInfo *draw_info, - const PointInfo *offset,TypeMetric *metrics,ExceptionInfo *exception) +MagickPrivate MagickBooleanType RenderX11(Image *image, + const DrawInfo *draw_info,const PointInfo *offset,TypeMetric *metrics, + ExceptionInfo *exception) { MagickBooleanType status; diff --git a/MagickCore/xwindow-private.h b/MagickCore/xwindow-private.h index 5cec4c237..d46fb4552 100644 --- a/MagickCore/xwindow-private.h +++ b/MagickCore/xwindow-private.h @@ -22,6 +22,11 @@ extern "C" { #endif +#include "MagickCore/exception.h" +#include "MagickCore/geometry.h" +#include "MagickCore/pixel-accessor.h" +#include "MagickCore/quantize.h" + #if defined(MAGICKCORE_X11_DELEGATE) #include @@ -31,10 +36,6 @@ extern "C" { #include #include #include -#include "MagickCore/exception.h" -#include "MagickCore/geometry.h" -#include "MagickCore/pixel-accessor.h" -#include "MagickCore/quantize.h" #if defined(__cplusplus) || defined(c_plusplus) # define klass c_class @@ -522,9 +523,7 @@ extern MagickPrivate MagickBooleanType const MagickSizeType,void *), XMakeImage(Display *,const XResourceInfo *,XWindowInfo *,Image *,unsigned int, unsigned int,ExceptionInfo *), - XQueryColorCompliance(const char *,XColor *), - XRenderImage(Image *,const DrawInfo *,const PointInfo *,TypeMetric *, - ExceptionInfo *); + XQueryColorCompliance(const char *,XColor *); extern MagickPrivate void XBestIconSize(Display *,XWindowInfo *,Image *), @@ -613,6 +612,10 @@ static inline double XPixelIntensity(const XColor *pixel) #endif +extern MagickPrivate MagickBooleanType + XRenderImage(Image *,const DrawInfo *,const PointInfo *,TypeMetric *, + ExceptionInfo *); + #if defined(__cplusplus) || defined(c_plusplus) } #endif -- 2.50.1