From: cristy <urban-warrior@git.imagemagick.org>
Date: Sat, 18 Jan 2014 15:17:26 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~2832
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4bc3dac42df4f402771274acb9796693b846eb8e;p=imagemagick

---

diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index 34837841c..7943436a0 100644
--- a/MagickWand/operation.c
+++ b/MagickWand/operation.c
@@ -75,6 +75,14 @@
   (void) FormatLocaleFile(stderr, "Geometry = 0x%04X : %lg x %lg %+lg %+lg\n", \
        flags, info.rho, info.sigma, info.xi, info.psi )
 
+/*
+  Constant declaration.
+*/
+const char
+  BackgroundColor[] = "#ffffff",  /* white */
+  BorderColor[] = "#dfdfdf",  /* gray */
+  MatteColor[] = "#bdbdbd";  /* gray */
+
 /*
 ** Function to report on the progress of image operations
 */
@@ -4155,7 +4163,7 @@ WandPrivate MagickBooleanType CLIListOperatorImages(MagickCLI *cli_wand,
               /*
                 Support old style syntax, filter="-option arg1".
               */
-              assert(arg1 != (unsigned char *) NULL);
+              assert(arg1 != (const char *) NULL);
               length=strlen(arg1);
               token=(char *) NULL;
               if (~length >= (MaxTextExtent-1))