From: glennrp <glennrp@git.imagemagick.org>
Date: Sat, 6 Aug 2011 12:59:57 +0000 (+0000)
Subject: Changed Background|Matte|BorderColor to MogrifyBackgroundColor, etc.,
X-Git-Tag: 7.0.1-0~7217
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=215083339830381d2bf0d897935b881c0bfc7db3;p=imagemagick

Changed Background|Matte|BorderColor to MogrifyBackgroundColor, etc.,

to avoid compiler error about redefining them in MagickWand/mogrify.c
---

diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index 406234307..8587ece42 100644
--- a/MagickWand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -58,9 +58,9 @@
  Constant declaration.
 */
 const char
-  BackgroundColor[] = "#ffffff",  /* white */
-  BorderColor[] = "#dfdfdf",  /* gray */
-  MatteColor[] = "#bdbdbd";  /* gray */
+  MogrifyBackgroundColor[] = "#ffffff",  /* white */
+  MogrifyBorderColor[] = "#dfdfdf",  /* gray */
+  MogrifyMatteColor[] = "#bdbdbd";  /* gray */
 
 /*
   Define declarations.
@@ -921,7 +921,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
           {
             if (*option == '+')
               {
-                (void) QueryColorDatabase(BorderColor,&draw_info->border_color,
+                (void) QueryColorDatabase(MogrifyBorderColor,&draw_info->border_color,
                   exception);
                 break;
               }
@@ -6140,7 +6140,7 @@ WandExport MagickBooleanType MogrifyImageInfo(ImageInfo *image_info,
             if (*option == '+')
               {
                 (void) DeleteImageOption(image_info,option+1);
-                (void) QueryColorDatabase(BackgroundColor,
+                (void) QueryColorDatabase(MogrifyBackgroundColor,
                   &image_info->background_color,exception);
                 break;
               }
@@ -6184,7 +6184,7 @@ WandExport MagickBooleanType MogrifyImageInfo(ImageInfo *image_info,
             if (*option == '+')
               {
                 (void) DeleteImageOption(image_info,option+1);
-                (void) QueryColorDatabase(BorderColor,&image_info->border_color,
+                (void) QueryColorDatabase(MogrifyBorderColor,&image_info->border_color,
                   exception);
                 break;
               }
@@ -6755,7 +6755,7 @@ WandExport MagickBooleanType MogrifyImageInfo(ImageInfo *image_info,
             if (*option == '+')
               {
                 (void) SetImageOption(image_info,option+1,argv[i+1]);
-                (void) QueryColorDatabase(MatteColor,&image_info->matte_color,
+                (void) QueryColorDatabase(MogrifyMatteColor,&image_info->matte_color,
                   exception);
                 break;
               }