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

XML filename tweaks 

This change encodes the XML strings for scenarios involving `&` et al in material file names
pull/258/head
Peter LaValle 2014-04-22 16:33:11 +01:00
parent 129e4318e6
commit 4d2c7f116d
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tools/assimp_cmd/WriteDumb.cpp
View File

@ -808,6 +808,27 @@ const char* TextureTypeToString(aiTextureType in)
} }
// -----------------------------------------------------------------------------------
// Some chuncks of text will need to be encoded for XML
// http://stackoverflow.com/questions/5665231/most-efficient-way-to-escape-xml-html-in-c-string#5665377
static std::string encodeXML(const std::string& data) {
std::string buffer;
buffer.reserve(data.size());
for(size_t pos = 0; pos != data.size(); ++pos) {
switch(data[pos]) {
case '&': buffer.append("&"); break;
case '\"': buffer.append("""); break;
case '\'': buffer.append("'"); break;
case '<': buffer.append("&lt;"); break;
case '>': buffer.append("&gt;"); break;
default: buffer.append(&data[pos], 1); break;
}
}
return buffer;
}
// ----------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------
// Write a text model dump // Write a text model dump
void WriteDump(const aiScene* scene, FILE* out, const char* src, const char* cmd, bool shortened) void WriteDump(const aiScene* scene, FILE* out, const char* src, const char* cmd, bool shortened)
@ -1014,7 +1035,7 @@ void WriteDump(const aiScene* scene, FILE* out, const char* src, const char* cmd
} }
} }
else if (prop->mType == aiPTI_String) { else if (prop->mType == aiPTI_String) {
fprintf(out,">\n\t\t\t\"%s\"",prop->mData+4 /* skip length */); fprintf(out,">\n\t\t\t\t\"%s\"",encodeXML(prop->mData+4).c_str() /* skip length */);
} }
fprintf(out,"\n\t\t\t</MatProperty>\n"); fprintf(out,"\n\t\t\t</MatProperty>\n");
} }