Merge master.

1 files changed, 23 insertions, 0 deletions

diff --git a/src/lib/image.cc b/src/lib/image.cc
index 432cfbd54..d4ec6f99a 100644
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -22,6 +22,7 @@
  */
 
 #include <iostream>
+#include <openssl/md5.h>
 extern "C" {
 #include <libswscale/swscale.h>
 #include <libavutil/pixfmt.h>
@@ -40,6 +41,7 @@ using std::min;
 using std::cout;
 using std::cerr;
 using std::list;
+using std::stringstream;
 using boost::shared_ptr;
 using dcp::Size;
 
@@ -662,3 +664,24 @@ merge (list<PositionImage> images)
 
 	return PositionImage (merged, all.position ());
 }
+
+string
+Image::digest () const
+{
+	MD5_CTX md5_context;
+	MD5_Init (&md5_context);
+
+	for (int i = 0; i < components(); ++i) {
+		MD5_Update (&md5_context, data()[i], line_size()[i]);
+	}
+	
+	unsigned char digest[MD5_DIGEST_LENGTH];
+	MD5_Final (digest, &md5_context);
+	
+	stringstream s;
+	for (int i = 0; i < MD5_DIGEST_LENGTH; ++i) {
+		s << std::hex << std::setfill('0') << std::setw(2) << ((int) digest[i]);
+	}
+
+	return s.str ();
+}