Remove unused file.

[dcpomatic.git] / src / lib / subrip.cc

diff --git a/src/lib/subrip.cc b/src/lib/subrip.cc
index 6df8b236bac35e2678cb1d154d61ce408214d703..c4166cb284e26ec13816d5850895f3d8e3cd35a1 100644 (file)
--- a/src/lib/subrip.cc
+++ b/src/lib/subrip.cc
@@ -21,7 +21,6 @@
 #include "cross.h"
 #include "exceptions.h"
 #include "subrip_content.h"
-#include "data.h"
 #include <sub/subrip_reader.h>
 #include <sub/collect.h>
 #include <unicode/ucsdet.h>
@@ -35,6 +34,7 @@ using std::cout;
 using std::string;
 using boost::shared_ptr;
 using boost::scoped_array;
+using dcp::Data;
 
 SubRip::SubRip (shared_ptr<const SubRipContent> content)
 {
@@ -50,12 +50,16 @@ SubRip::SubRip (shared_ptr<const SubRipContent> content)
        UConverter* to_utf16 = ucnv_open (in_charset, &status);
        /* This is a guess; I think we should be able to encode any input in 4 times its input size */
        scoped_array<uint16_t> utf16 (new uint16_t[in.size() * 2]);
-       int const utf16_len = ucnv_toUChars (to_utf16, utf16.get(), in.size() * 2, reinterpret_cast<const char *> (in.data().get()), in.size(), &status);
+       int const utf16_len = ucnv_toUChars (
+               to_utf16, reinterpret_cast<UChar*>(utf16.get()), in.size() * 2,
+               reinterpret_cast<const char *> (in.data().get()), in.size(),
+               &status
+               );
 
        UConverter* to_utf8 = ucnv_open ("UTF-8", &status);
        /* Another guess */
        scoped_array<char> utf8 (new char[utf16_len * 2]);
-       ucnv_fromUChars (to_utf8, utf8.get(), utf16_len * 2, utf16.get(), utf16_len, &status);
+       ucnv_fromUChars (to_utf8, utf8.get(), utf16_len * 2, reinterpret_cast<UChar*>(utf16.get()), utf16_len, &status);
 
        ucsdet_close (detector);
        ucnv_close (to_utf16);