(no commit message)

[imagemagick] / MagickCore / MagickCore.h

diff --git a/MagickCore/MagickCore.h b/MagickCore/MagickCore.h
index 1dc4c4c48a8826ba7a61d9858e8715658826e2a9..ce6b94ecf783578e5d4b1999b36fe71d1e2548fb 100644 (file)
--- a/MagickCore/MagickCore.h
+++ b/MagickCore/MagickCore.h
@@ -1,5 +1,5 @@
 /*
-  Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization
+  Copyright 1999-2014 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.
@@ -44,10 +44,20 @@ extern "C" {
 # endif
 #endif
 
+#define MAGICKCORE_CHECK_VERSION(major,minor,micro) \
+  ((MAGICKCORE_MAJOR_VERSION > (major)) || \
+    ((MAGICKCORE_MAJOR_VERSION == (major)) && \
+     (MAGICKCORE_MINOR_VERSION > (minor))) || \
+    ((MAGICKCORE_MAJOR_VERSION == (major)) && \
+     (MAGICKCORE_MINOR_VERSION == (minor)) && \
+     (MAGICKCORE_MICRO_VERSION >= (micro))))
+
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
+#include <math.h>
 #include <sys/types.h>
+#include <time.h>
 
 #if defined(WIN32) || defined(WIN64)
 #  define MAGICKCORE_WINDOWS_SUPPORT
@@ -69,6 +79,7 @@ extern "C" {
 #include "MagickCore/blob.h"
 #include "MagickCore/cache.h"
 #include "MagickCore/cache-view.h"
+#include "MagickCore/channel.h"
 #include "MagickCore/cipher.h"
 #include "MagickCore/client.h"
 #include "MagickCore/coder.h"
@@ -85,6 +96,7 @@ extern "C" {
 #include "MagickCore/deprecate.h"
 #include "MagickCore/display.h"
 #include "MagickCore/distort.h"
+#include "MagickCore/distribute-cache.h"
 #include "MagickCore/draw.h"
 #include "MagickCore/effect.h"
 #include "MagickCore/enhance.h"
@@ -112,6 +124,7 @@ extern "C" {
 #include "MagickCore/monitor.h"
 #include "MagickCore/montage.h"
 #include "MagickCore/morphology.h"
+#include "MagickCore/opencl.h"
 #include "MagickCore/option.h"
 #include "MagickCore/paint.h"
 #include "MagickCore/pixel.h"