From b1dc9c3a2f7e55c9afc5bf2d5b465371b048e14f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 10 Aug 2016 16:38:33 +0100 Subject: Remove all use of stringstream in an attempt to fix the suspected thread-unsafe crash bugs on OS X. --- src/lib/image_content.cc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/lib/image_content.cc') 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 #include #include #include @@ -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 -- cgit v1.2.3