v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update irrXMLWrapper.h 

Use std::find to find and remove null characters from XML
pull/2473/head
RichardTea 2019-05-20 13:49:56 +01:00
parent f50a0f0648
commit 45c12cd5fb
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/assimp/irrXMLWrapper.h
View File

@ -91,14 +91,15 @@ public:
stream->Read(&data[0],data.size(),1); stream->Read(&data[0],data.size(),1);
// Remove null characters from the input sequence otherwise the parsing will utterly fail // Remove null characters from the input sequence otherwise the parsing will utterly fail
unsigned int size = 0; // std::find is usually much faster than manually iterating
unsigned int size_max = static_cast<unsigned int>(data.size()); // It is very unlikely that there will be any null characters
for(unsigned int i = 0; i < size_max; i++) { auto null_char_iter = std::find(data.begin(), data.end(), '\0');
if(data[i] != '\0') {
data[size++] = data[i]; while (null_char_iter != data.end())
} {
null_char_iter = data.erase(null_char_iter);
null_char_iter = std::find(null_char_iter, data.end(), '\0');
} }
data.resize(size);
BaseImporter::ConvertToUTF8(data); BaseImporter::ConvertToUTF8(data);
} }