diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-02-08 16:57:19 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-02-08 16:57:19 +0000 |
| commit | 587e0a47191799536f9f6cde753def29f946b5af (patch) | |
| tree | f728e0ebdfeedba0bb3cbdd4c543befb13804342 /src | |
| parent | e003bf6159311ce69609ef30375b535d45e35729 (diff) | |
| parent | 977c0b5c2f1df5134ad075e0b88e4f667c3e9d7c (diff) | |
Merge branch 'cth' of ssh://git.carlh.net/home/carl/git/asdcplib-cth into cth
Diffstat (limited to 'src')
| -rw-r--r-- | src/KM_fileio.cpp | 15 | ||||
| -rw-r--r-- | src/wscript | 2 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/KM_fileio.cpp b/src/KM_fileio.cpp index e7b1e73..8238dc3 100644 --- a/src/KM_fileio.cpp +++ b/src/KM_fileio.cpp @@ -804,9 +804,9 @@ Kumu::FileReader::OpenRead(const std::string& filename) const // suppress popup window on error UINT prev = ::SetErrorMode(SEM_FAILCRITICALERRORS|SEM_NOOPENFILEERRORBOX); - int const wn = MultiByteToWideChar (CP_UTF8, 0, filename, -1, 0, 0); + int const wn = MultiByteToWideChar (CP_UTF8, 0, filename.c_str(), -1, 0, 0); wchar_t* buffer = new wchar_t[wn]; - if (MultiByteToWideChar (CP_UTF8, 0, filename, -1, buffer, wn) == 0) + if (MultiByteToWideChar (CP_UTF8, 0, filename.c_str(), -1, buffer, wn) == 0) { delete[] buffer; return Kumu::RESULT_FAIL; @@ -937,9 +937,9 @@ Kumu::FileWriter::OpenWrite(const std::string& filename) // suppress popup window on error UINT prev = ::SetErrorMode(SEM_FAILCRITICALERRORS|SEM_NOOPENFILEERRORBOX); - int const wn = MultiByteToWideChar (CP_UTF8, 0, filename, -1, 0, 0); + int const wn = MultiByteToWideChar (CP_UTF8, 0, filename.c_str(), -1, 0, 0); wchar_t* buffer = new wchar_t[wn]; - if (MultiByteToWideChar (CP_UTF8, 0, filename, -1, buffer, wn) == 0) + if (MultiByteToWideChar (CP_UTF8, 0, filename.c_str(), -1, buffer, wn) == 0) { delete[] buffer; return Kumu::RESULT_FAIL; @@ -967,17 +967,16 @@ Kumu::FileWriter::OpenWrite(const std::string& filename) /** @param filename File name (UTF-8 encoded) */ Kumu::Result_t -Kumu::FileWriter::OpenModify(const char* filename) +Kumu::FileWriter::OpenModify(const std::string& filename) { - KM_TEST_NULL_STR_L(filename); m_Filename = filename; // suppress popup window on error UINT prev = ::SetErrorMode(SEM_FAILCRITICALERRORS|SEM_NOOPENFILEERRORBOX); - int const wn = MultiByteToWideChar (CP_UTF8, 0, filename, -1, 0, 0); + int const wn = MultiByteToWideChar (CP_UTF8, 0, filename.c_str(), -1, 0, 0); wchar_t* buffer = new wchar_t[wn]; - if (MultiByteToWideChar (CP_UTF8, 0, filename, -1, buffer, wn) == 0) { + if (MultiByteToWideChar (CP_UTF8, 0, filename.c_str(), -1, buffer, wn) == 0) { delete[] buffer; return Kumu::RESULT_FAIL; } diff --git a/src/wscript b/src/wscript index c60dd16..42de573 100644 --- a/src/wscript +++ b/src/wscript @@ -34,7 +34,7 @@ def build(bld): obj.name = 'libasdcp-cth' obj.target = 'asdcp-cth' - obj.uselib = 'OPENSSL' + obj.uselib = 'OPENSSL BOOST_FILESYSTEM' obj.use = 'libkumu-cth' obj.includes = ['.'] obj.export_includes = ['.'] |