瀏覽代碼

Merge pull request #5192 from PencilAmazing/irrfix

IRR - Fix UTF-16 file parsing (and possibly more?)
Kim Kulling 2 年之前
父節點
當前提交
0afaf976b9
共有 1 個文件被更改,包括 3 次插入1 次删除
  1. 3 1
      include/assimp/XmlParser.h

+ 3 - 1
include/assimp/XmlParser.h

@@ -302,7 +302,9 @@ bool TXmlParser<TNodeType>::parse(IOStream *stream) {
     stream->Read(&mData[0], 1, len);
     stream->Read(&mData[0], 1, len);
 
 
     mDoc = new pugi::xml_document();
     mDoc = new pugi::xml_document();
-    pugi::xml_parse_result parse_result = mDoc->load_string(&mData[0], pugi::parse_full);
+    // load_string assumes native encoding (aka always utf-8 per build options)
+    //pugi::xml_parse_result parse_result = mDoc->load_string(&mData[0], pugi::parse_full);
+     pugi::xml_parse_result parse_result = mDoc->load_buffer(&mData[0], mData.size(), pugi::parse_full);
     if (parse_result.status == pugi::status_ok) {
     if (parse_result.status == pugi::status_ok) {
         return true;
         return true;
     }
     }