summaryrefslogtreecommitdiff
path: root/src/lib/image_content.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-08-10 16:38:33 +0100
committerCarl Hetherington <cth@carlh.net>2016-08-12 09:13:51 +0100
commitb1dc9c3a2f7e55c9afc5bf2d5b465371b048e14f (patch)
tree9968238c6c0511f044e6fcdb4abcc08b5eb28f27 /src/lib/image_content.cc
parent4a0ae92e28d7d1f0dd648d1b620efc324fdef161 (diff)
Remove all use of stringstream in an attempt to fix
the suspected thread-unsafe crash bugs on OS X.
Diffstat (limited to 'src/lib/image_content.cc')
-rw-r--r--src/lib/image_content.cc9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index 08b9fd6ae..825f6da25 100644
--- a/src/lib/image_content.cc
+++ b/src/lib/image_content.cc
@@ -27,7 +27,6 @@
#include "frame_rate_change.h"
#include "exceptions.h"
#include "image_filename_sorter.h"
-#include <locked_sstream.h>
#include <libcxml/cxml.h>
#include <libxml++/libxml++.h>
#include <boost/foreach.hpp>
@@ -136,11 +135,9 @@ ImageContent::full_length () const
string
ImageContent::identifier () const
{
- locked_stringstream s;
- s << Content::identifier();
- s << "_" << video->identifier ();
- s << "_" << video->length();
- return s.str ();
+ char buffer[256];
+ snprintf (buffer, sizeof(buffer), "%s_%s_%" PRId64, Content::identifier().c_str(), video->identifier().c_str(), video->length());
+ return buffer;
}
bool