version 0.3.33

[fms.git] / src / unicode / utfconversion.cpp

diff --git a/src/unicode/utfconversion.cpp b/src/unicode/utfconversion.cpp
index 5d7c835..8d62b88 100644 (file)
--- a/src/unicode/utfconversion.cpp
+++ b/src/unicode/utfconversion.cpp
@@ -1,5 +1,9 @@
 #include "../../include/unicode/utfconversion.h"\r
 \r
+#ifdef _WIN32\r
+#include "../../include/pstdint.h"\r
+#endif\r
+\r
 namespace UTFConversion\r
 {\r
 \r
@@ -16,7 +20,7 @@ const bool FromUTF8(const std::vector<std::string::value_type> &utf8string, std:
        const UTF8 *sourcestart=reinterpret_cast<const UTF8 *>(&utf8string[0]);\r
        const UTF8 *sourceend=sourcestart+utf8string.size();\r
        \r
-       if(sizeof(wchar_t)==2)\r
+       if(sizeof(std::wstring::value_type)==2 && sizeof(UTF16)==2)\r
        {       \r
                UTF16 *deststart=reinterpret_cast<UTF16 *>(&dest[0]);\r
                UTF16 *destend=deststart+dest.size();\r
@@ -31,7 +35,7 @@ const bool FromUTF8(const std::vector<std::string::value_type> &utf8string, std:
                wcstring.assign(dest.begin(),dest.end()-(destend-deststart));\r
                \r
        }\r
-       else if(sizeof(wchar_t)==4)\r
+       else if(sizeof(std::wstring::value_type)==4 && sizeof(UTF32)==4)\r
        {\r
                UTF32 *deststart=reinterpret_cast<UTF32 *>(&dest[0]);\r
                UTF32 *destend=deststart+dest.size();\r
@@ -48,7 +52,19 @@ const bool FromUTF8(const std::vector<std::string::value_type> &utf8string, std:
        }\r
        else\r
        {\r
-               return false;\r
+               std::vector<uint32_t> dest2(utf8string.size(),0);\r
+               UTF32 *deststart=reinterpret_cast<UTF32 *>(&dest2[0]);\r
+               UTF32 *destend=deststart+dest2.size();\r
+\r
+               ConversionResult rval=ConvertUTF8toUTF32(&sourcestart,sourceend,&deststart,destend,lenientConversion);\r
+\r
+               if(rval!=conversionOK)\r
+               {\r
+                       return false;\r
+               }\r
+\r
+               wcstring.assign(dest2.begin(),dest2.end()-(destend-deststart));\r
+\r
        }\r
 \r
        return true;\r
@@ -78,8 +94,8 @@ const bool ToUTF8(const std::wstring &wcstring, std::string &utf8string)
        }\r
 \r
        std::vector<std::wstring::value_type> source(wcstring.begin(),wcstring.end());\r
-       \r
-       if(sizeof(std::wstring::value_type)==2)\r
+\r
+       if(sizeof(std::wstring::value_type)==2 && sizeof(UTF16)==2)\r
        {\r
                std::vector<std::string::value_type> dest(wcstring.size()*2,0);\r
                \r
@@ -99,7 +115,7 @@ const bool ToUTF8(const std::wstring &wcstring, std::string &utf8string)
                utf8string.assign(dest.begin(),dest.end()-(destend-deststart));\r
                \r
        }\r
-       else if(sizeof(std::wstring::value_type)==4)\r
+       else if(sizeof(std::wstring::value_type)==4 && sizeof(UTF32)==4)\r
        {\r
                std::vector<std::string::value_type> dest(wcstring.size()*4,0);\r
                \r
@@ -121,7 +137,24 @@ const bool ToUTF8(const std::wstring &wcstring, std::string &utf8string)
        }\r
        else\r
        {\r
-               return false;\r
+               std::vector<uint32_t> source2(wcstring.begin(),wcstring.end());\r
+               std::vector<std::string::value_type> dest(wcstring.size()*sizeof(std::wstring::value_type),0);\r
+               \r
+               const UTF32 *sourcestart=reinterpret_cast<const UTF32 *>(&source2[0]);\r
+               const UTF32 *sourceend=sourcestart+source2.size();\r
+\r
+               UTF8 *deststart=reinterpret_cast<UTF8 *>(&dest[0]);\r
+               UTF8 *destend=deststart+dest.size();\r
+\r
+               ConversionResult rval=ConvertUTF32toUTF8(&sourcestart,sourceend,&deststart,destend,lenientConversion);\r
+\r
+               if(rval!=conversionOK)\r
+               {\r
+                       return false;\r
+               }\r
+\r
+               utf8string.assign(dest.begin(),dest.end()-(destend-deststart));\r
+\r
        }\r
 \r
        return true;\r