/*
- Copyright 1999-2010 ImageMagick Studio LLC, a non-profit organization
+ Copyright 1999-2018 ImageMagick Studio LLC, a non-profit organization
dedicated to making software imaging solutions freely available.
You may not use this file except in compliance with the License.
obtain a copy of the License at
- http://www.imagemagick.org/script/license.php
+ https://www.imagemagick.org/script/license.php
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
static const char
*compare_options[] =
{
- "",
- "-compose Src",
- "-highlight-color SeaGreen",
+ "-metric RMSE -fuzz 5%",
"-metric AE -fuzz 5%",
(const char *) NULL
};
*composite_options[] =
{
"",
- "-compose Add",
"-compose Atop",
"-compose Blend",
"-compose Bumpmap",
"-compose Luminize",
"-compose Minus",
"-compose Modulate",
+ "-compose ModulusAdd",
+ "-compose ModulusSubtract",
"-compose Multiply",
"-compose None",
"-compose Out",
"-compose SrcOut",
"-compose SrcOver",
"-compose Src",
- "-compose Subtract",
"-compose Threshold",
"-compose Xor",
"-geometry +35+65 -label Magick",
"-black-threshold 20%",
"-blur 0x0.5",
"-border 6x6",
+ "-canny 0x1+10%+80%",
"-charcoal 0x1",
"-chop 8x6+20+30",
"-colors 16",
"-paint 0x1",
"-raise 10x10",
"-random-threshold 10%",
- "-recolor '0.9 0 0, 0 0.9 0, 0 0 1.2'",
+ "-color-matrix '0.9 0 0, 0 0.9 0, 0 0 1.2'",
"-density 75x75 -resample 50x50",
"-resize 10%",
"-resize 50%",
+ "-resize 50x150%",
+ "-resize 100%",
"-resize 150%",
+ "-resize 150x75%",
"-roll +20+10",
"-rotate 0",
"-rotate 45",
"-rotate 270",
"-sample 5%",
"-sample 50%",
+ "-sample 50x150%",
+ "-sample 100%",
"-sample 150%",
+ "-sample 150x50%",
"-scale 5%",
"-scale 50%",
+ "-scale 50x150%",
+ "-scale 100%",
"-scale 150%",
+ "-scale 150x50%",
"-segment 1x1.5",
"-shade 30x30",
"-sharpen 0x1.0",
{ "ART", UndefinedCompression, 0.0 },
{ "AVS", UndefinedCompression, 0.0 },
{ "BMP", UndefinedCompression, 0.0 },
+ { "BMP2", UndefinedCompression, 0.0 },
+ { "BMP3", UndefinedCompression, 0.0 },
{ "CIN", UndefinedCompression, 0.0 },
{ "CMYK", UndefinedCompression, 0.0 },
{ "CMYKA", UndefinedCompression, 0.0 },
{ "DNG", UndefinedCompression, 0.0 },
{ "DOT", UndefinedCompression, 0.0 },
{ "DPS", UndefinedCompression, 0.0 },
- { "DPX", UndefinedCompression, 0.0 },
+ { "DPX", UndefinedCompression, 0.004 },
{ "ERF", UndefinedCompression, 0.0 },
{ "EXR", UndefinedCompression, 0.0 },
- { "FITS", UndefinedCompression, 0.003 },
{ "FPX", UndefinedCompression, 0.0 },
{ "FRACTAL", UndefinedCompression, 0.0 },
- { "FTS", UndefinedCompression, 0.003 },
{ "GIF", UndefinedCompression, 0.0 },
{ "GIF87", UndefinedCompression, 0.0 },
- { "GRAY", UndefinedCompression, 0.0 },
+ { "GRAY", UndefinedCompression, 0.004 },
{ "HTM", UndefinedCompression, 0.0 },
- { "HRZ", UndefinedCompression, 0.0 },
{ "HTML", UndefinedCompression, 0.0 },
{ "ICB", UndefinedCompression, 0.0 },
{ "ICO", UndefinedCompression, 0.0 },
{ "ICON", UndefinedCompression, 0.0 },
{ "INFO", UndefinedCompression, 0.0 },
- { "INLINE", UndefinedCompression, 0.0 },
{ "JBG", UndefinedCompression, 0.0 },
- { "JNG", UndefinedCompression, 0.003 },
- { "JP2", UndefinedCompression, 0.0 },
- { "JPC", UndefinedCompression, 0.0 },
- { "JPEG", UndefinedCompression, 0.003 },
- { "JPG", UndefinedCompression, 0.003 },
+ { "JNG", UndefinedCompression, 0.004 },
+ { "JNG", JPEGCompression, 0.004 },
+ { "JP2", UndefinedCompression, 0.004 },
+ { "J2K", UndefinedCompression, 0.004 },
+ { "JPEG", UndefinedCompression, 0.004 },
+ { "JPG", UndefinedCompression, 0.004 },
{ "K25", UndefinedCompression, 0.0 },
{ "KDC", UndefinedCompression, 0.0 },
{ "MATTE", UndefinedCompression, 0.0 },
{ "MIFF", UndefinedCompression, 0.0 },
+ { "MIFF", RLECompression, 0.0 },
+ { "MIFF", ZipCompression, 0.0 },
{ "MNG", UndefinedCompression, 0.0 },
{ "MONO", UndefinedCompression, 0.0 },
{ "MRW", UndefinedCompression, 0.0 },
{ "PAL", UndefinedCompression, 0.0 },
{ "PAM", UndefinedCompression, 0.0 },
{ "PBM", UndefinedCompression, 0.0 },
- { "PCT", UndefinedCompression, 0.003 },
+ { "PCT", UndefinedCompression, 0.004 },
{ "PCX", UndefinedCompression, 0.0 },
{ "PEF", UndefinedCompression, 0.0 },
{ "PFA", UndefinedCompression, 0.0 },
{ "PFB", UndefinedCompression, 0.0 },
- { "PFM", UndefinedCompression, 0.0 },
+ { "PFM", UndefinedCompression, 0.004 },
{ "PGM", UndefinedCompression, 0.0 },
{ "PGX", UndefinedCompression, 0.0 },
- { "PICT", UndefinedCompression, 0.003 },
+ { "PICT", UndefinedCompression, 0.004 },
{ "PIX", UndefinedCompression, 0.0 },
- { "PJPEG", UndefinedCompression, 0.003 },
+ { "PJPEG", UndefinedCompression, 0.004 },
{ "PLASMA", UndefinedCompression, 0.0 },
{ "PNG", UndefinedCompression, 0.0 },
+ { "PNG8", UndefinedCompression, 0.0 },
{ "PNG24", UndefinedCompression, 0.0 },
{ "PNG32", UndefinedCompression, 0.0 },
+ { "PNG48", UndefinedCompression, 0.0 },
+ { "PNG64", UndefinedCompression, 0.0 },
+ { "PNG00", UndefinedCompression, 0.0 },
{ "PNM", UndefinedCompression, 0.0 },
{ "PPM", UndefinedCompression, 0.0 },
{ "PREVIEW", UndefinedCompression, 0.0 },
{ "RAF", UndefinedCompression, 0.0 },
{ "RAS", UndefinedCompression, 0.0 },
{ "RGB", UndefinedCompression, 0.0 },
- { "RGBA", UndefinedCompression, 0.003 },
- { "RGBO", UndefinedCompression, 0.003 },
+ { "RGBA", UndefinedCompression, 0.004 },
+ { "RGBO", UndefinedCompression, 0.004 },
{ "RLA", UndefinedCompression, 0.0 },
{ "RLE", UndefinedCompression, 0.0 },
{ "SCR", UndefinedCompression, 0.0 },
{ "UYVY", UndefinedCompression, 0.0 },
{ "VDA", UndefinedCompression, 0.0 },
{ "VICAR", UndefinedCompression, 0.0 },
- { "VIFF", UndefinedCompression, 0.0 },
+ { "VIFF", UndefinedCompression, 0.004 },
{ "VST", UndefinedCompression, 0.0 },
{ "WBMP", UndefinedCompression, 0.0 },
{ "WPG", UndefinedCompression, 0.0 },
{ "X3F", UndefinedCompression, 0.0 },
{ "XBM", UndefinedCompression, 0.0 },
{ "XCF", UndefinedCompression, 0.0 },
- { "XPM", UndefinedCompression, 0.0 },
+ { "XPM", UndefinedCompression, 0.004 },
{ "XPS", UndefinedCompression, 0.0 },
- { "XV", UndefinedCompression, 0.0 },
+ { "XV", UndefinedCompression, 0.004 },
#if !defined(MAGICKCORE_WINDOWS_SUPPORT)
{ "XWD", UndefinedCompression, 0.0 },
#endif
{ "PDF", UndefinedCompression, 0.0 },
{ "PDF", ZipCompression, 0.0 },
{ "PDF", FaxCompression, 0.0 },
- { "PDF", JPEGCompression, 0.003 },
+ { "PDF", JPEGCompression, 0.004 },
{ "PDF", RLECompression, 0.0 },
{ "PDF", LZWCompression, 0.0 },
{ "PDFA", UndefinedCompression, 0.0 },
{ "PS3", UndefinedCompression, 0.0 },
{ "PS3", ZipCompression, 0.0 },
{ "PS3", FaxCompression, 0.0 },
- { "PS3", JPEGCompression, 0.003 },
+ { "PS3", JPEGCompression, 0.004 },
{ "PS3", RLECompression, 0.0 },
{ "PS3", LZWCompression, 0.0 },
#endif
{ CharPixel, sizeof(unsigned char) },
{ DoublePixel, sizeof(double) },
{ FloatPixel, sizeof(float) },
- { IntegerPixel, sizeof(unsigned int) },
- { LongPixel, sizeof(size_t) },
+ { LongPixel, sizeof(unsigned int) },
+ { LongLongPixel, sizeof(MagickSizeType) },
{ ShortPixel, sizeof(unsigned short) },
{ UndefinedPixel, 0 }
};
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 },