From 6ba3b5dcabbe2849192ad3f97463404dce076c23 Mon Sep 17 00:00:00 2001 From: dirk Date: Sun, 11 Aug 2013 08:21:35 +0000 Subject: [PATCH] Modified GetMagickDelegates and GetMagickFeatures to produce better results for Windows. --- MagickCore/version.c | 114 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 112 insertions(+), 2 deletions(-) diff --git a/MagickCore/version.c b/MagickCore/version.c index 41ab58929..8da1ed7cd 100644 --- a/MagickCore/version.c +++ b/MagickCore/version.c @@ -98,7 +98,107 @@ MagickExport const char *GetMagickCopyright(void) */ MagickExport const char *GetMagickDelegates(void) { - return(MagickDelegates); + return "" +#if defined(MAGICKCORE_AUTOTRACE_DELEGATE) + "autotrace " +#endif +#if defined(MAGICKCORE_BZLIB_DELEGATE) + "bzlib " +#endif +#if defined(MAGICKCORE_CAIRO_DELEGATE) + "cairo " +#endif +#if defined(MAGICKCORE_DJVU_DELEGATE) + "djvu " +#endif +#if defined(MAGICKCORE_DPS_DELEGATE) + "dps " +#endif +#if defined(MAGICKCORE_EMF_DELEGATE) + "emf " +#endif +#if defined(MAGICKCORE_FFTW_DELEGATE) + "fftw " +#endif +#if defined(MAGICKCORE_FONTCONFIG_DELEGATE) + "fontconfig " +#endif +#if defined(MAGICKCORE_FREETYPE_DELEGATE) + "freetype " +#endif +#if defined(MAGICKCORE_FPX_DELEGATE) + "fpx " +#endif +#if defined(MAGICKCORE_GS_DELEGATE) + "gslib " +#endif +#if defined(MAGICKCORE_GVC_DELEGATE) + "gvc " +#endif +#if defined(MAGICKCORE_JBIG_DELEGATE) + "jbig " +#endif +#if defined(MAGICKCORE_JPEG_DELEGATE) && defined(MAGICKCORE_PNG_DELEGATE) + "jng " +#endif +#if defined(MAGICKCORE_JP2_DELEGATE) + "jp2 " +#endif +#if defined(MAGICKCORE_JPEG_DELEGATE) + "jpeg " +#endif +#if defined(MAGICKCORE_LCMS_DELEGATE) + "lcms " +#endif +#if defined(MAGICKCORE_LQR_DELEGATE) + "lqr " +#endif +#if defined(MAGICKCORE_LTDL_DELEGATE) + "ltdl " +#endif +#if defined(MAGICKCORE_LZMA_DELEGATE) + "lzma " +#endif +#if defined(MAGICKCORE_OPENEXR_DELEGATE) + "openexr " +#endif +#if defined(MAGICKCORE_PANGO_DELEGATE) + "pango " +#endif +#if defined(MAGICKCORE_PANGOCAIRO_DELEGATE) + "pangocairo " +#endif +#if defined(MAGICKCORE_PNG_DELEGATE) + "png " +#endif +#if defined(MAGICKCORE_DPS_DELEGATE) || defined(MAGICKCORE_GS_DELEGATE) || defined(WIN32) + "ps " +#endif +#if defined(MAGICKCORE_PNG_DELEGATE) + "png " +#endif +#if defined(MAGICKCORE_RSVG_DELEGATE) + "rsvg " +#endif +#if defined(MAGICKCORE_TIFF_DELEGATE) + "tiff " +#endif +#if defined(MAGICKCORE_WEBP_DELEGATE) + "webp " +#endif +#if defined(MAGICKCORE_WMF_DELEGATE) || defined (MAGICKCORE_WMFLITE_DELEGATE) + "wmf " +#endif +#if defined(MAGICKCORE_X11_DELEGATE) + "x " +#endif +#if defined(MAGICKCORE_XML_DELEGATE) + "xml " +#endif +#if defined(MAGICKCORE_ZLIB_DELEGATE) + "zlib" +#endif + ; } /* @@ -123,7 +223,17 @@ MagickExport const char *GetMagickDelegates(void) */ MagickExport const char *GetMagickFeatures(void) { - return(MagickFeatures); + return "DPC" +#if defined(MAGICKCORE_HDRI_SUPPORT) + " HDRI" +#endif +#if defined(MAGICKCORE_OPENCL_SUPPORT) + " OpenCL" +#endif +#if defined(MAGICKCORE_OPENMP_SUPPORT) + " OpenMP" +#endif + ; } /* -- 2.40.0