Changeset 1029 in SHVCSoftware for branches/SHM-dev/source/Lib/libmd5/MD5.h

Timestamp:

26 Feb 2015, 00:21:54 (10 years ago)

Author:

seregin

Message:

merge with SHM-upgrade branch

Location:

branches/SHM-dev

Files:

• . (modified) (1 prop)
• source (modified) (1 prop)
• source/Lib/libmd5/MD5.h (modified) (3 diffs)

branches/SHM-dev/source/Lib/libmd5/MD5.h

@@ -33 +33 @@
 #pragma once
 #include "libmd5.h"
+#include <string>
 
 //! \ingroup libMD5
 //! \{
+
+static const UInt MD5_DIGEST_STRING_LENGTH=16;
 
 class MD5
@@ -60 +63 @@
    * flush any outstanding MD5 data, write the digest into digest.
    */
-  void finalize(unsigned char digest[16])
+  void finalize(unsigned char digest[MD5_DIGEST_STRING_LENGTH])
   {
     MD5Final(digest, &m_state);
@@ -70 +73 @@
 
 
-/**
- * Produce an ascii(hex) representation of picture digest.
- *
- * Returns: a statically allocated null-terminated string.  DO NOT FREE.
- */
-inline const char*
-digestToString(const unsigned char digest[3][16], int numChar)
-{
-  const char* hex = "0123456789abcdef";
-  static char string[99];
-  int cnt=0;
-  for(int yuvIdx=0; yuvIdx<3; yuvIdx++)
-  {
-    for (int i = 0; i < numChar; i++)
-    {
-      string[cnt++] = hex[digest[yuvIdx][i] >> 4];
-      string[cnt++] = hex[digest[yuvIdx][i] & 0xf];
-    }
-    string[cnt++] = ',';
-  }
-
-  string[cnt-1] = '\0';
-  return string;
-}
 //! \}