set svn:eol-style native on .h and .cpp files

[casparcg] / common / utf.cpp

diff --git a/common/utf.cpp b/common/utf.cpp
index b453a044c440359d217b6626bbe116de5e67d313..4b8c65fd6e8beb2c1e342f83be389458b0afe420 100644 (file)
--- a/common/utf.cpp
+++ b/common/utf.cpp
@@ -1,52 +1,52 @@
-/*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
-*\r
-* This file is part of CasparCG (www.casparcg.com).\r
-*\r
-* CasparCG is free software: you can redistribute it and/or modify\r
-* it under the terms of the GNU General Public License as published by\r
-* the Free Software Foundation, either version 3 of the License, or\r
-* (at your option) any later version.\r
-*\r
-* CasparCG is distributed in the hope that it will be useful,\r
-* but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-* GNU General Public License for more details.\r
-*\r
-* You should have received a copy of the GNU General Public License\r
-* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.\r
-*\r
-* Author: Robert Nagy, ronag89@gmail.com\r
-*/\r
-\r
-#include "stdafx.h"\r
-\r
-#include "utf.h"\r
-\r
-#pragma warning(push, 1)\r
-\r
-#include <boost/locale.hpp>\r
-\r
-namespace caspar {\r
-       \r
-std::wstring u16(const std::string& str)\r
-{\r
-       return boost::locale::conv::utf_to_utf<wchar_t>(str);//std::wstring(str.begin(), str.end());\r
-}\r
-\r
-std::wstring u16(const std::wstring& str)\r
-{\r
-       return str;\r
-}\r
-          \r
-std::string u8(const std::wstring& str)\r
-{\r
-       return boost::locale::conv::utf_to_utf<char>(str);//std::string(str.begin(), str.end());\r
-}\r
-          \r
-std::string u8(const std::string& str)\r
-{\r
-       return str ;\r
-}\r
-\r
+/*
+* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>
+*
+* This file is part of CasparCG (www.casparcg.com).
+*
+* CasparCG is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* CasparCG is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.
+*
+* Author: Robert Nagy, ronag89@gmail.com
+*/
+
+#include "stdafx.h"
+
+#include "utf.h"
+
+#pragma warning(push, 1)
+
+#include <boost/locale.hpp>
+
+namespace caspar {
+       
+std::wstring u16(const std::string& str)
+{
+       return boost::locale::conv::utf_to_utf<wchar_t>(str);//std::wstring(str.begin(), str.end());
+}
+
+std::wstring u16(const std::wstring& str)
+{
+       return str;
+}
+          
+std::string u8(const std::wstring& str)
+{
+       return boost::locale::conv::utf_to_utf<char>(str);//std::string(str.begin(), str.end());
+}
+          
+std::string u8(const std::string& str)
+{
+       return str ;
+}
+
 }
\ No newline at end of file