(no commit message)

diff --git a/MagickCore/magick-baseconfig.h b/MagickCore/magick-baseconfig.h
index 76e591fa1fe2764b96b45b4513b346c5260d964f..af4c7fda61fd94ec6195b84b46f5c0c99f456fd0 100644 (file)
--- a/MagickCore/magick-baseconfig.h
+++ b/MagickCore/magick-baseconfig.h
@@ -1219,7 +1219,9 @@
 /* #undef PANGO_DELEGATE */
 
 /* Define if you have PNG library */
-/* #undef PNG_DELEGATE */
+#ifndef MAGICKCORE_PNG_DELEGATE
+#define MAGICKCORE_PNG_DELEGATE 1
+#endif
 
 /* Define to necessary symbol if this constant uses a non-standard name on
    your system. */

diff --git a/MagickCore/version.c b/MagickCore/version.c
index ef45cd8186c171a6b91c1bb7a9d0b468c667b18f..dc32a6c417219184122aa30d88c36551aa4db34e 100644 (file)
--- a/MagickCore/version.c
+++ b/MagickCore/version.c
@@ -288,6 +288,76 @@ MagickExport const char *GetMagickReleaseDate(void)
 %                                                                             %
 %                                                                             %
 %                                                                             %
+%   G e t M a g i c k S i g n a t u r e                                       %
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  GetMagickSignature() returns a signature that uniquely encodes the
+%  MagickCore libary version, quantum depth, HDRI status, OS word size, and
+%  endianness.
+%
+%  The format of the GetMagickSignature method is:
+%
+%      unsigned int GetMagickSignature(const StringInfo *nonce)
+%
+%  A description of each parameter follows:
+%
+%    o nonce: arbitrary data.
+%
+*/
+
+static unsigned int CRC32(const unsigned char *message,const size_t length)
+{
+  register ssize_t
+    i;
+
+  size_t
+    crc;
+
+  static MagickBooleanType
+    crc_initial = MagickFalse;
+
+  static unsigned int
+    crc_xor[256];
+
+  /*
+    Generate a 32-bit cyclic redundancy check for the message.
+  */
+  if (crc_initial == MagickFalse)
+    {
+      size_t
+        alpha;
+
+      for (i=0; i < 256; i++)
+      {
+        register ssize_t
+          j;
+
+        alpha=(size_t) i;
+        for (j=0; j < 8; j++)
+          alpha=(alpha & 0x01) ? (0xEDB88320 ^ (alpha >> 1)) : (alpha >> 1);
+        crc_xor[i]=alpha;
+      }
+      crc_initial=MagickTrue;
+    }
+  crc=0xFFFFFFFF;
+  for (i=0; i < (ssize_t) length; i++)
+    crc=crc_xor[(crc ^ message[i]) & 0xff] ^ (crc >> 8);
+  return(crc ^ 0xFFFFFFFF);
+}
+
+MagickExport unsigned int GetMagickSignature(const StringInfo *nonce)
+{
+  return(0);
+}
+\f
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
 %   G e t M a g i c k V e r s i o n                                           %
 %                                                                             %
 %                                                                             %

diff --git a/MagickCore/version.h b/MagickCore/version.h
index cd3ba2566980840e89d8a3c0a4b289f3cda31777..13f91da14e466759669898e7c773f03a4c17790f 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -22,6 +22,8 @@
 extern "C" {
 #endif
 
+#include <MagickCore/string_.h>
+
 /*
   Define declarations.
 */
@@ -34,11 +36,11 @@ extern "C" {
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  8
 #define MagickLibMinInterface  8
-#define MagickReleaseDate  "2013-01-24"
+#define MagickReleaseDate  "2013-02-05"
 #define MagickChangeDate   "20121005"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickFeatures "DPC HDRI OpenMP"
-#define MagickDelegates "bzlib freetype jp2 jpeg lcms lzma ps tiff x xml zlib"
+#define MagickDelegates "bzlib freetype jng jp2 jpeg lcms lzma png ps tiff x xml zlib"
 #define MagickHomeURL  "file:///usr/local/share/doc/ImageMagick-7.0.0/index.html"
 #if (MAGICKCORE_QUANTUM_DEPTH == 8)
 #define MagickQuantumDepth  "Q8"
@@ -73,6 +75,9 @@ extern MagickExport const char
   *GetMagickReleaseDate(void),
   *GetMagickVersion(size_t *);
 
+extern MagickExport unsigned int
+  GetMagickSignature(const StringInfo *);
+
 extern MagickExport void
   ListMagickVersion(FILE *);
 

diff --git a/MagickCore/version.h.in b/MagickCore/version.h.in
index a715d85800cad5405e7039a5e8ada9a51070b3b4..93482d01628d6a38a92cb4fd18d0899610d2622f 100644 (file)
--- a/MagickCore/version.h.in
+++ b/MagickCore/version.h.in
@@ -22,6 +22,8 @@
 extern "C" {
 #endif
 
+#include <MagickCore/string_.h>
+
 /*
   Define declarations.
 */
@@ -73,6 +75,9 @@ extern MagickExport const char
   *GetMagickReleaseDate(void),
   *GetMagickVersion(size_t *);
 
+extern MagickExport unsigned int
+  GetMagickSignature(const StringInfo *);
+
 extern MagickExport void
   ListMagickVersion(FILE *);