diff --git a/Magick++/lib/Magick++/Include.h b/Magick++/lib/Magick++/Include.h
index cd96dfc..48d9b09 100644
--- a/Magick++/lib/Magick++/Include.h
+++ b/Magick++/lib/Magick++/Include.h
@@ -624,15 +624,15 @@
using MagickCore::UndefinedType;
using MagickCore::BilevelType;
using MagickCore::GrayscaleType;
- using MagickCore::GrayscaleMatteType;
+ using MagickCore::GrayscaleAlphaType;
using MagickCore::PaletteType;
- using MagickCore::PaletteMatteType;
+ using MagickCore::PaletteAlphaType;
using MagickCore::TrueColorType;
- using MagickCore::TrueColorMatteType;
+ using MagickCore::TrueColorAlphaType;
using MagickCore::ColorSeparationType;
- using MagickCore::ColorSeparationMatteType;
+ using MagickCore::ColorSeparationAlphaType;
using MagickCore::OptimizeType;
- using MagickCore::PaletteBilevelMatteType;
+ using MagickCore::PaletteBilevelAlphaType;
// Interlace types
using MagickCore::InterlaceType;
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"
diff --git a/MagickWand/magick-image.c b/MagickWand/magick-image.c
index 51a76af..6c49690 100644
--- a/MagickWand/magick-image.c
+++ b/MagickWand/magick-image.c
@@ -10302,8 +10302,8 @@
% o wand: the magick wand.
%
% o image_type: the image type: UndefinedType, BilevelType, GrayscaleType,
-% GrayscaleMatteType, PaletteType, PaletteMatteType, TrueColorType,
-% TrueColorMatteType, ColorSeparationType, ColorSeparationMatteType,
+% GrayscaleAlphaType, PaletteType, PaletteAlphaType, TrueColorType,
+% TrueColorAlphaType, ColorSeparationType, ColorSeparationAlphaType,
% or OptimizeType.
%
*/
diff --git a/MagickWand/magick-property.c b/MagickWand/magick-property.c
index a733870..0c4903d 100644
--- a/MagickWand/magick-property.c
+++ b/MagickWand/magick-property.c
@@ -2969,8 +2969,8 @@
% o wand: the magick wand.
%
% o image_type: the image type: UndefinedType, BilevelType, GrayscaleType,
-% GrayscaleMatteType, PaletteType, PaletteMatteType, TrueColorType,
-% TrueColorMatteType, ColorSeparationType, ColorSeparationMatteType,
+% GrayscaleAlphaType, PaletteType, PaletteAlphaType, TrueColorType,
+% TrueColorAlphaType, ColorSeparationType, ColorSeparationAlphaType,
% or OptimizeType.
%
*/
diff --git a/Makefile.in b/Makefile.in
index 6ef095d..88de3a1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -568,12 +568,12 @@
coders/txt.c coders/uil.c coders/url.c coders/uyvy.c \
coders/vicar.c coders/vid.c coders/viff.c coders/vips.c \
coders/wbmp.c coders/wpg.c coders/xbm.c coders/xc.c \
- coders/xcf.c coders/xpm.c coders/xps.c coders/ycbcr.c \
- coders/yuv.c coders/dps.c coders/djvu.c coders/exr.c \
- coders/fpx.c coders/clipboard.c coders/emf.c coders/jbig.c \
- coders/jpeg.c coders/jp2.c coders/png.c coders/ept.c \
- coders/tiff.c coders/webp.c coders/wmf.c coders/x.c \
- coders/xwd.c filters/analyze.c
+ coders/xcf.c coders/xpm.c coders/xps.c coders/xtrn.c \
+ coders/ycbcr.c coders/yuv.c coders/dps.c coders/djvu.c \
+ coders/exr.c coders/fpx.c coders/clipboard.c coders/emf.c \
+ coders/jbig.c coders/jpeg.c coders/jp2.c coders/png.c \
+ coders/ept.c coders/tiff.c coders/webp.c coders/wmf.c \
+ coders/x.c coders/xwd.c filters/analyze.c
am__objects_1 = MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-accelerate.lo \
MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-animate.lo \
MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-annotate.lo \
@@ -793,6 +793,7 @@
coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-xcf.lo \
coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-xpm.lo \
coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-xps.lo \
+ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-xtrn.lo \
coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-ycbcr.lo \
coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-yuv.lo \
$(am__objects_3) $(am__objects_4) $(am__objects_5) \
@@ -1807,6 +1808,14 @@
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(coders_xps_la_LDFLAGS) $(LDFLAGS) -o $@
@WITH_MODULES_TRUE@am_coders_xps_la_rpath = -rpath $(codersdir)
+coders_xtrn_la_DEPENDENCIES = $(MAGICKCORE_LIBS)
+am_coders_xtrn_la_OBJECTS = coders/coders_xtrn_la-xtrn.lo
+coders_xtrn_la_OBJECTS = $(am_coders_xtrn_la_OBJECTS)
+coders_xtrn_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(AM_CFLAGS) $(CFLAGS) $(coders_xtrn_la_LDFLAGS) $(LDFLAGS) -o \
+ $@
+@WITH_MODULES_TRUE@am_coders_xtrn_la_rpath = -rpath $(codersdir)
coders_xwd_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1)
am_coders_xwd_la_OBJECTS = coders/coders_xwd_la-xwd.lo
coders_xwd_la_OBJECTS = $(am_coders_xwd_la_OBJECTS)
@@ -2175,9 +2184,9 @@
$(coders_x_la_SOURCES) $(coders_xbm_la_SOURCES) \
$(coders_xc_la_SOURCES) $(coders_xcf_la_SOURCES) \
$(coders_xpm_la_SOURCES) $(coders_xps_la_SOURCES) \
- $(coders_xwd_la_SOURCES) $(coders_ycbcr_la_SOURCES) \
- $(coders_yuv_la_SOURCES) $(filters_analyze_la_SOURCES) \
- $(Magick___demo_analyze_SOURCES) \
+ $(coders_xtrn_la_SOURCES) $(coders_xwd_la_SOURCES) \
+ $(coders_ycbcr_la_SOURCES) $(coders_yuv_la_SOURCES) \
+ $(filters_analyze_la_SOURCES) $(Magick___demo_analyze_SOURCES) \
$(Magick___demo_button_SOURCES) $(Magick___demo_demo_SOURCES) \
$(Magick___demo_detrans_SOURCES) $(Magick___demo_flip_SOURCES) \
$(Magick___demo_gravity_SOURCES) \
@@ -2266,9 +2275,9 @@
$(coders_x_la_SOURCES) $(coders_xbm_la_SOURCES) \
$(coders_xc_la_SOURCES) $(coders_xcf_la_SOURCES) \
$(coders_xpm_la_SOURCES) $(coders_xps_la_SOURCES) \
- $(coders_xwd_la_SOURCES) $(coders_ycbcr_la_SOURCES) \
- $(coders_yuv_la_SOURCES) $(filters_analyze_la_SOURCES) \
- $(Magick___demo_analyze_SOURCES) \
+ $(coders_xtrn_la_SOURCES) $(coders_xwd_la_SOURCES) \
+ $(coders_ycbcr_la_SOURCES) $(coders_yuv_la_SOURCES) \
+ $(filters_analyze_la_SOURCES) $(Magick___demo_analyze_SOURCES) \
$(Magick___demo_button_SOURCES) $(Magick___demo_demo_SOURCES) \
$(Magick___demo_detrans_SOURCES) $(Magick___demo_flip_SOURCES) \
$(Magick___demo_gravity_SOURCES) \
@@ -3243,6 +3252,7 @@
coders/xcf.c \
coders/xpm.c \
coders/xps.c \
+ coders/xtrn.c \
coders/ycbcr.c \
coders/yuv.c \
$(MAGICKCORE_DPS_SRCS) \
@@ -3368,6 +3378,7 @@
@WITH_MODULES_TRUE@ coders/xcf.la \
@WITH_MODULES_TRUE@ coders/xpm.la \
@WITH_MODULES_TRUE@ coders/xps.la \
+@WITH_MODULES_TRUE@ coders/xtrn.la \
@WITH_MODULES_TRUE@ coders/ycbcr.la \
@WITH_MODULES_TRUE@ coders/yuv.la \
@WITH_MODULES_TRUE@ $(MAGICKCORE_DPS_MODULES) \
@@ -4117,6 +4128,12 @@
coders_xps_la_LDFLAGS = $(MODULECOMMONFLAGS)
coders_xps_la_LIBADD = $(MAGICKCORE_LIBS) $(MUPDF_LIBS) $(FREETYPE_LIBS) $(MATH_LIBS)
+# XPS coder module
+coders_xtrn_la_SOURCES = coders/xtrn.c
+coders_xtrn_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS)
+coders_xtrn_la_LDFLAGS = $(MODULECOMMONFLAGS)
+coders_xtrn_la_LIBADD = $(MAGICKCORE_LIBS)
+
# XWD coder module
coders_xwd_la_SOURCES = coders/xwd.c
coders_xwd_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS)
@@ -6032,6 +6049,8 @@
coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp)
coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-xps.lo: \
coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-xtrn.lo: \
+ coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp)
coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-ycbcr.lo: \
coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp)
coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-yuv.lo: \
@@ -6770,6 +6789,11 @@
coders/xps.la: $(coders_xps_la_OBJECTS) $(coders_xps_la_DEPENDENCIES) $(EXTRA_coders_xps_la_DEPENDENCIES) coders/$(am__dirstamp)
$(AM_V_CCLD)$(coders_xps_la_LINK) $(am_coders_xps_la_rpath) $(coders_xps_la_OBJECTS) $(coders_xps_la_LIBADD) $(LIBS)
+coders/coders_xtrn_la-xtrn.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+
+coders/xtrn.la: $(coders_xtrn_la_OBJECTS) $(coders_xtrn_la_DEPENDENCIES) $(EXTRA_coders_xtrn_la_DEPENDENCIES) coders/$(am__dirstamp)
+ $(AM_V_CCLD)$(coders_xtrn_la_LINK) $(am_coders_xtrn_la_rpath) $(coders_xtrn_la_OBJECTS) $(coders_xtrn_la_LIBADD) $(LIBS)
coders/coders_xwd_la-xwd.lo: coders/$(am__dirstamp) \
coders/$(DEPDIR)/$(am__dirstamp)
@@ -7439,6 +7463,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-xcf.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-xpm.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-xps.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-xtrn.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-xwd.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-ycbcr.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-yuv.Plo@am__quote@
@@ -7564,6 +7589,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_xcf_la-xcf.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_xpm_la-xpm.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_xps_la-xps.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_xtrn_la-xtrn.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_xwd_la-xwd.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_ycbcr_la-ycbcr.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_yuv_la-yuv.Plo@am__quote@
@@ -9022,6 +9048,13 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-xps.lo `test -f 'coders/xps.c' || echo '$(srcdir)/'`coders/xps.c
+coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-xtrn.lo: coders/xtrn.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-xtrn.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-xtrn.Tpo -c -o coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-xtrn.lo `test -f 'coders/xtrn.c' || echo '$(srcdir)/'`coders/xtrn.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-xtrn.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-xtrn.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='coders/xtrn.c' object='coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-xtrn.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-xtrn.lo `test -f 'coders/xtrn.c' || echo '$(srcdir)/'`coders/xtrn.c
+
coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-ycbcr.lo: coders/ycbcr.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-ycbcr.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-ycbcr.Tpo -c -o coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-ycbcr.lo `test -f 'coders/ycbcr.c' || echo '$(srcdir)/'`coders/ycbcr.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-ycbcr.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-ycbcr.Plo
@@ -10177,6 +10210,13 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_xps_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/coders_xps_la-xps.lo `test -f 'coders/xps.c' || echo '$(srcdir)/'`coders/xps.c
+coders/coders_xtrn_la-xtrn.lo: coders/xtrn.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_xtrn_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/coders_xtrn_la-xtrn.lo -MD -MP -MF coders/$(DEPDIR)/coders_xtrn_la-xtrn.Tpo -c -o coders/coders_xtrn_la-xtrn.lo `test -f 'coders/xtrn.c' || echo '$(srcdir)/'`coders/xtrn.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/coders_xtrn_la-xtrn.Tpo coders/$(DEPDIR)/coders_xtrn_la-xtrn.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='coders/xtrn.c' object='coders/coders_xtrn_la-xtrn.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_xtrn_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/coders_xtrn_la-xtrn.lo `test -f 'coders/xtrn.c' || echo '$(srcdir)/'`coders/xtrn.c
+
coders/coders_xwd_la-xwd.lo: coders/xwd.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_xwd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/coders_xwd_la-xwd.lo -MD -MP -MF coders/$(DEPDIR)/coders_xwd_la-xwd.Tpo -c -o coders/coders_xwd_la-xwd.lo `test -f 'coders/xwd.c' || echo '$(srcdir)/'`coders/xwd.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/coders_xwd_la-xwd.Tpo coders/$(DEPDIR)/coders_xwd_la-xwd.Plo
diff --git a/coders/Makefile.am b/coders/Makefile.am
index fea3e95..d3f1067 100644
--- a/coders/Makefile.am
+++ b/coders/Makefile.am
@@ -195,6 +195,7 @@
coders/xcf.c \
coders/xpm.c \
coders/xps.c \
+ coders/xtrn.c \
coders/ycbcr.c \
coders/yuv.c \
$(MAGICKCORE_DPS_SRCS) \
@@ -320,6 +321,7 @@
coders/xcf.la \
coders/xpm.la \
coders/xps.la \
+ coders/xtrn.la \
coders/ycbcr.la \
coders/yuv.la \
$(MAGICKCORE_DPS_MODULES) \
@@ -1071,6 +1073,12 @@
coders_xps_la_LDFLAGS = $(MODULECOMMONFLAGS)
coders_xps_la_LIBADD = $(MAGICKCORE_LIBS) $(MUPDF_LIBS) $(FREETYPE_LIBS) $(MATH_LIBS)
+# XPS coder module
+coders_xtrn_la_SOURCES = coders/xtrn.c
+coders_xtrn_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS)
+coders_xtrn_la_LDFLAGS = $(MODULECOMMONFLAGS)
+coders_xtrn_la_LIBADD = $(MAGICKCORE_LIBS)
+
# XWD coder module
coders_xwd_la_SOURCES = coders/xwd.c
coders_xwd_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS)
diff --git a/coders/dds.c b/coders/dds.c
index 47962cd..7b3382c 100644
--- a/coders/dds.c
+++ b/coders/dds.c
@@ -2206,7 +2206,7 @@
else if (IsBitMask(dds_info->pixelformat,0x00ff,0x00ff,0x00ff,0xff00))
{
alphaBits=2;
- (void) SetImageType(image,GrayscaleMatteType,exception);
+ (void) SetImageType(image,GrayscaleAlphaType,exception);
}
else if (IsBitMask(dds_info->pixelformat,0x0f00,0x00f0,0x000f,0xf000))
alphaBits=4;
diff --git a/coders/gif.c b/coders/gif.c
index 57aa7f0..bd2ccaa 100644
--- a/coders/gif.c
+++ b/coders/gif.c
@@ -1586,7 +1586,7 @@
Identify transparent colormap index.
*/
if ((image->storage_class == DirectClass) || (image->colors > 256))
- (void) SetImageType(image,PaletteBilevelMatteType,exception);
+ (void) SetImageType(image,PaletteBilevelAlphaType,exception);
for (i=0; i < (ssize_t) image->colors; i++)
if (image->colormap[i].alpha != OpaqueAlpha)
{
@@ -1603,7 +1603,7 @@
}
if (opacity == -1)
{
- (void) SetImageType(image,PaletteBilevelMatteType,exception);
+ (void) SetImageType(image,PaletteBilevelAlphaType,exception);
for (i=0; i < (ssize_t) image->colors; i++)
if (image->colormap[i].alpha != OpaqueAlpha)
{
diff --git a/coders/matte.c b/coders/matte.c
index 988064e..83de61d 100644
--- a/coders/matte.c
+++ b/coders/matte.c
@@ -180,7 +180,7 @@
matte_image=CloneImage(image,image->columns,image->rows,MagickTrue,exception);
if (matte_image == (Image *) NULL)
return(MagickFalse);
- (void) SetImageType(matte_image,TrueColorMatteType,exception);
+ (void) SetImageType(matte_image,TrueColorAlphaType,exception);
matte_image->alpha_trait=UndefinedPixelTrait;
/*
Convert image to matte pixels.
diff --git a/coders/msl.c b/coders/msl.c
index b85e1b0..66e7280 100644
--- a/coders/msl.c
+++ b/coders/msl.c
@@ -1913,7 +1913,7 @@
if ((attribute != (const char *) NULL) &&
(LocaleCompare(value,value) == 0))
{
- SetImageType(composite_image,TrueColorMatteType,
+ SetImageType(composite_image,TrueColorAlphaType,
exception);
(void) CompositeImage(composite_image,
msl_info->image[j],CopyAlphaCompositeOp,MagickTrue,
diff --git a/coders/png.c b/coders/png.c
index 76f1dd4..8c02b6d 100644
--- a/coders/png.c
+++ b/coders/png.c
@@ -3763,13 +3763,13 @@
if (image->alpha_trait != UndefinedPixelTrait)
{
if (ping_color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
- (void) SetImageType(image,GrayscaleMatteType,exception);
+ (void) SetImageType(image,GrayscaleAlphaType,exception);
else if (ping_color_type == PNG_COLOR_TYPE_PALETTE)
- (void) SetImageType(image,PaletteMatteType,exception);
+ (void) SetImageType(image,PaletteAlphaType,exception);
else
- (void) SetImageType(image,TrueColorMatteType,exception);
+ (void) SetImageType(image,TrueColorAlphaType,exception);
}
else
@@ -9654,14 +9654,14 @@
image_matte=MagickFalse;
}
- if (image_info->type == TrueColorMatteType)
+ if (image_info->type == TrueColorAlphaType)
{
ping_color_type=(png_byte) PNG_COLOR_TYPE_RGB_ALPHA;
image_matte=MagickTrue;
}
if (image_info->type == PaletteType ||
- image_info->type == PaletteMatteType)
+ image_info->type == PaletteAlphaType)
ping_color_type=(png_byte) PNG_COLOR_TYPE_PALETTE;
if (mng_info->write_png_colortype == 0 &&
@@ -11583,7 +11583,7 @@
image->depth = 8;
if (image->alpha_trait != UndefinedPixelTrait)
- (void) SetImageType(image,TrueColorMatteType,exception);
+ (void) SetImageType(image,TrueColorAlphaType,exception);
else
(void) SetImageType(image,TrueColorType,exception);
@@ -11598,7 +11598,7 @@
image->depth = 8;
image->alpha_trait = BlendPixelTrait;
- (void) SetImageType(image,TrueColorMatteType,exception);
+ (void) SetImageType(image,TrueColorAlphaType,exception);
(void) SyncImage(image,exception);
}
@@ -11609,7 +11609,7 @@
image->depth = 16;
if (image->alpha_trait != UndefinedPixelTrait)
- (void) SetImageType(image,TrueColorMatteType,exception);
+ (void) SetImageType(image,TrueColorAlphaType,exception);
else
(void) SetImageType(image,TrueColorType,exception);
@@ -11624,7 +11624,7 @@
image->depth = 16;
image->alpha_trait = BlendPixelTrait;
- (void) SetImageType(image,TrueColorMatteType,exception);
+ (void) SetImageType(image,TrueColorAlphaType,exception);
(void) SyncImage(image,exception);
}
@@ -12152,8 +12152,8 @@
jpeg_image_info=(ImageInfo *) NULL;
status=MagickTrue;
- transparent=image_info->type==GrayscaleMatteType ||
- image_info->type==TrueColorMatteType || image->alpha_trait != UndefinedPixelTrait;
+ transparent=image_info->type==GrayscaleAlphaType ||
+ image_info->type==TrueColorAlphaType || image->alpha_trait != UndefinedPixelTrait;
jng_alpha_sample_depth = 0;
@@ -12209,7 +12209,7 @@
/* To do: check bit depth of PNG alpha channel */
/* Check if image is grayscale. */
- if (image_info->type != TrueColorMatteType && image_info->type !=
+ if (image_info->type != TrueColorAlphaType && image_info->type !=
TrueColorType && IsImageGray(image,exception))
jng_color_type-=2;
diff --git a/coders/ps3.c b/coders/ps3.c
index db2a2d9..594f8d0 100644
--- a/coders/ps3.c
+++ b/coders/ps3.c
@@ -1255,9 +1255,9 @@
pixels=(unsigned char *) NULL;
length=0;
if ((image_info->type != TrueColorType) &&
- (image_info->type != TrueColorMatteType) &&
+ (image_info->type != TrueColorAlphaType) &&
(image_info->type != ColorSeparationType) &&
- (image_info->type != ColorSeparationMatteType) &&
+ (image_info->type != ColorSeparationAlphaType) &&
(image->colorspace != CMYKColorspace) &&
((IsImageGray(image,exception) != MagickFalse) ||
(IsImageMonochrome(image,exception) != MagickFalse)))
diff --git a/coders/sixel.c b/coders/sixel.c
index 5f7628d..10a1465 100644
--- a/coders/sixel.c
+++ b/coders/sixel.c
@@ -1230,7 +1230,7 @@
Identify transparent colormap index.
*/
if ((image->storage_class == DirectClass) || (image->colors > 256))
- (void) SetImageType(image,PaletteBilevelMatteType,exception);
+ (void) SetImageType(image,PaletteBilevelAlphaType,exception);
for (i=0; i < (ssize_t) image->colors; i++)
if (image->colormap[i].alpha != OpaqueAlpha)
{
@@ -1246,7 +1246,7 @@
}
if (opacity == -1)
{
- (void) SetImageType(image,PaletteBilevelMatteType,exception);
+ (void) SetImageType(image,PaletteBilevelAlphaType,exception);
for (i=0; i < (ssize_t) image->colors; i++)
if (image->colormap[i].alpha != OpaqueAlpha)
{
diff --git a/coders/tga.c b/coders/tga.c
index 852ea9f..37a44cc 100644
--- a/coders/tga.c
+++ b/coders/tga.c
@@ -773,7 +773,7 @@
tga_info.bits_per_pixel=8;
tga_info.attributes=0;
if ((image_info->type != TrueColorType) &&
- (image_info->type != TrueColorMatteType) &&
+ (image_info->type != TrueColorAlphaType) &&
(image_info->type != PaletteType) &&
(image->alpha_trait == UndefinedPixelTrait) &&
(IsImageGray(image,exception) != MagickFalse))
diff --git a/coders/thumbnail.c b/coders/thumbnail.c
index c04802c..5bfa07e 100644
--- a/coders/thumbnail.c
+++ b/coders/thumbnail.c
@@ -206,7 +206,7 @@
if (thumbnail_image == (Image *) NULL)
return(MagickFalse);
(void) SetImageType(thumbnail_image,thumbnail_image->alpha_trait == UndefinedPixelTrait ?
- TrueColorType : TrueColorMatteType,exception);
+ TrueColorType : TrueColorAlphaType,exception);
(void) CopyMagickString(thumbnail_image->filename,image->filename,
MaxTextExtent);
write_info=CloneImageInfo(image_info);
diff --git a/coders/tiff.c b/coders/tiff.c
index 04740f4..b844344 100644
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -3203,7 +3203,7 @@
photometric=PHOTOMETRIC_RGB;
(void) TIFFSetField(tiff,TIFFTAG_SAMPLESPERPIXEL,3);
if ((image_info->type != TrueColorType) &&
- (image_info->type != TrueColorMatteType))
+ (image_info->type != TrueColorAlphaType))
{
if ((image_info->type != PaletteType) &&
(IsImageGray(image,exception) != MagickFalse))
diff --git a/coders/xpm.c b/coders/xpm.c
index 29eb881..2426257 100644
--- a/coders/xpm.c
+++ b/coders/xpm.c
@@ -929,7 +929,7 @@
Identify transparent colormap index.
*/
if ((image->storage_class == DirectClass) || (image->colors > 256))
- (void) SetImageType(image,PaletteBilevelMatteType,exception);
+ (void) SetImageType(image,PaletteBilevelAlphaType,exception);
for (i=0; i < (ssize_t) image->colors; i++)
if (image->colormap[i].alpha != OpaqueAlpha)
{
@@ -947,7 +947,7 @@
}
if (opacity == -1)
{
- (void) SetImageType(image,PaletteBilevelMatteType,exception);
+ (void) SetImageType(image,PaletteBilevelAlphaType,exception);
for (i=0; i < (ssize_t) image->colors; i++)
if (image->colormap[i].alpha != OpaqueAlpha)
{
diff --git a/coders/xtrn.c b/coders/xtrn.c
index 6abfed5..b408596 100644
--- a/coders/xtrn.c
+++ b/coders/xtrn.c
@@ -56,7 +56,6 @@
/*
Include declarations.
*/
-#if defined(_VISUALC_)
#include "MagickCore/studio.h"
#include "MagickCore/blob.h"
#include "MagickCore/blob-private.h"
@@ -70,6 +69,7 @@
#include "MagickCore/MagickCore.h"
#include "MagickCore/memory_.h"
#include "MagickCore/string_.h"
+#if defined(_VISUALC_)
#define WIN32_LEAN_AND_MEAN
#define VC_EXTRALEAN
#include <windows.h>
@@ -80,6 +80,7 @@
*/
static MagickBooleanType
WriteXTRNImage(const ImageInfo *,Image *,ExceptionInfo *exception);
+#endif
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -108,6 +109,7 @@
% o exception: return any errors or warnings in this structure.
%
*/
+#if defined(_VISUALC_)
static Image *ReadXTRNImage(const ImageInfo *image_info,
ExceptionInfo *exception)
{
@@ -224,6 +226,7 @@
clone_info=DestroyImageInfo(clone_info);
return(image);
}
+#endif
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -254,32 +257,40 @@
*entry;
entry=SetMagickInfo("XTRNFILE");
+#if defined(_VISUALC_)
entry->decoder=ReadXTRNImage;
entry->encoder=WriteXTRNImage;
+#endif
entry->adjoin=MagickFalse;
entry->stealth=MagickTrue;
entry->description=ConstantString("External transfer of a file");
entry->module=ConstantString("XTRN");
RegisterMagickInfo(entry);
entry=SetMagickInfo("XTRNIMAGE");
+#if defined(_VISUALC_)
entry->decoder=ReadXTRNImage;
entry->encoder=WriteXTRNImage;
+#endif
entry->adjoin=MagickFalse;
entry->stealth=MagickTrue;
entry->description=ConstantString("External transfer of a image in memory");
entry->module=ConstantString("XTRN");
RegisterMagickInfo(entry);
entry=SetMagickInfo("XTRNBLOB");
+#if defined(_VISUALC_)
entry->decoder=ReadXTRNImage;
entry->encoder=WriteXTRNImage;
+#endif
entry->adjoin=MagickFalse;
entry->stealth=MagickTrue;
entry->description=ConstantString("IExternal transfer of a blob in memory");
entry->module=ConstantString("XTRN");
RegisterMagickInfo(entry);
entry=SetMagickInfo("XTRNARRAY");
+#if defined(_VISUALC_)
entry->decoder=ReadXTRNImage;
entry->encoder=WriteXTRNImage;
+#endif
entry->adjoin=MagickFalse;
entry->stealth=MagickTrue;
entry->description=ConstantString(
@@ -346,7 +357,9 @@
%
*/
-size_t SafeArrayFifo(const Image *image,const void *data,const size_t length)
+#if defined(_VISUALC_)
+static size_t SafeArrayFifo(const Image *image,const void *data,
+ const size_t length)
{
SAFEARRAYBOUND NewArrayBounds[1]; /* 1 Dimension */
size_t tlen=length;
@@ -387,7 +400,9 @@
}
return(tlen);
}
+#endif
+#if defined(_VISUALC_)
static MagickBooleanType WriteXTRNImage(const ImageInfo *image_info,
Image *image,ExceptionInfo *exception)
{
diff --git a/configure b/configure
index f939aa8..38374e3 100755
--- a/configure
+++ b/configure
@@ -4322,7 +4322,7 @@
MAGICK_VERSION=7.0.0-0
-MAGICK_SVN_REVISION=17601:17619M
+MAGICK_SVN_REVISION=17767M
# Substitute library versioning
diff --git a/tests/validate.h b/tests/validate.h
index fc3b08f..4c4fff0 100644
--- a/tests/validate.h
+++ b/tests/validate.h
@@ -437,15 +437,15 @@
reference_types[] =
{
{ TrueColorType, 8 },
- { TrueColorMatteType, 8 },
+ { TrueColorAlphaType, 8 },
{ GrayscaleType, 8 },
- { GrayscaleMatteType, 8 },
+ { GrayscaleAlphaType, 8 },
{ PaletteType, 8 },
- { PaletteMatteType, 8 },
- { PaletteBilevelMatteType, 8 },
+ { PaletteAlphaType, 8 },
+ { PaletteBilevelAlphaType, 8 },
{ BilevelType, 1 },
{ ColorSeparationType, 8 },
- { ColorSeparationMatteType, 8 },
+ { ColorSeparationAlphaType, 8 },
{ TrueColorType, 10 },
{ TrueColorType, 12 },
{ TrueColorType, 16 },
diff --git a/www/Magick++/Enumerations.html b/www/Magick++/Enumerations.html
index d190fe1..b18dbd7 100644
--- a/www/Magick++/Enumerations.html
+++ b/www/Magick++/Enumerations.html
@@ -1215,7 +1215,7 @@
</tr>
<tr>
<td>
- <p>GrayscaleMatteType</p>
+ <p>GrayscaleAlphaType</p>
</td>
<td>
<p>Grayscale image with opacity</p>
@@ -1231,7 +1231,7 @@
</tr>
<tr>
<td>
- <p>PaletteMatteType</p>
+ <p>PaletteAlphaType</p>
</td>
<td>
<p>Indexed color (palette) image with opacity</p>
@@ -1247,7 +1247,7 @@
</tr>
<tr>
<td>
- <p>TrueColorMatteType</p>
+ <p>TrueColorAlphaType</p>
</td>
<td>
<p>Truecolor image with opacity</p>
diff --git a/www/api/MagickCore/colorspace_8c.html b/www/api/MagickCore/colorspace_8c.html
index 634c7d7..439fd52 100644
--- a/www/api/MagickCore/colorspace_8c.html
+++ b/www/api/MagickCore/colorspace_8c.html
@@ -1687,7 +1687,7 @@
<p>Definition at line <a class="el" href="colorspace_8c_source.html#l00208">208</a> of file <a class="el" href="colorspace_8c_source.html">colorspace.c</a>.</p>
-<p>References <a class="el" href="cache-view_8c_source.html#l00112">AcquireAuthenticCacheView()</a>, <a class="el" href="memory_8c_source.html#l00481">AcquireQuantumMemory()</a>, <a class="el" href="image_8h_source.html#l00277">_Image::alpha_trait</a>, <a class="el" href="pixel_8h_source.html#l00136">BlendPixelTrait</a>, <a class="el" href="pixel_8h_source.html#l00187">_PixelInfo::blue</a>, <a class="el" href="quantum_8h_source.html#l00084">ClampToQuantum()</a>, <a class="el" href="colorspace_8h_source.html#l00028">CMYColorspace</a>, <a class="el" href="colorspace_8h_source.html#l00029">CMYKColorspace</a>, <a class="el" href="image_8h_source.html#l00177">_Image::colormap</a>, <a class="el" href="image_8h_source.html#l00170">_Image::colors</a>, <a class="el" href="image_8h_source.html#l00057">ColorSeparationMatteType</a>, <a class="el" href="image_8h_source.html#l00056">ColorSeparationType</a>, <a class="el" href="image_8h_source.html#l00170">_Image::columns</a>, <a class="el" href="colorspace_8c_source.html#l00118">ConvertRGBToCMY()</a>, <a class="el" href="colorspace-private_8h_source.html#l00030">ConvertRGBToCMYK()</a>, <a class="el" href="gem-private_8h.html#a8d9ef99e9dce9fb068c4c59478cc34fd">ConvertRGBToHCL()</a>, <a class="el" href="gem-private_8h.html#a9e4c7fde29942e5a51695faa6562f42e">ConvertRGBToHCLp()</a>, <a class="el" href="gem-private_8h.html#ad236abd5f5bf75f50d429efd6daedbb6">ConvertRGBToHSB()</a>, <a class="el" href="gem-private_8h.html#a1ce4b79889933aad19ab5a59405f8864">ConvertRGBToHSI()</a>, <a class="el" href="gem_8c_source.html#l01132">ConvertRGBToHSL()</a>, <a class="el" href="gem-private_8h.html#a21062c9701765b4fe04dfdfba353142c">ConvertRGBToHSV()</a>, <a class="el" href="gem-private_8h.html#ab254aecd76f2509feeabf79bb4b93c67">ConvertRGBToHWB()</a>, <a class="el" href="colorspace_8c_source.html#l00146">ConvertRGBToLab()</a>, <a class="el" href="gem-private_8h.html#a2dd520f1365fc407c7497da4d95980f5">ConvertRGBToLCHab()</a>, <a class="el" href="gem_8c_source.html#l01412">ConvertRGBToLCHuv()</a>, <a class="el" href="colorspace_8c_source.html#l00134">ConvertRGBToLMS()</a>, <a class="el" href="colorspace_8c_source.html#l00158">ConvertRGBToLuv()</a>, <a class="el" href="gem-private_8h_source.html#l00124">ConvertRGBToXYZ()</a>, <a class="el" href="colorspace_8c_source.html#l00194">ConvertRGBToYCbCr()</a>, <a class="el" href="colorspace_8c_source.html#l00170">ConvertRGBToYDbDr()</a>, <a class="el" href="colorspace_8c_source.html#l00178">ConvertRGBToYIQ()</a>, <a class="el" href="colorspace_8c_source.html#l00186">ConvertRGBToYPbPr()</a>, <a class="el" href="colorspace_8c_source.html#l00200">ConvertRGBToYUV()</a>, <a class="el" href="image_8h_source.html#l00331">_Image::debug</a>, <a class="el" href="pixel_8c_source.html#l00261">DecodePixelGamma()</a>, <a class="el" href="cache-view_8c_source.html#l00250">DestroyCacheView()</a>, <a class="el" href="magick-type_8h_source.html#l00141">DirectClass</a>, <a class="el" href="colorspace_8c.html#ab1e96e9c9b9056828619814cc471f526">DisplayGamma</a>, <a class="el" href="image_8h_source.html#l00316">_Image::filename</a>, <a class="el" href="colorspace_8c.html#af4aeaaa03fbef3bd7dd8a00552ee4561">FilmGamma</a>, <a class="el" href="cache-view_8c_source.html#l00297">GetCacheViewAuthenticPixels()</a>, <a class="el" href="property_8c_source.html#l01991">GetImageProperty()</a>, <a class="el" href="log_8h_source.html#l00029">GetMagickModule</a>, <a class="el" href="pixel-accessor_8h_source.html#l00073">GetPixelBlue()</a>, <a class="el" href="pixel-accessor_8h_source.html#l00121">GetPixelChannels()</a>, <a class="el" href="pixel-accessor_8h_source.html#l00159">GetPixelGreen()</a>, <a class="el" href="pixel_8c_source.html#l02102">GetPixelInfo()</a>, <a class="el" href="pixel-accessor_8h_source.html#l00336">GetPixelInfoPixel()</a>, <a class="el" href="pixel_8c_source.html#l02178">GetPixelIntensity()</a>, <a class="el" href="pixel-accessor_8h_source.html#l00325">GetPixelRed()</a>, <a class="el" href="colorspace_8h_source.html#l00030">GRAYColorspace</a>, <a class="el" href="image_8h_source.html#l00050">GrayscaleType</a>, <a class="el" href="pixel_8h_source.html#l00187">_PixelInfo::green</a>, <a class="el" href="colorspace_8h_source.html#l00031">HCLColorspace</a>, <a class="el" href="colorspace_8h_source.html#l00032">HCLpColorspace</a>, <a class="el" href="colorspace_8h_source.html#l00033">HSBColorspace</a>, <a class="el" href="colorspace_8h_source.html#l00034">HSIColorspace</a>, <a class="el" href="colorspace_8h_source.html#l00035">HSLColorspace</a>, <a class="el" href="colorspace_8h_source.html#l00036">HSVColorspace</a>, <a class="el" href="colorspace_8h_source.html#l00037">HWBColorspace</a>, <a class="el" href="colorspace_8h_source.html#l00038">LabColorspace</a>, <a class="el" href="colorspace_8h_source.html#l00040">LCHabColorspace</a>, <a class="el" href="colorspace_8h_source.html#l00039">LCHColorspace</a>, <a class="el" href="colorspace_8h_source.html#l00041">LCHuvColorspace</a>, <a class="el" href="colorspace_8h_source.html#l00043">LMSColorspace</a>, <a class="el" href="colorspace_8h_source.html#l00042">LogColorspace</a>, <a class="el" href="log_8c_source.html#l01236">LogMagickEvent()</a>, <a class="el" href="colorspace_8h_source.html#l00044">LuvColorspace</a>, <a class="el" href="magick-type_8h_source.html#l00147">MagickFalse</a>, <a class="el" href="method-attribute_8h_source.html#l00106">MagickSignature</a>, <a class="el" href="magick-type_8h_source.html#l00148">MagickTrue</a>, <a class="el" href="magick-type_8h_source.html#l00062">MaxMap</a>, <a class="el" href="colorspace_8h_source.html#l00045">OHTAColorspace</a>, <a class="el" href="pixel-private_8h_source.html#l00025">PerceptibleReciprocal()</a>, <a class="el" href="image_8h_source.html#l00300">_Image::progress_monitor</a>, <a class="el" href="magick-type_8h_source.html#l00142">PseudoClass</a>, <a class="el" href="magick-type_8h_source.html#l00071">QuantumRange</a>, <a class="el" href="colorspace_8h_source.html#l00046">Rec601YCbCrColorspace</a>, <a class="el" href="colorspace_8h_source.html#l00047">Rec709YCbCrColorspace</a>, <a class="el" href="pixel_8h_source.html#l00187">_PixelInfo::red</a>, <a class="el" href="colorspace_8c.html#a7209edb22c1ea86b6cde2ae6a60d40dc">ReferenceBlack</a>, <a class="el" href="colorspace_8c.html#a19bb866d0781021d938e06ed6b0f6f9b">ReferenceWhite</a>, <a class="el" href="memory_8c_source.html#l00773">RelinquishMagickMemory()</a>, <a class="el" href="memory_8c_source.html#l00845">ResetMagickMemory()</a>, <a class="el" href="exception_8h_source.html#l00055">ResourceLimitError</a>, <a class="el" href="colorspace_8h_source.html#l00048">RGBColorspace</a>, <a class="el" href="image_8h_source.html#l00170">_Image::rows</a>, <a class="el" href="colorspace_8h_source.html#l00049">scRGBColorspace</a>, <a class="el" href="colorspace_8c_source.html#l01046">SetImageColorspace()</a>, <a class="el" href="monitor-private_8h_source.html#l00027">SetImageProgress()</a>, <a class="el" href="image_8c_source.html#l02258">SetImageStorageClass()</a>, <a class="el" href="pixel-accessor_8h_source.html#l00543">SetPixelBlue()</a>, <a class="el" href="pixel-accessor_8h_source.html#l00615">SetPixelGray()</a>, <a class="el" href="pixel-accessor_8h_source.html#l00626">SetPixelGreen()</a>, <a class="el" href="pixel-accessor_8h_source.html#l00649">SetPixelInfoPixel()</a>, <a class="el" href="pixel-accessor_8h_source.html#l00711">SetPixelRed()</a>, <a class="el" href="image_8h_source.html#l00352">_Image::signature</a>, <a class="el" href="colorspace_8h_source.html#l00050">sRGBColorspace</a>, <a class="el" href="colorspace_8c.html#a4a1e9e740d2f4f3e36ca06f7f5fed5b3">sRGBTransformImageTag</a>, <a class="el" href="image_8h_source.html#l00152">_Image::storage_class</a>, <a class="el" href="string-private_8h_source.html#l00042">StringToDouble()</a>, <a class="el" href="cache-view_8c_source.html#l01097">SyncCacheViewAuthenticPixels()</a>, <a class="el" href="image_8c_source.html#l03310">SyncImage()</a>, <a class="el" href="exception-private_8h_source.html#l00029">ThrowBinaryException</a>, <a class="el" href="log_8h_source.html#l00053">TraceEvent</a>, <a class="el" href="colorspace_8h_source.html#l00051">TransparentColorspace</a>, <a class="el" href="image_8h_source.html#l00261">_Image::type</a>, <a class="el" href="colorspace_8h_source.html#l00027">UndefinedColorspace</a>, <a class="el" href="colorspace_8c_source.html#l00076">_TransformPacket::x</a>, <a class="el" href="image_8h_source.html#l00097">_PrimaryInfo::x</a>, <a class="el" href="colorspace_8h_source.html#l00052">XYZColorspace</a>, <a class="el" href="colorspace_8c_source.html#l00076">_TransformPacket::y</a>, <a class="el" href="image_8h_source.html#l00097">_PrimaryInfo::y</a>, <a class="el" href="colorspace_8h_source.html#l00053">YCbCrColorspace</a>, <a class="el" href="colorspace_8h_source.html#l00054">YCCColorspace</a>, <a class="el" href="colorspace_8h_source.html#l00055">YDbDrColorspace</a>, <a class="el" href="colorspace_8h_source.html#l00056">YIQColorspace</a>, <a class="el" href="colorspace_8h_source.html#l00057">YPbPrColorspace</a>, <a class="el" href="colorspace_8h_source.html#l00058">YUVColorspace</a>, <a class="el" href="colorspace_8c_source.html#l00076">_TransformPacket::z</a>, and <a class="el" href="image_8h_source.html#l00097">_PrimaryInfo::z</a>.</p>
+<p>References <a class="el" href="cache-view_8c_source.html#l00112">AcquireAuthenticCacheView()</a>, <a class="el" href="memory_8c_source.html#l00481">AcquireQuantumMemory()</a>, <a class="el" href="image_8h_source.html#l00277">_Image::alpha_trait</a>, <a class="el" href="pixel_8h_source.html#l00136">BlendPixelTrait</a>, <a class="el" href="pixel_8h_source.html#l00187">_PixelInfo::blue</a>, <a class="el" href="quantum_8h_source.html#l00084">ClampToQuantum()</a>, <a class="el" href="colorspace_8h_source.html#l00028">CMYColorspace</a>, <a class="el" href="colorspace_8h_source.html#l00029">CMYKColorspace</a>, <a class="el" href="image_8h_source.html#l00177">_Image::colormap</a>, <a class="el" href="image_8h_source.html#l00170">_Image::colors</a>, <a class="el" href="image_8h_source.html#l00057">ColorSeparationAlphaType</a>, <a class="el" href="image_8h_source.html#l00056">ColorSeparationType</a>, <a class="el" href="image_8h_source.html#l00170">_Image::columns</a>, <a class="el" href="colorspace_8c_source.html#l00118">ConvertRGBToCMY()</a>, <a class="el" href="colorspace-private_8h_source.html#l00030">ConvertRGBToCMYK()</a>, <a class="el" href="gem-private_8h.html#a8d9ef99e9dce9fb068c4c59478cc34fd">ConvertRGBToHCL()</a>, <a class="el" href="gem-private_8h.html#a9e4c7fde29942e5a51695faa6562f42e">ConvertRGBToHCLp()</a>, <a class="el" href="gem-private_8h.html#ad236abd5f5bf75f50d429efd6daedbb6">ConvertRGBToHSB()</a>, <a class="el" href="gem-private_8h.html#a1ce4b79889933aad19ab5a59405f8864">ConvertRGBToHSI()</a>, <a class="el" href="gem_8c_source.html#l01132">ConvertRGBToHSL()</a>, <a class="el" href="gem-private_8h.html#a21062c9701765b4fe04dfdfba353142c">ConvertRGBToHSV()</a>, <a class="el" href="gem-private_8h.html#ab254aecd76f2509feeabf79bb4b93c67">ConvertRGBToHWB()</a>, <a class="el" href="colorspace_8c_source.html#l00146">ConvertRGBToLab()</a>, <a class="el" href="gem-private_8h.html#a2dd520f1365fc407c7497da4d95980f5">ConvertRGBToLCHab()</a>, <a class="el" href="gem_8c_source.html#l01412">ConvertRGBToLCHuv()</a>, <a class="el" href="colorspace_8c_source.html#l00134">ConvertRGBToLMS()</a>, <a class="el" href="colorspace_8c_source.html#l00158">ConvertRGBToLuv()</a>, <a class="el" href="gem-private_8h_source.html#l00124">ConvertRGBToXYZ()</a>, <a class="el" href="colorspace_8c_source.html#l00194">ConvertRGBToYCbCr()</a>, <a class="el" href="colorspace_8c_source.html#l00170">ConvertRGBToYDbDr()</a>, <a class="el" href="colorspace_8c_source.html#l00178">ConvertRGBToYIQ()</a>, <a class="el" href="colorspace_8c_source.html#l00186">ConvertRGBToYPbPr()</a>, <a class="el" href="colorspace_8c_source.html#l00200">ConvertRGBToYUV()</a>, <a class="el" href="image_8h_source.html#l00331">_Image::debug</a>, <a class="el" href="pixel_8c_source.html#l00261">DecodePixelGamma()</a>, <a class="el" href="cache-view_8c_source.html#l00250">DestroyCacheView()</a>, <a class="el" href="magick-type_8h_source.html#l00141">DirectClass</a>, <a class="el" href="colorspace_8c.html#ab1e96e9c9b9056828619814cc471f526">DisplayGamma</a>, <a class="el" href="image_8h_source.html#l00316">_Image::filename</a>, <a class="el" href="colorspace_8c.html#af4aeaaa03fbef3bd7dd8a00552ee4561">FilmGamma</a>, <a class="el" href="cache-view_8c_source.html#l00297">GetCacheViewAuthenticPixels()</a>, <a class="el" href="property_8c_source.html#l01991">GetImageProperty()</a>, <a class="el" href="log_8h_source.html#l00029">GetMagickModule</a>, <a class="el" href="pixel-accessor_8h_source.html#l00073">GetPixelBlue()</a>, <a class="el" href="pixel-accessor_8h_source.html#l00121">GetPixelChannels()</a>, <a class="el" href="pixel-accessor_8h_source.html#l00159">GetPixelGreen()</a>, <a class="el" href="pixel_8c_source.html#l02102">GetPixelInfo()</a>, <a class="el" href="pixel-accessor_8h_source.html#l00336">GetPixelInfoPixel()</a>, <a class="el" href="pixel_8c_source.html#l02178">GetPixelIntensity()</a>, <a class="el" href="pixel-accessor_8h_source.html#l00325">GetPixelRed()</a>, <a class="el" href="colorspace_8h_source.html#l00030">GRAYColorspace</a>, <a class="el" href="image_8h_source.html#l00050">GrayscaleType</a>, <a class="el" href="pixel_8h_source.html#l00187">_PixelInfo::green</a>, <a class="el" href="colorspace_8h_source.html#l00031">HCLColorspace</a>, <a class="el" href="colorspace_8h_source.html#l00032">HCLpColorspace</a>, <a class="el" href="colorspace_8h_source.html#l00033">HSBColorspace</a>, <a class="el" href="colorspace_8h_source.html#l00034">HSIColorspace</a>, <a class="el" href="colorspace_8h_source.html#l00035">HSLColorspace</a>, <a class="el" href="colorspace_8h_source.html#l00036">HSVColorspace</a>, <a class="el" href="colorspace_8h_source.html#l00037">HWBColorspace</a>, <a class="el" href="colorspace_8h_source.html#l00038">LabColorspace</a>, <a class="el" href="colorspace_8h_source.html#l00040">LCHabColorspace</a>, <a class="el" href="colorspace_8h_source.html#l00039">LCHColorspace</a>, <a class="el" href="colorspace_8h_source.html#l00041">LCHuvColorspace</a>, <a class="el" href="colorspace_8h_source.html#l00043">LMSColorspace</a>, <a class="el" href="colorspace_8h_source.html#l00042">LogColorspace</a>, <a class="el" href="log_8c_source.html#l01236">LogMagickEvent()</a>, <a class="el" href="colorspace_8h_source.html#l00044">LuvColorspace</a>, <a class="el" href="magick-type_8h_source.html#l00147">MagickFalse</a>, <a class="el" href="method-attribute_8h_source.html#l00106">MagickSignature</a>, <a class="el" href="magick-type_8h_source.html#l00148">MagickTrue</a>, <a class="el" href="magick-type_8h_source.html#l00062">MaxMap</a>, <a class="el" href="colorspace_8h_source.html#l00045">OHTAColorspace</a>, <a class="el" href="pixel-private_8h_source.html#l00025">PerceptibleReciprocal()</a>, <a class="el" href="image_8h_source.html#l00300">_Image::progress_monitor</a>, <a class="el" href="magick-type_8h_source.html#l00142">PseudoClass</a>, <a class="el" href="magick-type_8h_source.html#l00071">QuantumRange</a>, <a class="el" href="colorspace_8h_source.html#l00046">Rec601YCbCrColorspace</a>, <a class="el" href="colorspace_8h_source.html#l00047">Rec709YCbCrColorspace</a>, <a class="el" href="pixel_8h_source.html#l00187">_PixelInfo::red</a>, <a class="el" href="colorspace_8c.html#a7209edb22c1ea86b6cde2ae6a60d40dc">ReferenceBlack</a>, <a class="el" href="colorspace_8c.html#a19bb866d0781021d938e06ed6b0f6f9b">ReferenceWhite</a>, <a class="el" href="memory_8c_source.html#l00773">RelinquishMagickMemory()</a>, <a class="el" href="memory_8c_source.html#l00845">ResetMagickMemory()</a>, <a class="el" href="exception_8h_source.html#l00055">ResourceLimitError</a>, <a class="el" href="colorspace_8h_source.html#l00048">RGBColorspace</a>, <a class="el" href="image_8h_source.html#l00170">_Image::rows</a>, <a class="el" href="colorspace_8h_source.html#l00049">scRGBColorspace</a>, <a class="el" href="colorspace_8c_source.html#l01046">SetImageColorspace()</a>, <a class="el" href="monitor-private_8h_source.html#l00027">SetImageProgress()</a>, <a class="el" href="image_8c_source.html#l02258">SetImageStorageClass()</a>, <a class="el" href="pixel-accessor_8h_source.html#l00543">SetPixelBlue()</a>, <a class="el" href="pixel-accessor_8h_source.html#l00615">SetPixelGray()</a>, <a class="el" href="pixel-accessor_8h_source.html#l00626">SetPixelGreen()</a>, <a class="el" href="pixel-accessor_8h_source.html#l00649">SetPixelInfoPixel()</a>, <a class="el" href="pixel-accessor_8h_source.html#l00711">SetPixelRed()</a>, <a class="el" href="image_8h_source.html#l00352">_Image::signature</a>, <a class="el" href="colorspace_8h_source.html#l00050">sRGBColorspace</a>, <a class="el" href="colorspace_8c.html#a4a1e9e740d2f4f3e36ca06f7f5fed5b3">sRGBTransformImageTag</a>, <a class="el" href="image_8h_source.html#l00152">_Image::storage_class</a>, <a class="el" href="string-private_8h_source.html#l00042">StringToDouble()</a>, <a class="el" href="cache-view_8c_source.html#l01097">SyncCacheViewAuthenticPixels()</a>, <a class="el" href="image_8c_source.html#l03310">SyncImage()</a>, <a class="el" href="exception-private_8h_source.html#l00029">ThrowBinaryException</a>, <a class="el" href="log_8h_source.html#l00053">TraceEvent</a>, <a class="el" href="colorspace_8h_source.html#l00051">TransparentColorspace</a>, <a class="el" href="image_8h_source.html#l00261">_Image::type</a>, <a class="el" href="colorspace_8h_source.html#l00027">UndefinedColorspace</a>, <a class="el" href="colorspace_8c_source.html#l00076">_TransformPacket::x</a>, <a class="el" href="image_8h_source.html#l00097">_PrimaryInfo::x</a>, <a class="el" href="colorspace_8h_source.html#l00052">XYZColorspace</a>, <a class="el" href="colorspace_8c_source.html#l00076">_TransformPacket::y</a>, <a class="el" href="image_8h_source.html#l00097">_PrimaryInfo::y</a>, <a class="el" href="colorspace_8h_source.html#l00053">YCbCrColorspace</a>, <a class="el" href="colorspace_8h_source.html#l00054">YCCColorspace</a>, <a class="el" href="colorspace_8h_source.html#l00055">YDbDrColorspace</a>, <a class="el" href="colorspace_8h_source.html#l00056">YIQColorspace</a>, <a class="el" href="colorspace_8h_source.html#l00057">YPbPrColorspace</a>, <a class="el" href="colorspace_8h_source.html#l00058">YUVColorspace</a>, <a class="el" href="colorspace_8c_source.html#l00076">_TransformPacket::z</a>, and <a class="el" href="image_8h_source.html#l00097">_PrimaryInfo::z</a>.</p>
<p>Referenced by <a class="el" href="colorspace_8c_source.html#l01113">TransformImageColorspace()</a>.</p>
diff --git a/www/api/MagickCore/image_8h.html b/www/api/MagickCore/image_8h.html
index 63e5fd5..898cf01 100644
--- a/www/api/MagickCore/image_8h.html
+++ b/www/api/MagickCore/image_8h.html
@@ -149,17 +149,17 @@
  <a class="el" href="image_8h.html#a3154c405c975616503bac23f51b78fc0a97624dc98c410042d8a0ef217b7dfaf2">UndefinedType</a>,
<a class="el" href="image_8h.html#a3154c405c975616503bac23f51b78fc0a6a696a540fd22e50f30686201596beba">BilevelType</a>,
<a class="el" href="image_8h.html#a3154c405c975616503bac23f51b78fc0ada392eeb0045d4f3907730f87ea964f2">GrayscaleType</a>,
-<a class="el" href="image_8h.html#a3154c405c975616503bac23f51b78fc0a000491f85fef98c4a91885acee91cd26">GrayscaleMatteType</a>,
+<a class="el" href="image_8h.html#a3154c405c975616503bac23f51b78fc0a000491f85fef98c4a91885acee91cd26">GrayscaleAlphaType</a>,
<br/>
  <a class="el" href="image_8h.html#a3154c405c975616503bac23f51b78fc0afc7019d186b366db5da9ddd335bdb34f">PaletteType</a>,
-<a class="el" href="image_8h.html#a3154c405c975616503bac23f51b78fc0a3063797eb24921149de32daabc3c60ec">PaletteMatteType</a>,
+<a class="el" href="image_8h.html#a3154c405c975616503bac23f51b78fc0a3063797eb24921149de32daabc3c60ec">PaletteAlphaType</a>,
<a class="el" href="image_8h.html#a3154c405c975616503bac23f51b78fc0a02d64bfc1fb49c767e7506c9cc93f541">TrueColorType</a>,
-<a class="el" href="image_8h.html#a3154c405c975616503bac23f51b78fc0a1df75c234b05717f0eb4e15e3afe5ade">TrueColorMatteType</a>,
+<a class="el" href="image_8h.html#a3154c405c975616503bac23f51b78fc0a1df75c234b05717f0eb4e15e3afe5ade">TrueColorAlphaType</a>,
<br/>
  <a class="el" href="image_8h.html#a3154c405c975616503bac23f51b78fc0a39f659b7e046f540403cd9a579b33ee0">ColorSeparationType</a>,
-<a class="el" href="image_8h.html#a3154c405c975616503bac23f51b78fc0a09d98c592b614a37f705e5db74b5135a">ColorSeparationMatteType</a>,
+<a class="el" href="image_8h.html#a3154c405c975616503bac23f51b78fc0a09d98c592b614a37f705e5db74b5135a">ColorSeparationAlphaType</a>,
<a class="el" href="image_8h.html#a3154c405c975616503bac23f51b78fc0adc21f74e9a8e5a85ee5c3d9a472fc017">OptimizeType</a>,
-<a class="el" href="image_8h.html#a3154c405c975616503bac23f51b78fc0a8eceb71192c19a52043702b2e0f0e95b">PaletteBilevelMatteType</a>
+<a class="el" href="image_8h.html#a3154c405c975616503bac23f51b78fc0a8eceb71192c19a52043702b2e0f0e95b">PaletteBilevelAlphaType</a>
<br/>
}</td></tr>
<tr class="separator:a3154c405c975616503bac23f51b78fc0"><td class="memSeparator" colspan="2"> </td></tr>
@@ -444,23 +444,23 @@
</td></tr>
<tr><td class="fieldname"><em><a class="anchor" id="a3154c405c975616503bac23f51b78fc0ada392eeb0045d4f3907730f87ea964f2"></a>GrayscaleType</em> </td><td class="fielddoc">
</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="a3154c405c975616503bac23f51b78fc0a000491f85fef98c4a91885acee91cd26"></a>GrayscaleMatteType</em> </td><td class="fielddoc">
+<tr><td class="fieldname"><em><a class="anchor" id="a3154c405c975616503bac23f51b78fc0a000491f85fef98c4a91885acee91cd26"></a>GrayscaleAlphaType</em> </td><td class="fielddoc">
</td></tr>
<tr><td class="fieldname"><em><a class="anchor" id="a3154c405c975616503bac23f51b78fc0afc7019d186b366db5da9ddd335bdb34f"></a>PaletteType</em> </td><td class="fielddoc">
</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="a3154c405c975616503bac23f51b78fc0a3063797eb24921149de32daabc3c60ec"></a>PaletteMatteType</em> </td><td class="fielddoc">
+<tr><td class="fieldname"><em><a class="anchor" id="a3154c405c975616503bac23f51b78fc0a3063797eb24921149de32daabc3c60ec"></a>PaletteAlphaType</em> </td><td class="fielddoc">
</td></tr>
<tr><td class="fieldname"><em><a class="anchor" id="a3154c405c975616503bac23f51b78fc0a02d64bfc1fb49c767e7506c9cc93f541"></a>TrueColorType</em> </td><td class="fielddoc">
</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="a3154c405c975616503bac23f51b78fc0a1df75c234b05717f0eb4e15e3afe5ade"></a>TrueColorMatteType</em> </td><td class="fielddoc">
+<tr><td class="fieldname"><em><a class="anchor" id="a3154c405c975616503bac23f51b78fc0a1df75c234b05717f0eb4e15e3afe5ade"></a>TrueColorAlphaType</em> </td><td class="fielddoc">
</td></tr>
<tr><td class="fieldname"><em><a class="anchor" id="a3154c405c975616503bac23f51b78fc0a39f659b7e046f540403cd9a579b33ee0"></a>ColorSeparationType</em> </td><td class="fielddoc">
</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="a3154c405c975616503bac23f51b78fc0a09d98c592b614a37f705e5db74b5135a"></a>ColorSeparationMatteType</em> </td><td class="fielddoc">
+<tr><td class="fieldname"><em><a class="anchor" id="a3154c405c975616503bac23f51b78fc0a09d98c592b614a37f705e5db74b5135a"></a>ColorSeparationAlphaType</em> </td><td class="fielddoc">
</td></tr>
<tr><td class="fieldname"><em><a class="anchor" id="a3154c405c975616503bac23f51b78fc0adc21f74e9a8e5a85ee5c3d9a472fc017"></a>OptimizeType</em> </td><td class="fielddoc">
</td></tr>
-<tr><td class="fieldname"><em><a class="anchor" id="a3154c405c975616503bac23f51b78fc0a8eceb71192c19a52043702b2e0f0e95b"></a>PaletteBilevelMatteType</em> </td><td class="fielddoc">
+<tr><td class="fieldname"><em><a class="anchor" id="a3154c405c975616503bac23f51b78fc0a8eceb71192c19a52043702b2e0f0e95b"></a>PaletteBilevelAlphaType</em> </td><td class="fielddoc">
</td></tr>
</table>
diff --git a/www/api/MagickCore/option_8c.html b/www/api/MagickCore/option_8c.html
index 29d681d..6678ad3 100644
--- a/www/api/MagickCore/option_8c.html
+++ b/www/api/MagickCore/option_8c.html
@@ -2653,19 +2653,19 @@
<div class="line"> { <span class="stringliteral">"Undefined"</span>, <a class="code" href="image_8h.html#a3154c405c975616503bac23f51b78fc0a97624dc98c410042d8a0ef217b7dfaf2">UndefinedType</a>, <a class="code" href="option_8h.html#a8e3982234e3e1be81e5e82628c4376c5a4887a1bfc5a1800154dd8040b3a612bc">UndefinedOptionFlag</a>, <a class="code" href="magick-type_8h.html#ac740cbce6e8928a679ae3767b49428dda64dfe6c314e51d3d78da0554f5cce497">MagickTrue</a> },</div>
<div class="line"> { <span class="stringliteral">"Bilevel"</span>, <a class="code" href="image_8h.html#a3154c405c975616503bac23f51b78fc0a6a696a540fd22e50f30686201596beba">BilevelType</a>, <a class="code" href="option_8h.html#a8e3982234e3e1be81e5e82628c4376c5a4887a1bfc5a1800154dd8040b3a612bc">UndefinedOptionFlag</a>, <a class="code" href="magick-type_8h.html#ac740cbce6e8928a679ae3767b49428dda5c7243daf92cdb3082c79d702afcfffc">MagickFalse</a> },</div>
<div class="line"> { <span class="stringliteral">"ColorSeparation"</span>, <a class="code" href="image_8h.html#a3154c405c975616503bac23f51b78fc0a39f659b7e046f540403cd9a579b33ee0">ColorSeparationType</a>, <a class="code" href="option_8h.html#a8e3982234e3e1be81e5e82628c4376c5a4887a1bfc5a1800154dd8040b3a612bc">UndefinedOptionFlag</a>, <a class="code" href="magick-type_8h.html#ac740cbce6e8928a679ae3767b49428dda5c7243daf92cdb3082c79d702afcfffc">MagickFalse</a> },</div>
-<div class="line"> { <span class="stringliteral">"ColorSeparationAlpha"</span>, <a class="code" href="image_8h.html#a3154c405c975616503bac23f51b78fc0a09d98c592b614a37f705e5db74b5135a">ColorSeparationMatteType</a>, <a class="code" href="option_8h.html#a8e3982234e3e1be81e5e82628c4376c5a4887a1bfc5a1800154dd8040b3a612bc">UndefinedOptionFlag</a>, <a class="code" href="magick-type_8h.html#ac740cbce6e8928a679ae3767b49428dda5c7243daf92cdb3082c79d702afcfffc">MagickFalse</a> },</div>
-<div class="line"> { <span class="stringliteral">"ColorSeparationMatte"</span>, <a class="code" href="image_8h.html#a3154c405c975616503bac23f51b78fc0a09d98c592b614a37f705e5db74b5135a">ColorSeparationMatteType</a>, <a class="code" href="option_8h.html#a8e3982234e3e1be81e5e82628c4376c5a4887a1bfc5a1800154dd8040b3a612bc">UndefinedOptionFlag</a>, <a class="code" href="magick-type_8h.html#ac740cbce6e8928a679ae3767b49428dda5c7243daf92cdb3082c79d702afcfffc">MagickFalse</a> },</div>
+<div class="line"> { <span class="stringliteral">"ColorSeparationAlpha"</span>, <a class="code" href="image_8h.html#a3154c405c975616503bac23f51b78fc0a09d98c592b614a37f705e5db74b5135a">ColorSeparationAlphaType</a>, <a class="code" href="option_8h.html#a8e3982234e3e1be81e5e82628c4376c5a4887a1bfc5a1800154dd8040b3a612bc">UndefinedOptionFlag</a>, <a class="code" href="magick-type_8h.html#ac740cbce6e8928a679ae3767b49428dda5c7243daf92cdb3082c79d702afcfffc">MagickFalse</a> },</div>
+<div class="line"> { <span class="stringliteral">"ColorSeparationMatte"</span>, <a class="code" href="image_8h.html#a3154c405c975616503bac23f51b78fc0a09d98c592b614a37f705e5db74b5135a">ColorSeparationAlphaType</a>, <a class="code" href="option_8h.html#a8e3982234e3e1be81e5e82628c4376c5a4887a1bfc5a1800154dd8040b3a612bc">UndefinedOptionFlag</a>, <a class="code" href="magick-type_8h.html#ac740cbce6e8928a679ae3767b49428dda5c7243daf92cdb3082c79d702afcfffc">MagickFalse</a> },</div>
<div class="line"> { <span class="stringliteral">"Grayscale"</span>, <a class="code" href="image_8h.html#a3154c405c975616503bac23f51b78fc0ada392eeb0045d4f3907730f87ea964f2">GrayscaleType</a>, <a class="code" href="option_8h.html#a8e3982234e3e1be81e5e82628c4376c5a4887a1bfc5a1800154dd8040b3a612bc">UndefinedOptionFlag</a>, <a class="code" href="magick-type_8h.html#ac740cbce6e8928a679ae3767b49428dda5c7243daf92cdb3082c79d702afcfffc">MagickFalse</a> },</div>
-<div class="line"> { <span class="stringliteral">"GrayscaleAlpha"</span>, <a class="code" href="image_8h.html#a3154c405c975616503bac23f51b78fc0a000491f85fef98c4a91885acee91cd26">GrayscaleMatteType</a>, <a class="code" href="option_8h.html#a8e3982234e3e1be81e5e82628c4376c5a4887a1bfc5a1800154dd8040b3a612bc">UndefinedOptionFlag</a>, <a class="code" href="magick-type_8h.html#ac740cbce6e8928a679ae3767b49428dda5c7243daf92cdb3082c79d702afcfffc">MagickFalse</a> },</div>
-<div class="line"> { <span class="stringliteral">"GrayscaleMatte"</span>, <a class="code" href="image_8h.html#a3154c405c975616503bac23f51b78fc0a000491f85fef98c4a91885acee91cd26">GrayscaleMatteType</a>, <a class="code" href="option_8h.html#a8e3982234e3e1be81e5e82628c4376c5a4887a1bfc5a1800154dd8040b3a612bc">UndefinedOptionFlag</a>, <a class="code" href="magick-type_8h.html#ac740cbce6e8928a679ae3767b49428dda5c7243daf92cdb3082c79d702afcfffc">MagickFalse</a> },</div>
+<div class="line"> { <span class="stringliteral">"GrayscaleAlpha"</span>, <a class="code" href="image_8h.html#a3154c405c975616503bac23f51b78fc0a000491f85fef98c4a91885acee91cd26">GrayscaleAlphaType</a>, <a class="code" href="option_8h.html#a8e3982234e3e1be81e5e82628c4376c5a4887a1bfc5a1800154dd8040b3a612bc">UndefinedOptionFlag</a>, <a class="code" href="magick-type_8h.html#ac740cbce6e8928a679ae3767b49428dda5c7243daf92cdb3082c79d702afcfffc">MagickFalse</a> },</div>
+<div class="line"> { <span class="stringliteral">"GrayscaleMatte"</span>, <a class="code" href="image_8h.html#a3154c405c975616503bac23f51b78fc0a000491f85fef98c4a91885acee91cd26">GrayscaleAlphaType</a>, <a class="code" href="option_8h.html#a8e3982234e3e1be81e5e82628c4376c5a4887a1bfc5a1800154dd8040b3a612bc">UndefinedOptionFlag</a>, <a class="code" href="magick-type_8h.html#ac740cbce6e8928a679ae3767b49428dda5c7243daf92cdb3082c79d702afcfffc">MagickFalse</a> },</div>
<div class="line"> { <span class="stringliteral">"Optimize"</span>, <a class="code" href="image_8h.html#a3154c405c975616503bac23f51b78fc0adc21f74e9a8e5a85ee5c3d9a472fc017">OptimizeType</a>, <a class="code" href="option_8h.html#a8e3982234e3e1be81e5e82628c4376c5a4887a1bfc5a1800154dd8040b3a612bc">UndefinedOptionFlag</a>, <a class="code" href="magick-type_8h.html#ac740cbce6e8928a679ae3767b49428dda5c7243daf92cdb3082c79d702afcfffc">MagickFalse</a> },</div>
<div class="line"> { <span class="stringliteral">"Palette"</span>, <a class="code" href="image_8h.html#a3154c405c975616503bac23f51b78fc0afc7019d186b366db5da9ddd335bdb34f">PaletteType</a>, <a class="code" href="option_8h.html#a8e3982234e3e1be81e5e82628c4376c5a4887a1bfc5a1800154dd8040b3a612bc">UndefinedOptionFlag</a>, <a class="code" href="magick-type_8h.html#ac740cbce6e8928a679ae3767b49428dda5c7243daf92cdb3082c79d702afcfffc">MagickFalse</a> },</div>
-<div class="line"> { <span class="stringliteral">"PaletteBilevelAlpha"</span>, <a class="code" href="image_8h.html#a3154c405c975616503bac23f51b78fc0a8eceb71192c19a52043702b2e0f0e95b">PaletteBilevelMatteType</a>, <a class="code" href="option_8h.html#a8e3982234e3e1be81e5e82628c4376c5a4887a1bfc5a1800154dd8040b3a612bc">UndefinedOptionFlag</a>, <a class="code" href="magick-type_8h.html#ac740cbce6e8928a679ae3767b49428dda5c7243daf92cdb3082c79d702afcfffc">MagickFalse</a> },</div>
-<div class="line"> { <span class="stringliteral">"PaletteBilevelMatte"</span>, <a class="code" href="image_8h.html#a3154c405c975616503bac23f51b78fc0a8eceb71192c19a52043702b2e0f0e95b">PaletteBilevelMatteType</a>, <a class="code" href="option_8h.html#a8e3982234e3e1be81e5e82628c4376c5a4887a1bfc5a1800154dd8040b3a612bc">UndefinedOptionFlag</a>, <a class="code" href="magick-type_8h.html#ac740cbce6e8928a679ae3767b49428dda5c7243daf92cdb3082c79d702afcfffc">MagickFalse</a> },</div>
-<div class="line"> { <span class="stringliteral">"PaletteAlpha"</span>, <a class="code" href="image_8h.html#a3154c405c975616503bac23f51b78fc0a3063797eb24921149de32daabc3c60ec">PaletteMatteType</a>, <a class="code" href="option_8h.html#a8e3982234e3e1be81e5e82628c4376c5a4887a1bfc5a1800154dd8040b3a612bc">UndefinedOptionFlag</a>, <a class="code" href="magick-type_8h.html#ac740cbce6e8928a679ae3767b49428dda5c7243daf92cdb3082c79d702afcfffc">MagickFalse</a> },</div>
-<div class="line"> { <span class="stringliteral">"PaletteMatte"</span>, <a class="code" href="image_8h.html#a3154c405c975616503bac23f51b78fc0a3063797eb24921149de32daabc3c60ec">PaletteMatteType</a>, <a class="code" href="option_8h.html#a8e3982234e3e1be81e5e82628c4376c5a4887a1bfc5a1800154dd8040b3a612bc">UndefinedOptionFlag</a>, <a class="code" href="magick-type_8h.html#ac740cbce6e8928a679ae3767b49428dda5c7243daf92cdb3082c79d702afcfffc">MagickFalse</a> },</div>
-<div class="line"> { <span class="stringliteral">"TrueColorAlpha"</span>, <a class="code" href="image_8h.html#a3154c405c975616503bac23f51b78fc0a1df75c234b05717f0eb4e15e3afe5ade">TrueColorMatteType</a>, <a class="code" href="option_8h.html#a8e3982234e3e1be81e5e82628c4376c5a4887a1bfc5a1800154dd8040b3a612bc">UndefinedOptionFlag</a>, <a class="code" href="magick-type_8h.html#ac740cbce6e8928a679ae3767b49428dda5c7243daf92cdb3082c79d702afcfffc">MagickFalse</a> },</div>
-<div class="line"> { <span class="stringliteral">"TrueColorMatte"</span>, <a class="code" href="image_8h.html#a3154c405c975616503bac23f51b78fc0a1df75c234b05717f0eb4e15e3afe5ade">TrueColorMatteType</a>, <a class="code" href="option_8h.html#a8e3982234e3e1be81e5e82628c4376c5a4887a1bfc5a1800154dd8040b3a612bc">UndefinedOptionFlag</a>, <a class="code" href="magick-type_8h.html#ac740cbce6e8928a679ae3767b49428dda5c7243daf92cdb3082c79d702afcfffc">MagickFalse</a> },</div>
+<div class="line"> { <span class="stringliteral">"PaletteBilevelAlpha"</span>, <a class="code" href="image_8h.html#a3154c405c975616503bac23f51b78fc0a8eceb71192c19a52043702b2e0f0e95b">PaletteBilevelAlphaType</a>, <a class="code" href="option_8h.html#a8e3982234e3e1be81e5e82628c4376c5a4887a1bfc5a1800154dd8040b3a612bc">UndefinedOptionFlag</a>, <a class="code" href="magick-type_8h.html#ac740cbce6e8928a679ae3767b49428dda5c7243daf92cdb3082c79d702afcfffc">MagickFalse</a> },</div>
+<div class="line"> { <span class="stringliteral">"PaletteBilevelMatte"</span>, <a class="code" href="image_8h.html#a3154c405c975616503bac23f51b78fc0a8eceb71192c19a52043702b2e0f0e95b">PaletteBilevelAlphaType</a>, <a class="code" href="option_8h.html#a8e3982234e3e1be81e5e82628c4376c5a4887a1bfc5a1800154dd8040b3a612bc">UndefinedOptionFlag</a>, <a class="code" href="magick-type_8h.html#ac740cbce6e8928a679ae3767b49428dda5c7243daf92cdb3082c79d702afcfffc">MagickFalse</a> },</div>
+<div class="line"> { <span class="stringliteral">"PaletteAlpha"</span>, <a class="code" href="image_8h.html#a3154c405c975616503bac23f51b78fc0a3063797eb24921149de32daabc3c60ec">PaletteAlphaType</a>, <a class="code" href="option_8h.html#a8e3982234e3e1be81e5e82628c4376c5a4887a1bfc5a1800154dd8040b3a612bc">UndefinedOptionFlag</a>, <a class="code" href="magick-type_8h.html#ac740cbce6e8928a679ae3767b49428dda5c7243daf92cdb3082c79d702afcfffc">MagickFalse</a> },</div>
+<div class="line"> { <span class="stringliteral">"PaletteMatte"</span>, <a class="code" href="image_8h.html#a3154c405c975616503bac23f51b78fc0a3063797eb24921149de32daabc3c60ec">PaletteAlphaType</a>, <a class="code" href="option_8h.html#a8e3982234e3e1be81e5e82628c4376c5a4887a1bfc5a1800154dd8040b3a612bc">UndefinedOptionFlag</a>, <a class="code" href="magick-type_8h.html#ac740cbce6e8928a679ae3767b49428dda5c7243daf92cdb3082c79d702afcfffc">MagickFalse</a> },</div>
+<div class="line"> { <span class="stringliteral">"TrueColorAlpha"</span>, <a class="code" href="image_8h.html#a3154c405c975616503bac23f51b78fc0a1df75c234b05717f0eb4e15e3afe5ade">TrueColorAlphaType</a>, <a class="code" href="option_8h.html#a8e3982234e3e1be81e5e82628c4376c5a4887a1bfc5a1800154dd8040b3a612bc">UndefinedOptionFlag</a>, <a class="code" href="magick-type_8h.html#ac740cbce6e8928a679ae3767b49428dda5c7243daf92cdb3082c79d702afcfffc">MagickFalse</a> },</div>
+<div class="line"> { <span class="stringliteral">"TrueColorMatte"</span>, <a class="code" href="image_8h.html#a3154c405c975616503bac23f51b78fc0a1df75c234b05717f0eb4e15e3afe5ade">TrueColorAlphaType</a>, <a class="code" href="option_8h.html#a8e3982234e3e1be81e5e82628c4376c5a4887a1bfc5a1800154dd8040b3a612bc">UndefinedOptionFlag</a>, <a class="code" href="magick-type_8h.html#ac740cbce6e8928a679ae3767b49428dda5c7243daf92cdb3082c79d702afcfffc">MagickFalse</a> },</div>
<div class="line"> { <span class="stringliteral">"TrueColor"</span>, <a class="code" href="image_8h.html#a3154c405c975616503bac23f51b78fc0a02d64bfc1fb49c767e7506c9cc93f541">TrueColorType</a>, <a class="code" href="option_8h.html#a8e3982234e3e1be81e5e82628c4376c5a4887a1bfc5a1800154dd8040b3a612bc">UndefinedOptionFlag</a>, <a class="code" href="magick-type_8h.html#ac740cbce6e8928a679ae3767b49428dda5c7243daf92cdb3082c79d702afcfffc">MagickFalse</a> },</div>
<div class="line"> { (<span class="keywordtype">char</span> *) NULL, <a class="code" href="image_8h.html#a3154c405c975616503bac23f51b78fc0a97624dc98c410042d8a0ef217b7dfaf2">UndefinedType</a>, <a class="code" href="option_8h.html#a8e3982234e3e1be81e5e82628c4376c5a4887a1bfc5a1800154dd8040b3a612bc">UndefinedOptionFlag</a>, <a class="code" href="magick-type_8h.html#ac740cbce6e8928a679ae3767b49428dda5c7243daf92cdb3082c79d702afcfffc">MagickFalse</a> }</div>
<div class="line"> }</div>
diff --git a/www/api/MagickCore/profile_8c.html b/www/api/MagickCore/profile_8c.html
index e94dcb9..c7e5d6e 100644
--- a/www/api/MagickCore/profile_8c.html
+++ b/www/api/MagickCore/profile_8c.html
@@ -869,7 +869,7 @@
<p>Definition at line <a class="el" href="profile_8c_source.html#l00479">479</a> of file <a class="el" href="profile_8c_source.html">profile.c</a>.</p>
-<p>References <a class="el" href="profile_8h_source.html#l00035">AbsoluteIntent</a>, <a class="el" href="cache-view_8c_source.html#l00112">AcquireAuthenticCacheView()</a>, <a class="el" href="quantize_8c_source.html#l01431">AcquirePixelThreadSet()</a>, <a class="el" href="string_8c_source.html#l00165">AcquireStringInfo()</a>, <a class="el" href="image_8h_source.html#l00277">_Image::alpha_trait</a>, <a class="el" href="image_8h_source.html#l00255">_Image::black_point_compensation</a>, <a class="el" href="pixel_8h_source.html#l00136">BlendPixelTrait</a>, <a class="el" href="profile_8c_source.html#l00094">cmsColorSpaceSignature</a>, <a class="el" href="profile_8c_source.html#l00100">cmsOpenProfileFromMemTHR</a>, <a class="el" href="profile_8c_source.html#l00096">cmsSetLogErrorHandler</a>, <a class="el" href="profile_8c_source.html#l00086">cmsSigCmykData</a>, <a class="el" href="profile_8c_source.html#l00087">cmsSigGrayData</a>, <a class="el" href="profile_8c_source.html#l00088">cmsSigLabData</a>, <a class="el" href="profile_8c_source.html#l00093">cmsSigLinkClass</a>, <a class="el" href="profile_8c_source.html#l00089">cmsSigLuvData</a>, <a class="el" href="profile_8c_source.html#l00090">cmsSigRgbData</a>, <a class="el" href="profile_8c_source.html#l00091">cmsSigXYZData</a>, <a class="el" href="profile_8c_source.html#l00092">cmsSigYCbCrData</a>, <a class="el" href="profile_8c_source.html#l00095">cmsUInt32Number</a>, <a class="el" href="colorspace_8h_source.html#l00029">CMYKColorspace</a>, <a class="el" href="image_8h_source.html#l00057">ColorSeparationMatteType</a>, <a class="el" href="image_8h_source.html#l00056">ColorSeparationType</a>, <a class="el" href="image_8h_source.html#l00155">_Image::colorspace</a>, <a class="el" href="image_8h_source.html#l00170">_Image::columns</a>, <a class="el" href="string_8c_source.html#l00366">CompareStringInfo()</a>, <a class="el" href="string_8c_source.html#l00689">ConstantString()</a>, <a class="el" href="image_8h_source.html#l00331">_Image::debug</a>, <a class="el" href="profile_8c_source.html#l00195">DeleteImageProfile()</a>, <a class="el" href="cache-view_8c_source.html#l00250">DestroyCacheView()</a>, <a class="el" href="quantize_8c_source.html#l01418">DestroyPixelThreadSet()</a>, <a class="el" href="string_8c_source.html#l00814">DestroyString()</a>, <a class="el" href="string_8c_source.html#l00841">DestroyStringInfo()</a>, <a class="el" href="magick-type_8h_source.html#l00141">DirectClass</a>, <a class="el" href="profile_8c_source.html#l00128">_CMSExceptionInfo::exception</a>, <a class="el" href="image_8h_source.html#l00316">_Image::filename</a>, <a class="el" href="cache-view_8c_source.html#l00297">GetCacheViewAuthenticPixels()</a>, <a class="el" href="profile_8c_source.html#l00258">GetImageProfile()</a>, <a class="el" href="property_8c_source.html#l01991">GetImageProperty()</a>, <a class="el" href="log_8h_source.html#l00029">GetMagickModule</a>, <a class="el" href="profile_8c_source.html#l00301">GetNextImageProfile()</a>, <a class="el" href="thread-private_8h_source.html#l00119">GetOpenMPThreadId()</a>, <a class="el" href="pixel-accessor_8h_source.html#l00060">GetPixelBlack()</a>, <a class="el" href="pixel-accessor_8h_source.html#l00073">GetPixelBlue()</a>, <a class="el" href="pixel-accessor_8h_source.html#l00121">GetPixelChannels()</a>, <a class="el" href="pixel-accessor_8h_source.html#l00159">GetPixelGreen()</a>, <a class="el" href="pixel-accessor_8h_source.html#l00325">GetPixelRed()</a>, <a class="el" href="string_8c_source.html#l01264">GetStringInfoDatum()</a>, <a class="el" href="string_8c_source.html#l01293">GetStringInfoLength()</a>, <a class="el" href="token_8c_source.html#l00320">GlobExpression()</a>, <a class="el" href="colorspace_8h_source.html#l00030">GRAYColorspace</a>, <a class="el" href="image_8h_source.html#l00051">GrayscaleMatteType</a>, <a class="el" href="image_8h_source.html#l00050">GrayscaleType</a>, <a class="el" href="profile_8c_source.html#l00125">_CMSExceptionInfo::image</a>, <a class="el" href="exception_8h_source.html#l00069">ImageError</a>, <a class="el" href="attribute_8c_source.html#l00667">IsImageGray()</a>, <a class="el" href="colorspace-private_8h_source.html#l00108">IssRGBCompatibleColorspace()</a>, <a class="el" href="colorspace_8h_source.html#l00038">LabColorspace</a>, <a class="el" href="string_8c_source.html#l01532">LocaleCompare()</a>, <a class="el" href="log_8c_source.html#l01236">LogMagickEvent()</a>, <a class="el" href="magick-type_8h_source.html#l00147">MagickFalse</a>, <a class="el" href="method-attribute_8h_source.html#l00106">MagickSignature</a>, <a class="el" href="magick-type_8h_source.html#l00148">MagickTrue</a>, <a class="el" href="exception_8h_source.html#l00036">MissingDelegateWarning</a>, <a class="el" href="profile_8h_source.html#l00034">PerceptualIntent</a>, <a class="el" href="profile_8c.html#a578cda6491174198de1ff8d742cb886c">ProfileImageTag</a>, <a class="el" href="image_8h_source.html#l00300">_Image::progress_monitor</a>, <a class="el" href="profile_8h_source.html#l00036">RelativeIntent</a>, <a class="el" href="memory_8c_source.html#l00773">RelinquishMagickMemory()</a>, <a class="el" href="image_8h_source.html#l00190">_Image::rendering_intent</a>, <a class="el" href="profile_8c_source.html#l01052">ResetImageProfileIterator()</a>, <a class="el" href="exception_8h_source.html#l00055">ResourceLimitError</a>, <a class="el" href="image_8h_source.html#l00170">_Image::rows</a>, <a class="el" href="profile_8h_source.html#l00033">SaturationIntent</a>, <a class="el" href="colorspace_8c_source.html#l01046">SetImageColorspace()</a>, <a class="el" href="profile_8c_source.html#l01260">SetImageProfile()</a>, <a class="el" href="monitor-private_8h_source.html#l00027">SetImageProgress()</a>, <a class="el" href="image_8c_source.html#l02258">SetImageStorageClass()</a>, <a class="el" href="pixel-accessor_8h_source.html#l00531">SetPixelBlack()</a>, <a class="el" href="pixel-accessor_8h_source.html#l00543">SetPixelBlue()</a>, <a class="el" href="pixel-accessor_8h_source.html#l00615">SetPixelGray()</a>, <a class="el" href="pixel-accessor_8h_source.html#l00626">SetPixelGreen()</a>, <a class="el" href="pixel-accessor_8h_source.html#l00711">SetPixelRed()</a>, <a class="el" href="string_8c_source.html#l01884">SetStringInfoDatum()</a>, <a class="el" href="image_8h_source.html#l00352">_Image::signature</a>, <a class="el" href="colorspace_8h_source.html#l00050">sRGBColorspace</a>, <a class="el" href="string_8c_source.html#l02162">StringToArgv()</a>, <a class="el" href="string_8c_source.html#l02665">SubstituteString()</a>, <a class="el" href="cache-view_8c_source.html#l01097">SyncCacheViewAuthenticPixels()</a>, <a class="el" href="exception-private_8h_source.html#l00029">ThrowBinaryException</a>, <a class="el" href="exception_8c_source.html#l01042">ThrowMagickException()</a>, <a class="el" href="profile_8c.html#adbed375a7b78f4bc206649e4fdec447a">ThrowProfileException</a>, <a class="el" href="log_8h_source.html#l00053">TraceEvent</a>, <a class="el" href="image_8h_source.html#l00055">TrueColorMatteType</a>, <a class="el" href="image_8h_source.html#l00054">TrueColorType</a>, <a class="el" href="image_8h_source.html#l00261">_Image::type</a>, <a class="el" href="colorspace_8h_source.html#l00027">UndefinedColorspace</a>, <a class="el" href="colorspace_8h_source.html#l00052">XYZColorspace</a>, <a class="el" href="colorspace_8h_source.html#l00053">YCbCrColorspace</a>, and <a class="el" href="colorspace_8h_source.html#l00058">YUVColorspace</a>.</p>
+<p>References <a class="el" href="profile_8h_source.html#l00035">AbsoluteIntent</a>, <a class="el" href="cache-view_8c_source.html#l00112">AcquireAuthenticCacheView()</a>, <a class="el" href="quantize_8c_source.html#l01431">AcquirePixelThreadSet()</a>, <a class="el" href="string_8c_source.html#l00165">AcquireStringInfo()</a>, <a class="el" href="image_8h_source.html#l00277">_Image::alpha_trait</a>, <a class="el" href="image_8h_source.html#l00255">_Image::black_point_compensation</a>, <a class="el" href="pixel_8h_source.html#l00136">BlendPixelTrait</a>, <a class="el" href="profile_8c_source.html#l00094">cmsColorSpaceSignature</a>, <a class="el" href="profile_8c_source.html#l00100">cmsOpenProfileFromMemTHR</a>, <a class="el" href="profile_8c_source.html#l00096">cmsSetLogErrorHandler</a>, <a class="el" href="profile_8c_source.html#l00086">cmsSigCmykData</a>, <a class="el" href="profile_8c_source.html#l00087">cmsSigGrayData</a>, <a class="el" href="profile_8c_source.html#l00088">cmsSigLabData</a>, <a class="el" href="profile_8c_source.html#l00093">cmsSigLinkClass</a>, <a class="el" href="profile_8c_source.html#l00089">cmsSigLuvData</a>, <a class="el" href="profile_8c_source.html#l00090">cmsSigRgbData</a>, <a class="el" href="profile_8c_source.html#l00091">cmsSigXYZData</a>, <a class="el" href="profile_8c_source.html#l00092">cmsSigYCbCrData</a>, <a class="el" href="profile_8c_source.html#l00095">cmsUInt32Number</a>, <a class="el" href="colorspace_8h_source.html#l00029">CMYKColorspace</a>, <a class="el" href="image_8h_source.html#l00057">ColorSeparationAlphaType</a>, <a class="el" href="image_8h_source.html#l00056">ColorSeparationType</a>, <a class="el" href="image_8h_source.html#l00155">_Image::colorspace</a>, <a class="el" href="image_8h_source.html#l00170">_Image::columns</a>, <a class="el" href="string_8c_source.html#l00366">CompareStringInfo()</a>, <a class="el" href="string_8c_source.html#l00689">ConstantString()</a>, <a class="el" href="image_8h_source.html#l00331">_Image::debug</a>, <a class="el" href="profile_8c_source.html#l00195">DeleteImageProfile()</a>, <a class="el" href="cache-view_8c_source.html#l00250">DestroyCacheView()</a>, <a class="el" href="quantize_8c_source.html#l01418">DestroyPixelThreadSet()</a>, <a class="el" href="string_8c_source.html#l00814">DestroyString()</a>, <a class="el" href="string_8c_source.html#l00841">DestroyStringInfo()</a>, <a class="el" href="magick-type_8h_source.html#l00141">DirectClass</a>, <a class="el" href="profile_8c_source.html#l00128">_CMSExceptionInfo::exception</a>, <a class="el" href="image_8h_source.html#l00316">_Image::filename</a>, <a class="el" href="cache-view_8c_source.html#l00297">GetCacheViewAuthenticPixels()</a>, <a class="el" href="profile_8c_source.html#l00258">GetImageProfile()</a>, <a class="el" href="property_8c_source.html#l01991">GetImageProperty()</a>, <a class="el" href="log_8h_source.html#l00029">GetMagickModule</a>, <a class="el" href="profile_8c_source.html#l00301">GetNextImageProfile()</a>, <a class="el" href="thread-private_8h_source.html#l00119">GetOpenMPThreadId()</a>, <a class="el" href="pixel-accessor_8h_source.html#l00060">GetPixelBlack()</a>, <a class="el" href="pixel-accessor_8h_source.html#l00073">GetPixelBlue()</a>, <a class="el" href="pixel-accessor_8h_source.html#l00121">GetPixelChannels()</a>, <a class="el" href="pixel-accessor_8h_source.html#l00159">GetPixelGreen()</a>, <a class="el" href="pixel-accessor_8h_source.html#l00325">GetPixelRed()</a>, <a class="el" href="string_8c_source.html#l01264">GetStringInfoDatum()</a>, <a class="el" href="string_8c_source.html#l01293">GetStringInfoLength()</a>, <a class="el" href="token_8c_source.html#l00320">GlobExpression()</a>, <a class="el" href="colorspace_8h_source.html#l00030">GRAYColorspace</a>, <a class="el" href="image_8h_source.html#l00051">GrayscaleAlphaType</a>, <a class="el" href="image_8h_source.html#l00050">GrayscaleType</a>, <a class="el" href="profile_8c_source.html#l00125">_CMSExceptionInfo::image</a>, <a class="el" href="exception_8h_source.html#l00069">ImageError</a>, <a class="el" href="attribute_8c_source.html#l00667">IsImageGray()</a>, <a class="el" href="colorspace-private_8h_source.html#l00108">IssRGBCompatibleColorspace()</a>, <a class="el" href="colorspace_8h_source.html#l00038">LabColorspace</a>, <a class="el" href="string_8c_source.html#l01532">LocaleCompare()</a>, <a class="el" href="log_8c_source.html#l01236">LogMagickEvent()</a>, <a class="el" href="magick-type_8h_source.html#l00147">MagickFalse</a>, <a class="el" href="method-attribute_8h_source.html#l00106">MagickSignature</a>, <a class="el" href="magick-type_8h_source.html#l00148">MagickTrue</a>, <a class="el" href="exception_8h_source.html#l00036">MissingDelegateWarning</a>, <a class="el" href="profile_8h_source.html#l00034">PerceptualIntent</a>, <a class="el" href="profile_8c.html#a578cda6491174198de1ff8d742cb886c">ProfileImageTag</a>, <a class="el" href="image_8h_source.html#l00300">_Image::progress_monitor</a>, <a class="el" href="profile_8h_source.html#l00036">RelativeIntent</a>, <a class="el" href="memory_8c_source.html#l00773">RelinquishMagickMemory()</a>, <a class="el" href="image_8h_source.html#l00190">_Image::rendering_intent</a>, <a class="el" href="profile_8c_source.html#l01052">ResetImageProfileIterator()</a>, <a class="el" href="exception_8h_source.html#l00055">ResourceLimitError</a>, <a class="el" href="image_8h_source.html#l00170">_Image::rows</a>, <a class="el" href="profile_8h_source.html#l00033">SaturationIntent</a>, <a class="el" href="colorspace_8c_source.html#l01046">SetImageColorspace()</a>, <a class="el" href="profile_8c_source.html#l01260">SetImageProfile()</a>, <a class="el" href="monitor-private_8h_source.html#l00027">SetImageProgress()</a>, <a class="el" href="image_8c_source.html#l02258">SetImageStorageClass()</a>, <a class="el" href="pixel-accessor_8h_source.html#l00531">SetPixelBlack()</a>, <a class="el" href="pixel-accessor_8h_source.html#l00543">SetPixelBlue()</a>, <a class="el" href="pixel-accessor_8h_source.html#l00615">SetPixelGray()</a>, <a class="el" href="pixel-accessor_8h_source.html#l00626">SetPixelGreen()</a>, <a class="el" href="pixel-accessor_8h_source.html#l00711">SetPixelRed()</a>, <a class="el" href="string_8c_source.html#l01884">SetStringInfoDatum()</a>, <a class="el" href="image_8h_source.html#l00352">_Image::signature</a>, <a class="el" href="colorspace_8h_source.html#l00050">sRGBColorspace</a>, <a class="el" href="string_8c_source.html#l02162">StringToArgv()</a>, <a class="el" href="string_8c_source.html#l02665">SubstituteString()</a>, <a class="el" href="cache-view_8c_source.html#l01097">SyncCacheViewAuthenticPixels()</a>, <a class="el" href="exception-private_8h_source.html#l00029">ThrowBinaryException</a>, <a class="el" href="exception_8c_source.html#l01042">ThrowMagickException()</a>, <a class="el" href="profile_8c.html#adbed375a7b78f4bc206649e4fdec447a">ThrowProfileException</a>, <a class="el" href="log_8h_source.html#l00053">TraceEvent</a>, <a class="el" href="image_8h_source.html#l00055">TrueColorAlphaType</a>, <a class="el" href="image_8h_source.html#l00054">TrueColorType</a>, <a class="el" href="image_8h_source.html#l00261">_Image::type</a>, <a class="el" href="colorspace_8h_source.html#l00027">UndefinedColorspace</a>, <a class="el" href="colorspace_8h_source.html#l00052">XYZColorspace</a>, <a class="el" href="colorspace_8h_source.html#l00053">YCbCrColorspace</a>, and <a class="el" href="colorspace_8h_source.html#l00058">YUVColorspace</a>.</p>
</div>
</div>
diff --git a/www/api/attribute.html b/www/api/attribute.html
index 0408e07..3d25c42 100644
--- a/www/api/attribute.html
+++ b/www/api/attribute.html
@@ -390,7 +390,7 @@
<p>SetImageType() sets the type of image. Choose from these types:</p>
-<p>BilevelType, GrayscaleType, GrayscaleMatteType, PaletteType, PaletteMatteType, TrueColorType, TrueColorMatteType, ColorSeparationType, ColorSeparationMatteType, OptimizeType</p>
+<p>BilevelType, GrayscaleType, GrayscaleAlphaType, PaletteType, PaletteAlphaType, TrueColorType, TrueColorAlphaType, ColorSeparationType, ColorSeparationAlphaType, OptimizeType</p>
<p>The format of the SetImageType method is:</p>
diff --git a/www/api/magick-image.html b/www/api/magick-image.html
index 51575c0..a6bd15b 100644
--- a/www/api/magick-image.html
+++ b/www/api/magick-image.html
@@ -5413,7 +5413,7 @@
<p>the magick wand.</p>
<h5>image_type</h5>
-<p>the image type: UndefinedType, BilevelType, GrayscaleType, GrayscaleMatteType, PaletteType, PaletteMatteType, TrueColorType, TrueColorMatteType, ColorSeparationType, ColorSeparationMatteType, or OptimizeType.</p>
+<p>the image type: UndefinedType, BilevelType, GrayscaleType, GrayscaleAlphaType, PaletteType, PaletteAlphaType, TrueColorType, TrueColorAlphaType, ColorSeparationType, ColorSeparationAlphaType, or OptimizeType.</p>
</div>
<h2><a href="http://www.imagemagick.org/api/MagickWand/magick-image_8c.html" id="MagickSetImageUnits">MagickSetImageUnits</a></h2>
diff --git a/www/api/magick-property.html b/www/api/magick-property.html
index cae9a94..a2c1228 100644
--- a/www/api/magick-property.html
+++ b/www/api/magick-property.html
@@ -1643,7 +1643,7 @@
<p>the magick wand.</p>
<h5>image_type</h5>
-<p>the image type: UndefinedType, BilevelType, GrayscaleType, GrayscaleMatteType, PaletteType, PaletteMatteType, TrueColorType, TrueColorMatteType, ColorSeparationType, ColorSeparationMatteType, or OptimizeType.</p>
+<p>the image type: UndefinedType, BilevelType, GrayscaleType, GrayscaleAlphaType, PaletteType, PaletteAlphaType, TrueColorType, TrueColorAlphaType, ColorSeparationType, ColorSeparationAlphaType, or OptimizeType.</p>
</div>
diff --git a/www/architecture.html b/www/architecture.html
index ccfd24e..90153d4 100644
--- a/www/architecture.html
+++ b/www/architecture.html
@@ -734,7 +734,7 @@
if (bmp_info->biBitCount == 24)
image->type(MagickCore::TrueColorType);
else
- image->type(MagickCore::TrueColorMatteType);
+ image->type(MagickCore::TrueColorAlphaType);
register unsigned int bytes_per_row=bmp_info->biWidth*bmp_info->biBitCount/8;
if (bytes_per_row % 4 != 0) {
bytes_per_row=bytes_per_row+(4-bytes_per_row % 4); // divisible by 4.