diff --git a/MagickCore/animate.c b/MagickCore/animate.c
index 8105c5b..e9ce6c2 100644
--- a/MagickCore/animate.c
+++ b/MagickCore/animate.c
@@ -916,7 +916,7 @@
(visual_info->klass == TrueColor) ||
(visual_info->klass == DirectColor))
(void) SetImageType(image_list[scene],image_list[scene]->alpha_trait ==
- BlendPixelTrait ? TrueColorType : TrueColorMatteType,exception);
+ BlendPixelTrait ? TrueColorType : TrueColorAlphaType,exception);
if ((display_image->columns < image_list[scene]->columns) &&
(display_image->rows < image_list[scene]->rows))
display_image=image_list[scene];
@@ -924,7 +924,7 @@
if ((resource_info->map_type != (char *) NULL) ||
(visual_info->klass == TrueColor) || (visual_info->klass == DirectColor))
(void) SetImageType(display_image,display_image->alpha_trait !=
- BlendPixelTrait ? TrueColorType : TrueColorMatteType,exception);
+ BlendPixelTrait ? TrueColorType : TrueColorAlphaType,exception);
XMakeStandardColormap(display,visual_info,&resources,display_image,map_info,
&pixel,exception);
/*
@@ -1540,7 +1540,7 @@
(visual_info->klass == TrueColor) ||
(visual_info->klass == DirectColor))
(void) SetImageType(image_list[scene],image_list[scene]->alpha_trait ==
- BlendPixelTrait ? TrueColorType : TrueColorMatteType,exception);
+ BlendPixelTrait ? TrueColorType : TrueColorAlphaType,exception);
if ((display_image->columns < image_list[scene]->columns) &&
(display_image->rows < image_list[scene]->rows))
display_image=image_list[scene];
diff --git a/MagickCore/attribute.c b/MagickCore/attribute.c
index 906e2dc..e6c3575 100644
--- a/MagickCore/attribute.c
+++ b/MagickCore/attribute.c
@@ -598,24 +598,24 @@
{
if (image->alpha_trait == UndefinedPixelTrait)
return(ColorSeparationType);
- return(ColorSeparationMatteType);
+ return(ColorSeparationAlphaType);
}
if (IsImageMonochrome(image,exception) != MagickFalse)
return(BilevelType);
if (IsImageGray(image,exception) != MagickFalse)
{
if (image->alpha_trait != UndefinedPixelTrait)
- return(GrayscaleMatteType);
+ return(GrayscaleAlphaType);
return(GrayscaleType);
}
if (IsPaletteImage(image,exception) != MagickFalse)
{
if (image->alpha_trait != UndefinedPixelTrait)
- return(PaletteMatteType);
+ return(PaletteAlphaType);
return(PaletteType);
}
if (image->alpha_trait != UndefinedPixelTrait)
- return(TrueColorMatteType);
+ return(TrueColorAlphaType);
return(TrueColorType);
}
@@ -668,7 +668,7 @@
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if ((image->type == BilevelType) || (image->type == GrayscaleType) ||
- (image->type == GrayscaleMatteType))
+ (image->type == GrayscaleAlphaType))
return(MagickTrue);
if ((IsGrayColorspace(image->colorspace) == MagickFalse) &&
(IssRGBCompatibleColorspace(image->colorspace) == MagickFalse))
@@ -703,7 +703,7 @@
return(MagickFalse);
((Image *) image)->type=type;
if ((type == GrayscaleType) && (image->alpha_trait != UndefinedPixelTrait))
- ((Image *) image)->type=GrayscaleMatteType;
+ ((Image *) image)->type=GrayscaleAlphaType;
return(MagickTrue);
}
@@ -1167,7 +1167,7 @@
image->alpha_trait=UndefinedPixelTrait;
break;
}
- case GrayscaleMatteType:
+ case GrayscaleAlphaType:
{
if (IsImageGray(image,exception) == MagickFalse)
status=TransformImageColorspace(image,GRAYColorspace,exception);
@@ -1189,7 +1189,7 @@
image->alpha_trait=UndefinedPixelTrait;
break;
}
- case PaletteBilevelMatteType:
+ case PaletteBilevelAlphaType:
{
ChannelType
channel_mask;
@@ -1206,7 +1206,7 @@
quantize_info=DestroyQuantizeInfo(quantize_info);
break;
}
- case PaletteMatteType:
+ case PaletteAlphaType:
{
if (IssRGBCompatibleColorspace(image->colorspace) == MagickFalse)
status=TransformImageColorspace(image,sRGBColorspace,exception);
@@ -1227,7 +1227,7 @@
image->alpha_trait=UndefinedPixelTrait;
break;
}
- case TrueColorMatteType:
+ case TrueColorAlphaType:
{
if (IssRGBCompatibleColorspace(image->colorspace) == MagickFalse)
status=TransformImageColorspace(image,sRGBColorspace,exception);
@@ -1250,7 +1250,7 @@
image->alpha_trait=UndefinedPixelTrait;
break;
}
- case ColorSeparationMatteType:
+ case ColorSeparationAlphaType:
{
if (image->colorspace != CMYKColorspace)
{
diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c
index 2442856..e3cdb53 100644
--- a/MagickCore/colorspace.c
+++ b/MagickCore/colorspace.c
@@ -318,7 +318,7 @@
}
image_view=DestroyCacheView(image_view);
image->type=image->alpha_trait == UndefinedPixelTrait ? ColorSeparationType :
- ColorSeparationMatteType;
+ ColorSeparationAlphaType;
if (SetImageColorspace(image,colorspace,exception) == MagickFalse)
return(MagickFalse);
return(status);
diff --git a/MagickCore/display.c b/MagickCore/display.c
index 0ab21cf..5757511 100644
--- a/MagickCore/display.c
+++ b/MagickCore/display.c
@@ -7995,7 +7995,7 @@
XSetCursorState(display,windows,MagickTrue);
XCheckRefreshWindows(display,windows);
(void) SetImageType(*image,(*image)->alpha_trait == UndefinedPixelTrait ?
- GrayscaleType : GrayscaleMatteType,exception);
+ GrayscaleType : GrayscaleAlphaType,exception);
XSetCursorState(display,windows,MagickFalse);
if (IfMagickTrue(windows->image.orphan) )
break;
diff --git a/MagickCore/image.h b/MagickCore/image.h
index ae2765c..e17b44d 100644
--- a/MagickCore/image.h
+++ b/MagickCore/image.h
@@ -53,15 +53,15 @@
UndefinedType,
BilevelType,
GrayscaleType,
- GrayscaleMatteType,
+ GrayscaleAlphaType,
PaletteType,
- PaletteMatteType,
+ PaletteAlphaType,
TrueColorType,
- TrueColorMatteType,
+ TrueColorAlphaType,
ColorSeparationType,
- ColorSeparationMatteType,
+ ColorSeparationAlphaType,
OptimizeType,
- PaletteBilevelMatteType
+ PaletteBilevelAlphaType
} ImageType;
typedef enum
diff --git a/MagickCore/option.c b/MagickCore/option.c
index efc0dfa..7db8f5b 100644
--- a/MagickCore/option.c
+++ b/MagickCore/option.c
@@ -1675,19 +1675,19 @@
{ "Undefined", UndefinedType, UndefinedOptionFlag, MagickTrue },
{ "Bilevel", BilevelType, UndefinedOptionFlag, MagickFalse },
{ "ColorSeparation", ColorSeparationType, UndefinedOptionFlag, MagickFalse },
- { "ColorSeparationAlpha", ColorSeparationMatteType, UndefinedOptionFlag, MagickFalse },
- { "ColorSeparationMatte", ColorSeparationMatteType, UndefinedOptionFlag, MagickFalse },
+ { "ColorSeparationAlpha", ColorSeparationAlphaType, UndefinedOptionFlag, MagickFalse },
+ { "ColorSeparationMatte", ColorSeparationAlphaType, UndefinedOptionFlag, MagickFalse },
{ "Grayscale", GrayscaleType, UndefinedOptionFlag, MagickFalse },
- { "GrayscaleAlpha", GrayscaleMatteType, UndefinedOptionFlag, MagickFalse },
- { "GrayscaleMatte", GrayscaleMatteType, UndefinedOptionFlag, MagickFalse },
+ { "GrayscaleAlpha", GrayscaleAlphaType, UndefinedOptionFlag, MagickFalse },
+ { "GrayscaleMatte", GrayscaleAlphaType, UndefinedOptionFlag, MagickFalse },
{ "Optimize", OptimizeType, UndefinedOptionFlag, MagickFalse },
{ "Palette", PaletteType, UndefinedOptionFlag, MagickFalse },
- { "PaletteBilevelAlpha", PaletteBilevelMatteType, UndefinedOptionFlag, MagickFalse },
- { "PaletteBilevelMatte", PaletteBilevelMatteType, UndefinedOptionFlag, MagickFalse },
- { "PaletteAlpha", PaletteMatteType, UndefinedOptionFlag, MagickFalse },
- { "PaletteMatte", PaletteMatteType, UndefinedOptionFlag, MagickFalse },
- { "TrueColorAlpha", TrueColorMatteType, UndefinedOptionFlag, MagickFalse },
- { "TrueColorMatte", TrueColorMatteType, UndefinedOptionFlag, MagickFalse },
+ { "PaletteBilevelAlpha", PaletteBilevelAlphaType, UndefinedOptionFlag, MagickFalse },
+ { "PaletteBilevelMatte", PaletteBilevelAlphaType, UndefinedOptionFlag, MagickFalse },
+ { "PaletteAlpha", PaletteAlphaType, UndefinedOptionFlag, MagickFalse },
+ { "PaletteMatte", PaletteAlphaType, UndefinedOptionFlag, MagickFalse },
+ { "TrueColorAlpha", TrueColorAlphaType, UndefinedOptionFlag, MagickFalse },
+ { "TrueColorMatte", TrueColorAlphaType, UndefinedOptionFlag, MagickFalse },
{ "TrueColor", TrueColorType, UndefinedOptionFlag, MagickFalse },
{ (char *) NULL, UndefinedType, UndefinedOptionFlag, MagickFalse }
},
diff --git a/MagickCore/profile.c b/MagickCore/profile.c
index 8d1c382..d061d3e 100644
--- a/MagickCore/profile.c
+++ b/MagickCore/profile.c
@@ -1237,19 +1237,19 @@
case cmsSigRgbData:
{
image->type=image->alpha_trait == UndefinedPixelTrait ?
- TrueColorType : TrueColorMatteType;
+ TrueColorType : TrueColorAlphaType;
break;
}
case cmsSigCmykData:
{
image->type=image->alpha_trait == UndefinedPixelTrait ?
- ColorSeparationType : ColorSeparationMatteType;
+ ColorSeparationType : ColorSeparationAlphaType;
break;
}
case cmsSigGrayData:
{
image->type=image->alpha_trait == UndefinedPixelTrait ?
- GrayscaleType : GrayscaleMatteType;
+ GrayscaleType : GrayscaleAlphaType;
break;
}
default:
diff --git a/MagickCore/version.h b/MagickCore/version.h
index fe7fe54..4120cea 100644
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,7 +27,7 @@
*/
#define MagickPackageName "ImageMagick"
#define MagickCopyright "Copyright (C) 1999-2015 ImageMagick Studio LLC"
-#define MagickSVNRevision "17601:17619M"
+#define MagickSVNRevision "17767M"
#define MagickLibVersion 0x700
#define MagickLibVersionText "7.0.0"
#define MagickLibVersionNumber 1,0,0
@@ -48,7 +48,7 @@
#define MagickppLibAddendum "-0"
#define MagickppLibInterface 1
#define MagickppLibMinInterface 1
-#define MagickReleaseDate "2015-01-09"
+#define MagickReleaseDate "2015-01-22"
#define MagickChangeDate "20120427"
#define MagickAuthoritativeURL "http://www.imagemagick.org"
#define MagickFeatures "DPC HDRI OpenMP"