From f4d600938e21845491d5592cb05b284ebc7cffa0 Mon Sep 17 00:00:00 2001 From: cristy Date: Wed, 6 Oct 2010 17:06:45 +0000 Subject: [PATCH] --- config/configure.xml | 2 +- magick/version.h | 19 +++++++++++++++++-- magick/version.h.in | 17 ++++++++++++++++- 3 files changed, 34 insertions(+), 4 deletions(-) diff --git a/config/configure.xml b/config/configure.xml index 5f8537e06..4fc8f0625 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -9,7 +9,7 @@ - + diff --git a/magick/version.h b/magick/version.h index 785f062a1..a20f2fa31 100644 --- a/magick/version.h +++ b/magick/version.h @@ -33,10 +33,25 @@ extern "C" { #define MagickLibAddendum "-10" #define MagickLibInterface 4 #define MagickLibMinInterface 4 -#define MagickReleaseDate "2010-10-05" +#define MagickReleaseDate "2010-10-06" #define MagickChangeDate "20101005" #define MagickAuthoritativeURL "http://www.imagemagick.org" -#define MagickFeatures "OpenMP " +#if defined(MAGICKCORE_OPENMP_SUPPORT) +#define MagickOpenMPFeature "OpenMP " +#else +#define MagickOpenMPFeature " " +#endif +#if defined(MAGICKCORE_OPENCL_SUPPORT) +#define MagickOpenCLFeature "OpenCL " +#else +#define MagickOpenCLFeature " " +#endif +#if defined(MAGICKCORE_HDRI_SUPPORT) +#define MagickHDRIFeature "HDRI " +#else +#define MagickHDRIFeature " " +#endif +#define MagickFeatures MagickOpenMPFeature MagickOpenCLFeature MagickHDRIFeature #define MagickHomeURL "file:///usr/local/share/doc/ImageMagick-6.6.4/index.html" #if (MAGICKCORE_QUANTUM_DEPTH == 8) #define MagickQuantumDepth "Q8" diff --git a/magick/version.h.in b/magick/version.h.in index 4f8d31db2..c88670b1c 100644 --- a/magick/version.h.in +++ b/magick/version.h.in @@ -36,7 +36,22 @@ extern "C" { #define MagickReleaseDate "@PACKAGE_RELEASE_DATE@" #define MagickChangeDate "@PACKAGE_CHANGE_DATE@" #define MagickAuthoritativeURL "http://www.imagemagick.org" -#define MagickFeatures "@MAGICK_FEATURES@" +#if defined(MAGICKCORE_OPENMP_SUPPORT) +#define MagickOpenMPFeature "OpenMP " +#else +#define MagickOpenMPFeature " " +#endif +#if defined(MAGICKCORE_OPENCL_SUPPORT) +#define MagickOpenCLFeature "OpenCL " +#else +#define MagickOpenCLFeature " " +#endif +#if defined(MAGICKCORE_HDRI_SUPPORT) +#define MagickHDRIFeature "HDRI " +#else +#define MagickHDRIFeature " " +#endif +#define MagickFeatures MagickOpenMPFeature MagickOpenCLFeature MagickHDRIFeature #define MagickHomeURL "file://@DOCUMENTATION_PATH@/index.html" #if (MAGICKCORE_QUANTUM_DEPTH == 8) #define MagickQuantumDepth "Q8" -- 2.40.0