(no commit message)

[imagemagick] / MagickCore / version.c

diff --git a/MagickCore/version.c b/MagickCore/version.c
index 8da1ed7cd66460b23b7aa84047393f11a9c98f67..22e37208571b428de28bac4d41ee5c0a95e0b3ff 100644 (file)
--- a/MagickCore/version.c
+++ b/MagickCore/version.c
@@ -13,11 +13,11 @@
 %                   MagickCore Version and Copyright Methods                  %
 %                                                                             %
 %                              Software Design                                %
-%                                John Cristy                                  %
+%                                   Cristy                                    %
 %                               September 2002                                %
 %                                                                             %
 %                                                                             %
-%  Copyright 1999-2013 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.  You may  %
@@ -47,6 +47,7 @@
 #include "MagickCore/utility.h"
 #include "MagickCore/utility-private.h"
 #include "MagickCore/version.h"
+#include "MagickCore/version-private.h"
 \f
 /*
   Define declarations.
@@ -141,7 +142,7 @@ MagickExport const char *GetMagickDelegates(void)
 #if defined(MAGICKCORE_JPEG_DELEGATE) && defined(MAGICKCORE_PNG_DELEGATE)
   "jng "
 #endif
-#if defined(MAGICKCORE_JP2_DELEGATE)
+#if defined(MAGICKCORE_LIBOPENJP2_DELEGATE)
   "jp2 "
 #endif
 #if defined(MAGICKCORE_JPEG_DELEGATE)
@@ -162,9 +163,6 @@ MagickExport const char *GetMagickDelegates(void)
 #if defined(MAGICKCORE_OPENEXR_DELEGATE)
   "openexr "
 #endif
-#if defined(MAGICKCORE_PANGO_DELEGATE)
-  "pango "
-#endif
 #if defined(MAGICKCORE_PANGOCAIRO_DELEGATE)
   "pangocairo "
 #endif
@@ -174,9 +172,6 @@ MagickExport const char *GetMagickDelegates(void)
 #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
@@ -224,6 +219,9 @@ MagickExport const char *GetMagickDelegates(void)
 MagickExport const char *GetMagickFeatures(void)
 {
   return "DPC"
+#if defined(MAGICKCORE_BUILD_MODULES) || defined(_DLL)
+  " Modules"
+#endif
 #if defined(MAGICKCORE_HDRI_SUPPORT)
   " HDRI"
 #endif