Eliminate c++ compiler warnings

[imagemagick] / tests / validate.h

diff --git a/tests/validate.h b/tests/validate.h
index cfaf130ff6f289a69a8d24bdd3aa80eec8201f9d..5ccd60d2e343e11805b6fc96baa917caa41d8fa0 100644 (file)
--- a/tests/validate.h
+++ b/tests/validate.h
@@ -1,11 +1,11 @@
 /*
-  Copyright 1999-2014 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,
@@ -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,11 +156,14 @@ 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%",
+    "-resize 50x150%",
+    "-resize 100%",
     "-resize 150%",
+    "-resize 150x75%",
     "-roll +20+10",
     "-rotate 0",
     "-rotate 45",
@@ -168,10 +172,16 @@ static const char
     "-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",
@@ -238,6 +248,8 @@ static const struct ReferenceFormats
     { "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 },
@@ -265,7 +277,6 @@ static const struct ReferenceFormats
     { "ICO", UndefinedCompression, 0.0 },
     { "ICON", UndefinedCompression, 0.0 },
     { "INFO", UndefinedCompression, 0.0 },
-    { "INLINE", UndefinedCompression, 0.0 },
     { "JBG", UndefinedCompression, 0.0 },
     { "JNG", UndefinedCompression, 0.004 },
     { "JNG", JPEGCompression, 0.004 },
@@ -277,6 +288,8 @@ static const struct ReferenceFormats
     { "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 },
@@ -296,9 +309,7 @@ static const struct ReferenceFormats
     { "PFM", UndefinedCompression, 0.004 },
     { "PGM", UndefinedCompression, 0.0 },
     { "PGX", UndefinedCompression, 0.0 },
-#if !defined(MAGICKCORE_HDRI_SUPPORT)
     { "PICT", UndefinedCompression, 0.004 },
-#endif
     { "PIX", UndefinedCompression, 0.0 },
     { "PJPEG", UndefinedCompression, 0.004 },
     { "PLASMA", UndefinedCompression, 0.0 },
@@ -343,7 +354,7 @@ 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 },
@@ -438,15 +449,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 },