(no commit message)

[imagemagick] / MagickCore / magick-type.h

diff --git a/MagickCore/magick-type.h b/MagickCore/magick-type.h
index 2b18b5e678a93eb3820ec2ab2f0169c7b9f7aaef..67e708c29a2acf9a2650737651aa869509262f61 100644 (file)
--- a/MagickCore/magick-type.h
+++ b/MagickCore/magick-type.h
@@ -130,6 +130,12 @@ typedef unsigned __int64 MagickSizeType;
 #define MagickSizeFormat  "I64u"
 #endif
 
+#if QuantumDepth > 16
+  typedef double SignedQuantum;
+#else
+  typedef ssize_t SignedQuantum;
+#endif
+
 #if defined(_MSC_VER) && (_MSC_VER == 1200)
 typedef MagickOffsetType QuantumAny;
 #else
@@ -153,6 +159,36 @@ typedef enum
   MagickTrue = 1
 } MagickBooleanType;
 
+/*
+   Define some short-hand macros for handling MagickBooleanType
+   Some of these assume MagickBooleanType uses values 0 and 1,
+   and uses fast C typing with C boolean operations
+
+     Is  -- returns MagickBooleanType
+     If  -- returns C integer boolean (for if's and while's)
+
+   IsTrue()  converts a C integer boolean to a MagickBooleanType
+   IsFalse() is a  MagickBooleanType 'not' operation
+
+   IfTrue()   converts MagickBooleanType to C integer Boolean
+   IfFalse()  Not the MagickBooleanType to C integer Boolean
+
+   IsNULL() and IsNotNULL() converts C pointers to MagickBooleanType
+*/
+#if 1
+#  define IsMagickTrue(v)  ((MagickBooleanType)((int)(v)!= 0))
+#  define IsMagickFalse(v) ((MagickBooleanType)(!(int)(v)))
+#  define IfMagickTrue(v)  ((int)(v))
+#  define IfMagickFalse(v) (!(int)(v))
+#else
+#  define IsMagickTrue(v)  (((MagickBooleanType)(v))!=MagickFalse?MagickTrue:MagickFalse)
+#  define IsMagickFalse(v) (((MagickBooleanType)(v))==MagickFalse?MagickTrue:MagickFalse)
+#  define IfMagickTrue(v)  ((v) != MagickFalse)
+#  define IfMagickFalse(v) ((v) == MagickFalse)
+#endif
+#define IsMagickNULL(v) (((void *)(v) == NULL)?MagickTrue:MagickFalse)
+#define IsMagickNotNULL(v) (((void *)(v) != NULL)?MagickTrue:MagickFalse)
+
 typedef struct _BlobInfo BlobInfo;
 
 typedef struct _ExceptionInfo ExceptionInfo;