projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
dcpomatic_time.h
diff --git
a/src/lib/dcpomatic_time.h
b/src/lib/dcpomatic_time.h
index 4c7ea4ba52d524746ac9acb064ae6700d0d8ca35..55476d5b52ad6d5752344dd9a23b70d5f3770fe8 100644
(file)
--- a/
src/lib/dcpomatic_time.h
+++ b/
src/lib/dcpomatic_time.h
@@
-26,6
+26,7
@@
#include <iomanip>
#include <stdint.h>
#include "frame_rate_change.h"
#include <iomanip>
#include <stdint.h>
#include "frame_rate_change.h"
+#include "safe_stringstream.h"
class dcpomatic_round_up_test;
class dcpomatic_round_up_test;
@@
-86,7
+87,7
@@
public:
int f;
split (r, h, m, s, f);
int f;
split (r, h, m, s, f);
-
std::ostrings
tream o;
+
SafeStringS
tream o;
o.width (2);
o.fill ('0');
o << std::setw(2) << std::setfill('0') << h << ":"
o.width (2);
o.fill ('0');
o << std::setw(2) << std::setfill('0') << h << ":"