diff UnitTestsSources/UnitTestsMain.cpp @ 952:98d6ba37c7dc dicom-rt

integration mainline -> dicom-rt
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 25 Jun 2014 15:33:02 +0200
parents e57e08ed510f 766a57997121
children
line wrap: on
line diff
--- a/UnitTestsSources/UnitTestsMain.cpp	Wed Jun 25 15:20:56 2014 +0200
+++ b/UnitTestsSources/UnitTestsMain.cpp	Wed Jun 25 15:33:02 2014 +0200
@@ -414,7 +414,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]));