From def23e5d7331b1a13ed593b6d6aca516da382328 Mon Sep 17 00:00:00 2001 From: cristy Date: Thu, 22 Jan 2015 11:52:01 +0000 Subject: [PATCH] --- Magick++/lib/Magick++/Include.h | 10 ++--- MagickCore/animate.c | 6 +-- MagickCore/attribute.c | 22 ++++----- MagickCore/colorspace.c | 2 +- MagickCore/display.c | 2 +- MagickCore/image.h | 10 ++--- MagickCore/option.c | 20 ++++----- MagickCore/profile.c | 6 +-- MagickCore/version.h | 4 +- MagickWand/magick-image.c | 4 +- MagickWand/magick-property.c | 4 +- Makefile.in | 64 ++++++++++++++++++++++----- coders/Makefile.am | 8 ++++ coders/dds.c | 2 +- coders/gif.c | 4 +- coders/matte.c | 2 +- coders/msl.c | 2 +- coders/png.c | 24 +++++----- coders/ps3.c | 4 +- coders/sixel.c | 4 +- coders/tga.c | 2 +- coders/thumbnail.c | 2 +- coders/tiff.c | 2 +- coders/xpm.c | 4 +- coders/xtrn.c | 19 +++++++- configure | 2 +- tests/validate.h | 10 ++--- www/Magick++/Enumerations.html | 6 +-- www/api/MagickCore/colorspace_8c.html | 2 +- www/api/MagickCore/image_8h.html | 20 ++++----- www/api/MagickCore/option_8c.html | 20 ++++----- www/api/MagickCore/profile_8c.html | 2 +- www/api/attribute.html | 2 +- www/api/magick-image.html | 2 +- www/api/magick-property.html | 2 +- www/architecture.html | 2 +- 36 files changed, 183 insertions(+), 120 deletions(-) diff --git a/Magick++/lib/Magick++/Include.h b/Magick++/lib/Magick++/Include.h index cd96dfcb2..48d9b0969 100644 --- a/Magick++/lib/Magick++/Include.h +++ b/Magick++/lib/Magick++/Include.h @@ -624,15 +624,15 @@ namespace Magick 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 8105c5ba5..e9ce6c297 100644 --- a/MagickCore/animate.c +++ b/MagickCore/animate.c @@ -916,7 +916,7 @@ MagickExport void XAnimateBackgroundImage(Display *display, (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 @@ MagickExport void XAnimateBackgroundImage(Display *display, 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 @@ MagickExport Image *XAnimateImages(Display *display, (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 906e2dc77..e6c3575ff 100644 --- a/MagickCore/attribute.c +++ b/MagickCore/attribute.c @@ -598,24 +598,24 @@ MagickExport ImageType GetImageType(const Image *image,ExceptionInfo *exception) { 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 @@ MagickExport MagickBooleanType IsImageGray(const Image *image, 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 @@ MagickExport MagickBooleanType IsImageGray(const Image *image, 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 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type, image->alpha_trait=UndefinedPixelTrait; break; } - case GrayscaleMatteType: + case GrayscaleAlphaType: { if (IsImageGray(image,exception) == MagickFalse) status=TransformImageColorspace(image,GRAYColorspace,exception); @@ -1189,7 +1189,7 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type, image->alpha_trait=UndefinedPixelTrait; break; } - case PaletteBilevelMatteType: + case PaletteBilevelAlphaType: { ChannelType channel_mask; @@ -1206,7 +1206,7 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type, quantize_info=DestroyQuantizeInfo(quantize_info); break; } - case PaletteMatteType: + case PaletteAlphaType: { if (IssRGBCompatibleColorspace(image->colorspace) == MagickFalse) status=TransformImageColorspace(image,sRGBColorspace,exception); @@ -1227,7 +1227,7 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type, image->alpha_trait=UndefinedPixelTrait; break; } - case TrueColorMatteType: + case TrueColorAlphaType: { if (IssRGBCompatibleColorspace(image->colorspace) == MagickFalse) status=TransformImageColorspace(image,sRGBColorspace,exception); @@ -1250,7 +1250,7 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type, image->alpha_trait=UndefinedPixelTrait; break; } - case ColorSeparationMatteType: + case ColorSeparationAlphaType: { if (image->colorspace != CMYKColorspace) { diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c index 2442856d4..e3cdb53b7 100644 --- a/MagickCore/colorspace.c +++ b/MagickCore/colorspace.c @@ -318,7 +318,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, } 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 0ab21cf10..5757511cf 100644 --- a/MagickCore/display.c +++ b/MagickCore/display.c @@ -7995,7 +7995,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, 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 ae2765c7e..e17b44d56 100644 --- a/MagickCore/image.h +++ b/MagickCore/image.h @@ -53,15 +53,15 @@ typedef enum 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 efc0dfa88..7db8f5bbd 100644 --- a/MagickCore/option.c +++ b/MagickCore/option.c @@ -1675,19 +1675,19 @@ static const OptionInfo { "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 8d1c38255..d061d3e2d 100644 --- a/MagickCore/profile.c +++ b/MagickCore/profile.c @@ -1237,19 +1237,19 @@ MagickExport MagickBooleanType ProfileImage(Image *image,const char *name, 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 fe7fe54cf..4120cea94 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,7 +27,7 @@ extern "C" { */ #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 @@ extern "C" { #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 51a76af38..6c496906c 100644 --- a/MagickWand/magick-image.c +++ b/MagickWand/magick-image.c @@ -10302,8 +10302,8 @@ WandExport MagickBooleanType MagickSetImageTicksPerSecond(MagickWand *wand, % 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 a73387019..0c4903d87 100644 --- a/MagickWand/magick-property.c +++ b/MagickWand/magick-property.c @@ -2969,8 +2969,8 @@ WandExport MagickBooleanType MagickSetSizeOffset(MagickWand *wand, % 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 6ef095d0c..88de3a10f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -568,12 +568,12 @@ am__MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_SOURC 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 @@ am__objects_16 = coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ 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 @@ coders_xps_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(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 @@ SOURCES = $(Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_ $(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 @@ DIST_SOURCES = $(Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUF $(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 @@ MAGICKCORE_CODER_SRCS = \ 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 @@ MAGICKCORE_CODER_SRCS = \ @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_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) 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/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-xp 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/coders_xps_la-xps.lo: coders/$(am__dirstamp) \ 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 @@ distclean-compile: @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 @@ distclean-compile: @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 @@ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-xp @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 @@ coders/coders_xps_la-xps.lo: coders/xps.c @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 fea3e9519..d3f106751 100644 --- a/coders/Makefile.am +++ b/coders/Makefile.am @@ -195,6 +195,7 @@ MAGICKCORE_CODER_SRCS = \ 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_LTLIBRARIES = \ 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_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) 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 47962cdd2..7b3382c5b 100644 --- a/coders/dds.c +++ b/coders/dds.c @@ -2206,7 +2206,7 @@ static MagickBooleanType ReadUncompressedRGBA(Image *image, DDSInfo *dds_info, 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 57aa7f0ce..bd2ccaa07 100644 --- a/coders/gif.c +++ b/coders/gif.c @@ -1586,7 +1586,7 @@ static MagickBooleanType WriteGIFImage(const ImageInfo *image_info,Image *image, 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 @@ static MagickBooleanType WriteGIFImage(const ImageInfo *image_info,Image *image, } 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 988064eeb..83de61dd9 100644 --- a/coders/matte.c +++ b/coders/matte.c @@ -180,7 +180,7 @@ static MagickBooleanType WriteMATTEImage(const ImageInfo *image_info, 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 b85e1b07b..66e728081 100644 --- a/coders/msl.c +++ b/coders/msl.c @@ -1913,7 +1913,7 @@ static void MSLStartElement(void *context,const xmlChar *tag, 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 76f1dd495..8c02b6d28 100644 --- a/coders/png.c +++ b/coders/png.c @@ -3763,13 +3763,13 @@ static Image *ReadOnePNGImage(MngInfo *mng_info, 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 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, 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 @@ static MagickBooleanType WritePNGImage(const ImageInfo *image_info, 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 @@ static MagickBooleanType WritePNGImage(const ImageInfo *image_info, 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 @@ static MagickBooleanType WritePNGImage(const ImageInfo *image_info, 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 @@ static MagickBooleanType WritePNGImage(const ImageInfo *image_info, 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 @@ static MagickBooleanType WriteOneJNGImage(MngInfo *mng_info, 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 @@ static MagickBooleanType WriteOneJNGImage(MngInfo *mng_info, /* 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 db2a2d9f4..594f8d008 100644 --- a/coders/ps3.c +++ b/coders/ps3.c @@ -1255,9 +1255,9 @@ static MagickBooleanType WritePS3Image(const ImageInfo *image_info,Image *image, 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 5f7628d7a..10a146597 100644 --- a/coders/sixel.c +++ b/coders/sixel.c @@ -1230,7 +1230,7 @@ static MagickBooleanType WriteSIXELImage(const ImageInfo *image_info,Image *imag 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 @@ static MagickBooleanType WriteSIXELImage(const ImageInfo *image_info,Image *imag } 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 852ea9f01..37a44ccf8 100644 --- a/coders/tga.c +++ b/coders/tga.c @@ -773,7 +773,7 @@ static MagickBooleanType WriteTGAImage(const ImageInfo *image_info,Image *image, 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 c04802cd4..5bfa07e90 100644 --- a/coders/thumbnail.c +++ b/coders/thumbnail.c @@ -206,7 +206,7 @@ static MagickBooleanType WriteTHUMBNAILImage(const ImageInfo *image_info, 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 04740f4ce..b844344ba 100644 --- a/coders/tiff.c +++ b/coders/tiff.c @@ -3203,7 +3203,7 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info, 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 29eb88105..2426257f7 100644 --- a/coders/xpm.c +++ b/coders/xpm.c @@ -929,7 +929,7 @@ static MagickBooleanType WriteXPMImage(const ImageInfo *image_info,Image *image, 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 @@ static MagickBooleanType WriteXPMImage(const ImageInfo *image_info,Image *image, } 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 6abfed5aa..b40859638 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 @@ -80,6 +80,7 @@ */ static MagickBooleanType WriteXTRNImage(const ImageInfo *,Image *,ExceptionInfo *exception); +#endif /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -108,6 +109,7 @@ static MagickBooleanType % 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 @@ static Image *ReadXTRNImage(const ImageInfo *image_info, clone_info=DestroyImageInfo(clone_info); return(image); } +#endif /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -254,32 +257,40 @@ ModuleExport size_t RegisterXTRNImage(void) *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 @@ ModuleExport void UnregisterXTRNImage(void) % */ -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 @@ size_t SafeArrayFifo(const Image *image,const void *data,const size_t length) } return(tlen); } +#endif +#if defined(_VISUALC_) static MagickBooleanType WriteXTRNImage(const ImageInfo *image_info, Image *image,ExceptionInfo *exception) { diff --git a/configure b/configure index f939aa8dc..38374e325 100755 --- a/configure +++ b/configure @@ -4322,7 +4322,7 @@ MAGICK_PATCHLEVEL_VERSION=0 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 fc3b08ffa..4c4fff04e 100644 --- a/tests/validate.h +++ b/tests/validate.h @@ -437,15 +437,15 @@ static const struct ReferenceTypes 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 d190fe14f..b18dbd7c2 100644 --- a/www/Magick++/Enumerations.html +++ b/www/Magick++/Enumerations.html @@ -1215,7 +1215,7 @@ classification of the image. -

GrayscaleMatteType

+

GrayscaleAlphaType

Grayscale image with opacity

@@ -1231,7 +1231,7 @@ classification of the image. -

PaletteMatteType

+

PaletteAlphaType

Indexed color (palette) image with opacity

@@ -1247,7 +1247,7 @@ classification of the image. -

TrueColorMatteType

+

TrueColorAlphaType

Truecolor image with opacity

diff --git a/www/api/MagickCore/colorspace_8c.html b/www/api/MagickCore/colorspace_8c.html index 634c7d70c..439fd52a6 100644 --- a/www/api/MagickCore/colorspace_8c.html +++ b/www/api/MagickCore/colorspace_8c.html @@ -1687,7 +1687,7 @@ Functions

Definition at line 208 of file colorspace.c.

-

References AcquireAuthenticCacheView(), AcquireQuantumMemory(), _Image::alpha_trait, BlendPixelTrait, _PixelInfo::blue, ClampToQuantum(), CMYColorspace, CMYKColorspace, _Image::colormap, _Image::colors, ColorSeparationMatteType, ColorSeparationType, _Image::columns, ConvertRGBToCMY(), ConvertRGBToCMYK(), ConvertRGBToHCL(), ConvertRGBToHCLp(), ConvertRGBToHSB(), ConvertRGBToHSI(), ConvertRGBToHSL(), ConvertRGBToHSV(), ConvertRGBToHWB(), ConvertRGBToLab(), ConvertRGBToLCHab(), ConvertRGBToLCHuv(), ConvertRGBToLMS(), ConvertRGBToLuv(), ConvertRGBToXYZ(), ConvertRGBToYCbCr(), ConvertRGBToYDbDr(), ConvertRGBToYIQ(), ConvertRGBToYPbPr(), ConvertRGBToYUV(), _Image::debug, DecodePixelGamma(), DestroyCacheView(), DirectClass, DisplayGamma, _Image::filename, FilmGamma, GetCacheViewAuthenticPixels(), GetImageProperty(), GetMagickModule, GetPixelBlue(), GetPixelChannels(), GetPixelGreen(), GetPixelInfo(), GetPixelInfoPixel(), GetPixelIntensity(), GetPixelRed(), GRAYColorspace, GrayscaleType, _PixelInfo::green, HCLColorspace, HCLpColorspace, HSBColorspace, HSIColorspace, HSLColorspace, HSVColorspace, HWBColorspace, LabColorspace, LCHabColorspace, LCHColorspace, LCHuvColorspace, LMSColorspace, LogColorspace, LogMagickEvent(), LuvColorspace, MagickFalse, MagickSignature, MagickTrue, MaxMap, OHTAColorspace, PerceptibleReciprocal(), _Image::progress_monitor, PseudoClass, QuantumRange, Rec601YCbCrColorspace, Rec709YCbCrColorspace, _PixelInfo::red, ReferenceBlack, ReferenceWhite, RelinquishMagickMemory(), ResetMagickMemory(), ResourceLimitError, RGBColorspace, _Image::rows, scRGBColorspace, SetImageColorspace(), SetImageProgress(), SetImageStorageClass(), SetPixelBlue(), SetPixelGray(), SetPixelGreen(), SetPixelInfoPixel(), SetPixelRed(), _Image::signature, sRGBColorspace, sRGBTransformImageTag, _Image::storage_class, StringToDouble(), SyncCacheViewAuthenticPixels(), SyncImage(), ThrowBinaryException, TraceEvent, TransparentColorspace, _Image::type, UndefinedColorspace, _TransformPacket::x, _PrimaryInfo::x, XYZColorspace, _TransformPacket::y, _PrimaryInfo::y, YCbCrColorspace, YCCColorspace, YDbDrColorspace, YIQColorspace, YPbPrColorspace, YUVColorspace, _TransformPacket::z, and _PrimaryInfo::z.

+

References AcquireAuthenticCacheView(), AcquireQuantumMemory(), _Image::alpha_trait, BlendPixelTrait, _PixelInfo::blue, ClampToQuantum(), CMYColorspace, CMYKColorspace, _Image::colormap, _Image::colors, ColorSeparationAlphaType, ColorSeparationType, _Image::columns, ConvertRGBToCMY(), ConvertRGBToCMYK(), ConvertRGBToHCL(), ConvertRGBToHCLp(), ConvertRGBToHSB(), ConvertRGBToHSI(), ConvertRGBToHSL(), ConvertRGBToHSV(), ConvertRGBToHWB(), ConvertRGBToLab(), ConvertRGBToLCHab(), ConvertRGBToLCHuv(), ConvertRGBToLMS(), ConvertRGBToLuv(), ConvertRGBToXYZ(), ConvertRGBToYCbCr(), ConvertRGBToYDbDr(), ConvertRGBToYIQ(), ConvertRGBToYPbPr(), ConvertRGBToYUV(), _Image::debug, DecodePixelGamma(), DestroyCacheView(), DirectClass, DisplayGamma, _Image::filename, FilmGamma, GetCacheViewAuthenticPixels(), GetImageProperty(), GetMagickModule, GetPixelBlue(), GetPixelChannels(), GetPixelGreen(), GetPixelInfo(), GetPixelInfoPixel(), GetPixelIntensity(), GetPixelRed(), GRAYColorspace, GrayscaleType, _PixelInfo::green, HCLColorspace, HCLpColorspace, HSBColorspace, HSIColorspace, HSLColorspace, HSVColorspace, HWBColorspace, LabColorspace, LCHabColorspace, LCHColorspace, LCHuvColorspace, LMSColorspace, LogColorspace, LogMagickEvent(), LuvColorspace, MagickFalse, MagickSignature, MagickTrue, MaxMap, OHTAColorspace, PerceptibleReciprocal(), _Image::progress_monitor, PseudoClass, QuantumRange, Rec601YCbCrColorspace, Rec709YCbCrColorspace, _PixelInfo::red, ReferenceBlack, ReferenceWhite, RelinquishMagickMemory(), ResetMagickMemory(), ResourceLimitError, RGBColorspace, _Image::rows, scRGBColorspace, SetImageColorspace(), SetImageProgress(), SetImageStorageClass(), SetPixelBlue(), SetPixelGray(), SetPixelGreen(), SetPixelInfoPixel(), SetPixelRed(), _Image::signature, sRGBColorspace, sRGBTransformImageTag, _Image::storage_class, StringToDouble(), SyncCacheViewAuthenticPixels(), SyncImage(), ThrowBinaryException, TraceEvent, TransparentColorspace, _Image::type, UndefinedColorspace, _TransformPacket::x, _PrimaryInfo::x, XYZColorspace, _TransformPacket::y, _PrimaryInfo::y, YCbCrColorspace, YCCColorspace, YDbDrColorspace, YIQColorspace, YPbPrColorspace, YUVColorspace, _TransformPacket::z, and _PrimaryInfo::z.

Referenced by TransformImageColorspace().

diff --git a/www/api/MagickCore/image_8h.html b/www/api/MagickCore/image_8h.html index 63e5fd533..898cf019e 100644 --- a/www/api/MagickCore/image_8h.html +++ b/www/api/MagickCore/image_8h.html @@ -149,17 +149,17 @@ Enumerations   UndefinedType, BilevelType, GrayscaleType, -GrayscaleMatteType, +GrayscaleAlphaType,
  PaletteType, -PaletteMatteType, +PaletteAlphaType, TrueColorType, -TrueColorMatteType, +TrueColorAlphaType,
  ColorSeparationType, -ColorSeparationMatteType, +ColorSeparationAlphaType, OptimizeType, -PaletteBilevelMatteType +PaletteBilevelAlphaType
}   @@ -444,23 +444,23 @@ Variables GrayscaleType  -GrayscaleMatteType  +GrayscaleAlphaType  PaletteType  -PaletteMatteType  +PaletteAlphaType  TrueColorType  -TrueColorMatteType  +TrueColorAlphaType  ColorSeparationType  -ColorSeparationMatteType  +ColorSeparationAlphaType  OptimizeType  -PaletteBilevelMatteType  +PaletteBilevelAlphaType  diff --git a/www/api/MagickCore/option_8c.html b/www/api/MagickCore/option_8c.html index 29d681d1a..6678ad313 100644 --- a/www/api/MagickCore/option_8c.html +++ b/www/api/MagickCore/option_8c.html @@ -2653,19 +2653,19 @@ Variables
{ "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/www/api/MagickCore/profile_8c.html b/www/api/MagickCore/profile_8c.html index e94dcb981..c7e5d6e78 100644 --- a/www/api/MagickCore/profile_8c.html +++ b/www/api/MagickCore/profile_8c.html @@ -869,7 +869,7 @@ Functions

Definition at line 479 of file profile.c.

-

References AbsoluteIntent, AcquireAuthenticCacheView(), AcquirePixelThreadSet(), AcquireStringInfo(), _Image::alpha_trait, _Image::black_point_compensation, BlendPixelTrait, cmsColorSpaceSignature, cmsOpenProfileFromMemTHR, cmsSetLogErrorHandler, cmsSigCmykData, cmsSigGrayData, cmsSigLabData, cmsSigLinkClass, cmsSigLuvData, cmsSigRgbData, cmsSigXYZData, cmsSigYCbCrData, cmsUInt32Number, CMYKColorspace, ColorSeparationMatteType, ColorSeparationType, _Image::colorspace, _Image::columns, CompareStringInfo(), ConstantString(), _Image::debug, DeleteImageProfile(), DestroyCacheView(), DestroyPixelThreadSet(), DestroyString(), DestroyStringInfo(), DirectClass, _CMSExceptionInfo::exception, _Image::filename, GetCacheViewAuthenticPixels(), GetImageProfile(), GetImageProperty(), GetMagickModule, GetNextImageProfile(), GetOpenMPThreadId(), GetPixelBlack(), GetPixelBlue(), GetPixelChannels(), GetPixelGreen(), GetPixelRed(), GetStringInfoDatum(), GetStringInfoLength(), GlobExpression(), GRAYColorspace, GrayscaleMatteType, GrayscaleType, _CMSExceptionInfo::image, ImageError, IsImageGray(), IssRGBCompatibleColorspace(), LabColorspace, LocaleCompare(), LogMagickEvent(), MagickFalse, MagickSignature, MagickTrue, MissingDelegateWarning, PerceptualIntent, ProfileImageTag, _Image::progress_monitor, RelativeIntent, RelinquishMagickMemory(), _Image::rendering_intent, ResetImageProfileIterator(), ResourceLimitError, _Image::rows, SaturationIntent, SetImageColorspace(), SetImageProfile(), SetImageProgress(), SetImageStorageClass(), SetPixelBlack(), SetPixelBlue(), SetPixelGray(), SetPixelGreen(), SetPixelRed(), SetStringInfoDatum(), _Image::signature, sRGBColorspace, StringToArgv(), SubstituteString(), SyncCacheViewAuthenticPixels(), ThrowBinaryException, ThrowMagickException(), ThrowProfileException, TraceEvent, TrueColorMatteType, TrueColorType, _Image::type, UndefinedColorspace, XYZColorspace, YCbCrColorspace, and YUVColorspace.

+

References AbsoluteIntent, AcquireAuthenticCacheView(), AcquirePixelThreadSet(), AcquireStringInfo(), _Image::alpha_trait, _Image::black_point_compensation, BlendPixelTrait, cmsColorSpaceSignature, cmsOpenProfileFromMemTHR, cmsSetLogErrorHandler, cmsSigCmykData, cmsSigGrayData, cmsSigLabData, cmsSigLinkClass, cmsSigLuvData, cmsSigRgbData, cmsSigXYZData, cmsSigYCbCrData, cmsUInt32Number, CMYKColorspace, ColorSeparationAlphaType, ColorSeparationType, _Image::colorspace, _Image::columns, CompareStringInfo(), ConstantString(), _Image::debug, DeleteImageProfile(), DestroyCacheView(), DestroyPixelThreadSet(), DestroyString(), DestroyStringInfo(), DirectClass, _CMSExceptionInfo::exception, _Image::filename, GetCacheViewAuthenticPixels(), GetImageProfile(), GetImageProperty(), GetMagickModule, GetNextImageProfile(), GetOpenMPThreadId(), GetPixelBlack(), GetPixelBlue(), GetPixelChannels(), GetPixelGreen(), GetPixelRed(), GetStringInfoDatum(), GetStringInfoLength(), GlobExpression(), GRAYColorspace, GrayscaleAlphaType, GrayscaleType, _CMSExceptionInfo::image, ImageError, IsImageGray(), IssRGBCompatibleColorspace(), LabColorspace, LocaleCompare(), LogMagickEvent(), MagickFalse, MagickSignature, MagickTrue, MissingDelegateWarning, PerceptualIntent, ProfileImageTag, _Image::progress_monitor, RelativeIntent, RelinquishMagickMemory(), _Image::rendering_intent, ResetImageProfileIterator(), ResourceLimitError, _Image::rows, SaturationIntent, SetImageColorspace(), SetImageProfile(), SetImageProgress(), SetImageStorageClass(), SetPixelBlack(), SetPixelBlue(), SetPixelGray(), SetPixelGreen(), SetPixelRed(), SetStringInfoDatum(), _Image::signature, sRGBColorspace, StringToArgv(), SubstituteString(), SyncCacheViewAuthenticPixels(), ThrowBinaryException, ThrowMagickException(), ThrowProfileException, TraceEvent, TrueColorAlphaType, TrueColorType, _Image::type, UndefinedColorspace, XYZColorspace, YCbCrColorspace, and YUVColorspace.

diff --git a/www/api/attribute.html b/www/api/attribute.html index 0408e0726..3d25c42ce 100644 --- a/www/api/attribute.html +++ b/www/api/attribute.html @@ -390,7 +390,7 @@

SetImageType() sets the type of image. Choose from these types:

-

BilevelType, GrayscaleType, GrayscaleMatteType, PaletteType, PaletteMatteType, TrueColorType, TrueColorMatteType, ColorSeparationType, ColorSeparationMatteType, OptimizeType

+

BilevelType, GrayscaleType, GrayscaleAlphaType, PaletteType, PaletteAlphaType, TrueColorType, TrueColorAlphaType, ColorSeparationType, ColorSeparationAlphaType, OptimizeType

The format of the SetImageType method is:

diff --git a/www/api/magick-image.html b/www/api/magick-image.html index 51575c01b..a6bd15b34 100644 --- a/www/api/magick-image.html +++ b/www/api/magick-image.html @@ -5413,7 +5413,7 @@

the magick wand.

image_type
-

the image type: UndefinedType, BilevelType, GrayscaleType, GrayscaleMatteType, PaletteType, PaletteMatteType, TrueColorType, TrueColorMatteType, ColorSeparationType, ColorSeparationMatteType, or OptimizeType.

+

the image type: UndefinedType, BilevelType, GrayscaleType, GrayscaleAlphaType, PaletteType, PaletteAlphaType, TrueColorType, TrueColorAlphaType, ColorSeparationType, ColorSeparationAlphaType, or OptimizeType.

MagickSetImageUnits

diff --git a/www/api/magick-property.html b/www/api/magick-property.html index cae9a9420..a2c1228c5 100644 --- a/www/api/magick-property.html +++ b/www/api/magick-property.html @@ -1643,7 +1643,7 @@

the magick wand.

image_type
-

the image type: UndefinedType, BilevelType, GrayscaleType, GrayscaleMatteType, PaletteType, PaletteMatteType, TrueColorType, TrueColorMatteType, ColorSeparationType, ColorSeparationMatteType, or OptimizeType.

+

the image type: UndefinedType, BilevelType, GrayscaleType, GrayscaleAlphaType, PaletteType, PaletteAlphaType, TrueColorType, TrueColorAlphaType, ColorSeparationType, ColorSeparationAlphaType, or OptimizeType.

diff --git a/www/architecture.html b/www/architecture.html index ccfd24e2e..90153d438 100644 --- a/www/architecture.html +++ b/www/architecture.html @@ -734,7 +734,7 @@ void ConvertBMPToImage(const BITMAPINFOHEADER *bmp_info, 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. -- 2.40.0