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 70d777bca11f6e52a466dbf44414b7a1ab048163..84b0b75c9732a4cd47dc30e1698ee1a82335c675 100644
(file)
--- 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 "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)
@@
-134,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 ();