Mercurial > hg > orthanc
diff UnitTestsSources/UnitTestsMain.cpp @ 955:743a75b14bef plugins
merge mainline -> plugins
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 25 Jun 2014 15:37:48 +0200 |
| parents | 3fb427ac3f53 766a57997121 |
| children | 509e146c3cb3 |
line wrap: on
line diff
--- a/UnitTestsSources/UnitTestsMain.cpp Wed Jun 25 11:51:55 2014 +0200 +++ b/UnitTestsSources/UnitTestsMain.cpp Wed Jun 25 15:37:48 2014 +0200 @@ -441,7 +441,7 @@ ASSERT_EQ("&abc", Toolbox::ConvertToAscii(s)); // Open in Emacs, then save with UTF-8 encoding, then "hexdump -C" - std::string utf8 = Toolbox::ConvertToUtf8(s, "ISO-8859-1"); + std::string utf8 = Toolbox::ConvertToUtf8(s, Encoding_Latin1); ASSERT_EQ(15u, utf8.size()); ASSERT_EQ(0xc3, static_cast<unsigned char>(utf8[0])); ASSERT_EQ(0xa0, static_cast<unsigned char>(utf8[1]));