Merge.

[libdcp.git] / src / asset.cc

diff --git a/src/asset.cc b/src/asset.cc
index 4b02774c3f68e6945647c253fc8d09d85262727b..f8362c8b16ca61c16d18e7e8eb32b4fac6dd3854 100644 (file)
--- a/src/asset.cc
+++ b/src/asset.cc
@@ -51,7 +51,7 @@ Asset::write_to_pkl (ostream& s) const
        s << "    <Asset>\n"
          << "      <Id>urn:uuid:" << _uuid << "</Id>\n"
          << "      <AnnotationText>" << _mxf_name << "</AnnotationText>\n"
-         << "      <Hash>" << _digest << "</Hash>\n"
+         << "      <Hash>" << digest() << "</Hash>\n"
          << "      <Size>" << filesystem::file_size(mxf_path()) << "</Size>\n"
          << "      <Type>application/mxf</Type>\n"
          << "    </Asset>\n";
@@ -110,19 +110,21 @@ Asset::equals (shared_ptr<const Asset> other, EqualityFlags flags) const
                if (_length != other->_length) {
                        notes.push_back ("MXF lengths differ");
                }
-               if (_digest != other->_digest) {
-                       notes.push_back ("MXF digests differ");
-               }
        }
        
        if (flags & MXF_BITWISE) {
+
+               if (digest() != other->digest()) {
+                       notes.push_back ("MXF digests differ");
+               }
+               
                if (filesystem::file_size (mxf_path()) != filesystem::file_size (other->mxf_path())) {
                        notes.push_back (mxf_path().string() + " and " + other->mxf_path().string() + " sizes differ");
                        return notes;
                }
                
-               ifstream a (mxf_path().c_str(), ios::binary);
-               ifstream b (other->mxf_path().c_str(), ios::binary);
+               ifstream a (mxf_path().string().c_str(), ios::binary);
+               ifstream b (other->mxf_path().string().c_str(), ios::binary);
 
                int buffer_size = 65536;
                char abuffer[buffer_size];
@@ -135,20 +137,28 @@ Asset::equals (shared_ptr<const Asset> other, EqualityFlags flags) const
                        a.read (abuffer, t);
                        b.read (bbuffer, t);
 
-                       for (int i = 0; i < t; ++i) {
-                               if (abuffer[i] != bbuffer[i]) {
-                                       notes.push_back (mxf_path().string() + " and " + other->mxf_path().string() + " content differs");
-                                       return notes;
-                               }
+                       if (memcmp (abuffer, bbuffer, t) != 0) {
+                               notes.push_back (mxf_path().string() + " and " + other->mxf_path().string() + " content differs");
+                               return notes;
                        }
 
                        n -= t;
                }
        }
 
-       if (flags & MXF_INSPECT) {
+       return notes;
+}
 
+string
+Asset::digest () const
+{
+       if (_digest.empty ()) {
+               _digest = make_digest (mxf_path().string(), 0);
        }
 
-       return notes;
+       return _digest;
 }
+
+               
+               
+