From bcdf567d7dc3c69162ca349e41d43741faed2043 Mon Sep 17 00:00:00 2001 From: cristy Date: Thu, 24 May 2012 22:58:54 +0000 Subject: [PATCH] --- MagickCore/color.c | 3 +++ MagickCore/effect.c | 3 +++ MagickCore/image-private.h | 7 ------- MagickCore/xwindow.c | 8 ++++++++ 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/MagickCore/color.c b/MagickCore/color.c index 9dbe056f1..52ad07b1f 100644 --- a/MagickCore/color.c +++ b/MagickCore/color.c @@ -2145,6 +2145,9 @@ static MagickBooleanType LoadColorLists(const char *filename, MagickExport MagickBooleanType QueryColorCompliance(const char *name, const ComplianceType compliance,PixelInfo *color,ExceptionInfo *exception) { + extern const char + BackgroundColor[]; + GeometryInfo geometry_info; diff --git a/MagickCore/effect.c b/MagickCore/effect.c index c1e9067eb..96974d0b8 100644 --- a/MagickCore/effect.c +++ b/MagickCore/effect.c @@ -2139,6 +2139,9 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, sigma, threshold; + extern const char + DefaultTileFrame[]; + Image *images, *montage_image, diff --git a/MagickCore/image-private.h b/MagickCore/image-private.h index 966edc0d3..7fb31de3f 100644 --- a/MagickCore/image-private.h +++ b/MagickCore/image-private.h @@ -31,13 +31,6 @@ extern "C" { #define UndefinedTicksPerSecond 100L #define UndefinedCompressionQuality 0UL -extern MagickPrivate const char - BackgroundColor[], - BorderColor[], - ForegroundColor[], - DefaultTileFrame[], - MatteColor[]; - static inline double DegreesToRadians(const double degrees) { return((double) (MagickPI*degrees/180.0)); diff --git a/MagickCore/xwindow.c b/MagickCore/xwindow.c index a4cb182b7..2dc738796 100644 --- a/MagickCore/xwindow.c +++ b/MagickCore/xwindow.c @@ -3051,6 +3051,10 @@ MagickPrivate void XGetPixelInfo(Display *display, Colormap colormap; + extern const char + BorderColor[], + ForegroundColor[]; + register ssize_t i; @@ -3478,6 +3482,10 @@ MagickExport void XGetResourceInfo(const ImageInfo *image_info, *directory, *resource_value; + extern const char + BorderColor[], + ForegroundColor[]; + /* Initialize resource info fields. */ -- 2.50.1