diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-08-23 22:50:40 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-08-23 22:50:40 +0100 |
| commit | 8c7a308c03e4b4196b4e2379a26d432b100ae2b1 (patch) | |
| tree | 605c8b62f56c5f9be2ff77161eb18ac372083a35 /src/lib/image_content.cc | |
| parent | 04acfa42cdffd5938358847ebee822399ef978e6 (diff) | |
| parent | a6d6a794b28c3b3e6679f01c1890f396453eb5ac (diff) | |
Merge master.
Diffstat (limited to 'src/lib/image_content.cc')
| -rw-r--r-- | src/lib/image_content.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc index 70d777bca..84b0b75c9 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) @@ -134,7 +134,7 @@ ImageContent::full_length () const string ImageContent::identifier () const { - stringstream s; + SafeStringStream s; s << VideoContent::identifier (); s << "_" << video_length().get(); return s.str (); |