(no commit message)

[imagemagick] / MagickCore / version.c

diff --git a/MagickCore/version.c b/MagickCore/version.c
index 37507435ad71caf03b03d25e2a99f310c7f3ab70..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.
@@ -98,7 +99,101 @@ 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_LIBOPENJP2_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_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_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
+  ;
 }
 \f
 /*
@@ -123,7 +218,20 @@ MagickExport const char *GetMagickDelegates(void)
 */
 MagickExport const char *GetMagickFeatures(void)
 {
-  return(MagickFeatures);
+  return "DPC"
+#if defined(MAGICKCORE_BUILD_MODULES) || defined(_DLL)
+  " Modules"
+#endif
+#if defined(MAGICKCORE_HDRI_SUPPORT)
+  " HDRI"
+#endif
+#if defined(MAGICKCORE_OPENCL_SUPPORT)
+  " OpenCL"
+#endif
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
+  " OpenMP"
+#endif
+  ;
 }
 \f
 /*
@@ -327,6 +435,9 @@ static unsigned int CRC32(const unsigned char *message,const size_t length)
   */
   if (crc_initial == MagickFalse)
     {
+      register unsigned int
+        i;
+
       unsigned int
         alpha;
 
@@ -335,7 +446,7 @@ static unsigned int CRC32(const unsigned char *message,const size_t length)
         register ssize_t
           j;
 
-        alpha=(size_t) i;
+        alpha=i;
         for (j=0; j < 8; j++)
           alpha=(alpha & 0x01) ? (0xEDB88320 ^ (alpha >> 1)) : (alpha >> 1);
         crc_xor[i]=alpha;