(no commit message)

[imagemagick] / tests / validate.h

diff --git a/tests/validate.h b/tests/validate.h
index 610c7c94a9379c988467b585f4279f2f70baa63c..707fe53ceafcb468caa73ce0fa2db265ab7bd9bd 100644 (file)
--- a/tests/validate.h
+++ b/tests/validate.h
@@ -1,5 +1,5 @@
 /*
-  Copyright 1999-2014 ImageMagick Studio LLC, a non-profit organization
+  Copyright 1999-2015 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.
@@ -33,7 +33,6 @@ static const char
   *composite_options[] =
   {
     "",
-    "-compose Add",
     "-compose Atop",
     "-compose Blend",
     "-compose Bumpmap",
@@ -71,6 +70,8 @@ static const char
     "-compose Luminize",
     "-compose Minus",
     "-compose Modulate",
+    "-compose ModulusAdd",
+    "-compose ModulusSubtract",
     "-compose Multiply",
     "-compose None",
     "-compose Out",
@@ -87,7 +88,6 @@ static const char
     "-compose SrcOut",
     "-compose SrcOver",
     "-compose Src",
-    "-compose Subtract",
     "-compose Threshold",
     "-compose Xor",
     "-geometry +35+65 -label Magick",
@@ -102,6 +102,7 @@ static const char
     "-black-threshold 20%",
     "-blur 0x0.5",
     "-border 6x6",
+    "-canny 0x1+10%+80%",
     "-charcoal 0x1",
     "-chop 8x6+20+30",
     "-colors 16",
@@ -155,7 +156,7 @@ static const char
     "-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%",
@@ -251,28 +252,27 @@ static const struct ReferenceFormats
     { "DNG", UndefinedCompression, 0.0 },
     { "DOT", UndefinedCompression, 0.0 },
     { "DPS", UndefinedCompression, 0.0 },
-    { "DPX", UndefinedCompression, 0.003 },
+    { "DPX", UndefinedCompression, 0.004 },
     { "ERF", UndefinedCompression, 0.0 },
     { "EXR", UndefinedCompression, 0.0 },
     { "FPX", UndefinedCompression, 0.0 },
     { "FRACTAL", UndefinedCompression, 0.0 },
     { "GIF", UndefinedCompression, 0.0 },
     { "GIF87", UndefinedCompression, 0.0 },
-    { "GRAY", UndefinedCompression, 0.003 },
+    { "GRAY", UndefinedCompression, 0.004 },
     { "HTM", 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 },
-    { "JNG", JPEGCompression, 0.003 },
-    { "JP2", UndefinedCompression, 0.003 },
-    { "J2K", UndefinedCompression, 0.003 },
-    { "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 },
@@ -288,19 +288,17 @@ static const struct ReferenceFormats
     { "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.003 },
+    { "PFM", UndefinedCompression, 0.004 },
     { "PGM", UndefinedCompression, 0.0 },
     { "PGX", UndefinedCompression, 0.0 },
-#if !defined(MAGICKCORE_HDRI_SUPPORT)
-    { "PICT", UndefinedCompression, 0.003 },
-#endif
+    { "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 },
@@ -318,8 +316,8 @@ static const struct ReferenceFormats
     { "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 },
@@ -343,16 +341,16 @@ static const struct ReferenceFormats
     { "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.003 },
+    { "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
@@ -372,7 +370,7 @@ static const struct ReferenceFormats
     { "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 },
@@ -381,7 +379,7 @@ static const struct ReferenceFormats
     { "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
@@ -438,15 +436,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 },