Changeset 281 for cpp/common/Convert.h

Timestamp:

12/27/14 01:01:43 (9 years ago)

Author:

Maciej Komosinski

Message:

Support for wide char (unicode) names of files and directories under Windows, internally encoded as char* utf-8

File:

• cpp/common/Convert.h (modified) (1 diff)

cpp/common/Convert.h

@@ -72 +72 @@
         }
 
-        static string wstrTOutf8(const wchar_t *s)
-        {
-                if (s == NULL) return "";
-                string res;
-                wchar_t *wcp = (wchar_t*)s;
-                while (*wcp != 0)
-                {
-                        int c = *wcp;
-                        if (c < 0x80) res += c;
-                        else if (c < 0x800) { res += 192 + c / 64; res += 128 + c % 64; }
-                        else if (c - 0xd800u < 0x800) res += "<ERR-CHAR>";
-                        else if (c < 0x10000) { res += 224 + c / 4096; res += 128 + c / 64 % 64; res += 128 + c % 64; }
-                        else if (c < 0x110000) { res += 240 + c / 262144; res += 128 + c / 4096 % 64; res += 128 + c / 64 % 64; res += 128 + c % 64; }
-                        else res += "<ERR-CHAR>";
-                        wcp++;
-                }
-                return res;
-        }
-        //#endif
+        static string wstrToUtf8(const wchar_t *str);
+#ifdef _WIN32
+        static wstring utf8ToUtf16(const char *str);
+#endif
 };