X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_content.cc;h=132b261446120e469207018d2a9a8ebbf3728f36;hb=c008066160d85b9ec9e5485375d7baaa5d27bda2;hp=acaedf0505d746b71661d89581192f7ef52d86ec;hpb=05654d0e1799746a9df3ccab040c92e0ed825cac;p=dcpomatic.git

diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index acaedf050..132b26144 100644
--- a/src/lib/image_content.cc
+++ b/src/lib/image_content.cc
@@ -25,12 +25,12 @@
 #include "job.h"
 #include "frame_rate_change.h"
 #include "exceptions.h"
+#include "safe_stringstream.h"
 
 #include "i18n.h"
 
 using std::string;
 using std::cout;
-using std::stringstream;
 using boost::shared_ptr;
 
 ImageContent::ImageContent (shared_ptr<const Film> f, boost::filesystem::path p)
@@ -100,18 +100,15 @@ ImageContent::as_xml (xmlpp::Node* node) const
 }
 
 void
-ImageContent::examine (shared_ptr<Job> job)
+ImageContent::examine (shared_ptr<Job> job, bool calculate_digest)
 {
-	job->sub (_("Computing digest"));
-	Content::examine (job);
+	Content::examine (job, calculate_digest);
 
 	shared_ptr<const Film> film = _film.lock ();
 	assert (film);
 	
 	shared_ptr<ImageExaminer> examiner (new ImageExaminer (film, shared_from_this(), job));
-
 	take_from_video_examiner (examiner);
-	set_video_length (examiner->video_length ());
 }
 
 void
@@ -136,7 +133,7 @@ ImageContent::full_length () const
 string
 ImageContent::identifier () const
 {
-	stringstream s;
+	SafeStringStream s;
 	s << VideoContent::identifier ();
 	s << "_" << video_length().get();
 	return s.str ();