(no commit message)

[imagemagick] / tests / validate.h

diff --git a/tests/validate.h b/tests/validate.h
index 35a00fe1b48cab7f6bbef3f714c4a3486f6cc5d4..a45ed603eb0060329021b7da6a001ada0c4911e2 100644 (file)
--- a/tests/validate.h
+++ b/tests/validate.h
@@ -1,5 +1,5 @@
 /*
 /*

-  Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
+  Copyright 1999-2013 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.
   dedicated to making software imaging solutions freely available.
 
   You may not use this file except in compliance with the License.


@@ -253,18 +253,15 @@ static const struct ReferenceFormats
     { "DNG", UndefinedCompression, 0.0 },
     { "DOT", UndefinedCompression, 0.0 },
     { "DPS", UndefinedCompression, 0.0 },
     { "DNG", UndefinedCompression, 0.0 },
     { "DOT", UndefinedCompression, 0.0 },
     { "DPS", UndefinedCompression, 0.0 },

-    { "DPX", UndefinedCompression, 0.0 },
+    { "DPX", UndefinedCompression, 0.003 },

     { "ERF", UndefinedCompression, 0.0 },
     { "EXR", UndefinedCompression, 0.0 },
     { "ERF", UndefinedCompression, 0.0 },
     { "EXR", UndefinedCompression, 0.0 },

-    { "FITS", UndefinedCompression, 0.003 },

     { "FPX", UndefinedCompression, 0.0 },
     { "FRACTAL", UndefinedCompression, 0.0 },
     { "FPX", UndefinedCompression, 0.0 },
     { "FRACTAL", UndefinedCompression, 0.0 },

-    { "FTS", UndefinedCompression, 0.003 },

     { "GIF", UndefinedCompression, 0.0 },
     { "GIF87", UndefinedCompression, 0.0 },
     { "GIF", UndefinedCompression, 0.0 },
     { "GIF87", UndefinedCompression, 0.0 },

-    { "GRAY", UndefinedCompression, 0.0 },
+    { "GRAY", UndefinedCompression, 0.003 },

     { "HTM", UndefinedCompression, 0.0 },
     { "HTM", UndefinedCompression, 0.0 },

-    { "HRZ", UndefinedCompression, 0.0 },

     { "HTML", UndefinedCompression, 0.0 },
     { "ICB", UndefinedCompression, 0.0 },
     { "ICO", UndefinedCompression, 0.0 },
     { "HTML", UndefinedCompression, 0.0 },
     { "ICB", UndefinedCompression, 0.0 },
     { "ICO", UndefinedCompression, 0.0 },


@@ -273,8 +270,8 @@ static const struct ReferenceFormats
     { "INLINE", UndefinedCompression, 0.0 },
     { "JBG", UndefinedCompression, 0.0 },
     { "JNG", UndefinedCompression, 0.003 },
     { "INLINE", UndefinedCompression, 0.0 },
     { "JBG", UndefinedCompression, 0.0 },
     { "JNG", UndefinedCompression, 0.003 },

-    { "JP2", UndefinedCompression, 0.0 },
-    { "JPC", UndefinedCompression, 0.0 },
+    { "JP2", UndefinedCompression, 0.003 },
+    { "JPC", UndefinedCompression, 0.003 },

     { "JPEG", UndefinedCompression, 0.003 },
     { "JPG", UndefinedCompression, 0.003 },
     { "K25", UndefinedCompression, 0.0 },
     { "JPEG", UndefinedCompression, 0.003 },
     { "JPG", UndefinedCompression, 0.003 },
     { "K25", UndefinedCompression, 0.0 },


@@ -297,14 +294,17 @@ static const struct ReferenceFormats
     { "PEF", UndefinedCompression, 0.0 },
     { "PFA", UndefinedCompression, 0.0 },
     { "PFB", UndefinedCompression, 0.0 },
     { "PEF", UndefinedCompression, 0.0 },
     { "PFA", UndefinedCompression, 0.0 },
     { "PFB", UndefinedCompression, 0.0 },

-    { "PFM", UndefinedCompression, 0.0 },
+    { "PFM", UndefinedCompression, 0.003 },

     { "PGM", UndefinedCompression, 0.0 },
     { "PGX", UndefinedCompression, 0.0 },
     { "PGM", UndefinedCompression, 0.0 },
     { "PGX", UndefinedCompression, 0.0 },

+#if !defined(MAGICKCORE_HDRI_SUPPORT)

     { "PICT", UndefinedCompression, 0.003 },
     { "PICT", UndefinedCompression, 0.003 },

+#endif

     { "PIX", UndefinedCompression, 0.0 },
     { "PJPEG", UndefinedCompression, 0.003 },
     { "PLASMA", UndefinedCompression, 0.0 },
     { "PNG", UndefinedCompression, 0.0 },
     { "PIX", UndefinedCompression, 0.0 },
     { "PJPEG", UndefinedCompression, 0.003 },
     { "PLASMA", UndefinedCompression, 0.0 },
     { "PNG", UndefinedCompression, 0.0 },

+    { "PNG8", UndefinedCompression, 0.0 },

     { "PNG24", UndefinedCompression, 0.0 },
     { "PNG32", UndefinedCompression, 0.0 },
     { "PNM", UndefinedCompression, 0.0 },
     { "PNG24", UndefinedCompression, 0.0 },
     { "PNG32", UndefinedCompression, 0.0 },
     { "PNM", UndefinedCompression, 0.0 },


@@ -417,8 +417,8 @@ static const struct ReferenceStorage
     { CharPixel, sizeof(unsigned char) },
     { DoublePixel, sizeof(double) },
     { FloatPixel, sizeof(float) },
     { 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 }
   };
     { ShortPixel, sizeof(unsigned short) },
     { UndefinedPixel, 0 }
   };


@@ -448,7 +448,7 @@ static const struct ReferenceTypes
     { TrueColorType, 10 },
     { TrueColorType, 12 },
     { TrueColorType, 16 },
     { TrueColorType, 10 },
     { TrueColorType, 12 },
     { TrueColorType, 16 },

-    { UndefinedColorType, 0 }
+    { UndefinedType, 0 }

   };
 
 #endif
   };
 
 #endif