projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into 2.0
[dcpomatic.git]
/
src
/
lib
/
image_content.cc
diff --git
a/src/lib/image_content.cc
b/src/lib/image_content.cc
index 8909240dc334e3d793e2ff64cc7d8b4922c8a1f1..84b0b75c9732a4cd47dc30e1698ee1a82335c675 100644
(file)
--- a/
src/lib/image_content.cc
+++ b/
src/lib/image_content.cc
@@
-20,17
+20,17
@@
#include <libcxml/cxml.h>
#include "image_content.h"
#include "image_examiner.h"
#include <libcxml/cxml.h>
#include "image_content.h"
#include "image_examiner.h"
-#include "config.h"
#include "compose.hpp"
#include "film.h"
#include "job.h"
#include "frame_rate_change.h"
#include "compose.hpp"
#include "film.h"
#include "job.h"
#include "frame_rate_change.h"
+#include "exceptions.h"
+#include "safe_stringstream.h"
#include "i18n.h"
using std::string;
using std::cout;
#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)
using boost::shared_ptr;
ImageContent::ImageContent (shared_ptr<const Film> f, boost::filesystem::path p)
@@
-109,9
+109,7
@@
ImageContent::examine (shared_ptr<Job> job)
assert (film);
shared_ptr<ImageExaminer> examiner (new ImageExaminer (film, shared_from_this(), job));
assert (film);
shared_ptr<ImageExaminer> examiner (new ImageExaminer (film, shared_from_this(), job));
-
take_from_video_examiner (examiner);
take_from_video_examiner (examiner);
- set_video_length (examiner->video_length ());
}
void
}
void
@@
-136,7
+134,7
@@
ImageContent::full_length () const
string
ImageContent::identifier () const
{
string
ImageContent::identifier () const
{
-
strings
tream s;
+
SafeStringS
tream s;
s << VideoContent::identifier ();
s << "_" << video_length().get();
return s.str ();
s << VideoContent::identifier ();
s << "_" << video_length().get();
return s.str ();