git-svn-id: svn://db.shs.com.ru/pip@535 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

2017-08-24 10:44:11 +00:00
parent 5dcc867689
commit fa894548d7
3 changed files with 25 additions and 16 deletions
--- a/src_main/core/pistring.cpp
+++ b/src_main/core/pistring.cpp
@@ -254,9 +254,21 @@ PIString PIString::fromUTF8(const char * s) {
 	PIString ret;
 	if (l > 0) ret.appendFromChars(s, l
 #ifdef PIP_ICU
-										, "UTF-8"
+								   , "UTF-8"
 #endif
-												);
+								   );
+	return ret;
+}
+
+
+PIString PIString::fromUTF8(const PIByteArray & ba) {
+	PIString ret;
+	if (ba.isEmpty()) return ret;
+	ret.appendFromChars((const char*)ba.data(), ba.size()
+#ifdef PIP_ICU
+						, "UTF-8"
+#endif
+						);
 	return ret;
 }