Renamed mattecolor to alpha-color.
diff --git a/coders/json.c b/coders/json.c
index a1aab00..727e7ed 100644
--- a/coders/json.c
+++ b/coders/json.c
@@ -1185,12 +1185,12 @@
" \"x\": %.20g,\n \"y\": %.20g\n },\n",
(double) image->extract_info.width,(double) image->extract_info.height,
(double) image->extract_info.x,(double) image->extract_info.y);
+ GetColorTuple(&image->alpha_color,MagickTrue,color);
+ (void) FormatLocaleFile(file," \"alphaColor\": \"%s\",\n",color);
GetColorTuple(&image->background_color,MagickTrue,color);
(void) FormatLocaleFile(file," \"backgroundColor\": \"%s\",\n",color);
GetColorTuple(&image->border_color,MagickTrue,color);
(void) FormatLocaleFile(file," \"borderColor\": \"%s\",\n",color);
- GetColorTuple(&image->matte_color,MagickTrue,color);
- (void) FormatLocaleFile(file," \"matteColor\": \"%s\",\n",color);
GetColorTuple(&image->transparent_color,MagickTrue,color);
(void) FormatLocaleFile(file," \"transparentColor\": \"%s\",\n",color);
JsonFormatLocaleFile(file," \"interlace\": %s,\n",CommandOptionToMnemonic(
diff --git a/coders/miff.c b/coders/miff.c
index 97038da..1ae115c 100644
--- a/coders/miff.c
+++ b/coders/miff.c
@@ -623,6 +623,12 @@
case 'a':
case 'A':
{
+ if (LocaleCompare(keyword,"alpha-color") == 0)
+ {
+ (void) QueryColorCompliance(options,AllCompliance,
+ &image->alpha_color,exception);
+ break;
+ }
if (LocaleCompare(keyword,"alpha-trait") == 0)
{
ssize_t
@@ -829,12 +835,6 @@
BlendPixelTrait;
break;
}
- if (LocaleCompare(keyword,"matte-color") == 0)
- {
- (void) QueryColorCompliance(options,AllCompliance,
- &image->matte_color,exception);
- break;
- }
if (LocaleCompare(keyword,"montage") == 0)
{
(void) CloneString(&image->montage,options);
diff --git a/coders/mpc.c b/coders/mpc.c
index 8264a68..f56db27 100644
--- a/coders/mpc.c
+++ b/coders/mpc.c
@@ -338,6 +338,12 @@
case 'a':
case 'A':
{
+ if (LocaleCompare(keyword,"alpha-color") == 0)
+ {
+ (void) QueryColorCompliance(options,AllCompliance,
+ &image->alpha_color,exception);
+ break;
+ }
if (LocaleCompare(keyword,"alpha-trait") == 0)
{
ssize_t
@@ -530,12 +536,6 @@
signature=(unsigned int) StringToUnsignedLong(options);
break;
}
- if (LocaleCompare(keyword,"matte-color") == 0)
- {
- (void) QueryColorCompliance(options,AllCompliance,
- &image->matte_color,exception);
- break;
- }
if (LocaleCompare(keyword,"maximum-error") == 0)
{
image->error.normalized_maximum_error=StringToDouble(
diff --git a/coders/msl.c b/coders/msl.c
index bc947b1..2b79b84 100644
--- a/coders/msl.c
+++ b/coders/msl.c
@@ -3081,7 +3081,7 @@
if (LocaleCompare(keyword, "fill") == 0)
{
(void) QueryColorCompliance(value,AllCompliance,
- &msl_info->image[n]->matte_color,exception);
+ &msl_info->image[n]->alpha_color,exception);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",
@@ -7977,6 +7977,12 @@
exception);
break;
}
+ if (LocaleCompare(keyword,"alpha-color") == 0)
+ {
+ (void) QueryColorCompliance(value,AllCompliance,
+ &image_info->alpha_color,exception);
+ break;
+ }
if (LocaleCompare(keyword,"antialias") == 0)
{
ssize_t
@@ -8108,12 +8114,6 @@
(void) CopyMagickString(image_info->magick,value,MagickPathExtent);
break;
}
- if (LocaleCompare(keyword,"mattecolor") == 0)
- {
- (void) QueryColorCompliance(value,AllCompliance,
- &image_info->matte_color,exception);
- break;
- }
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
break;
}