Merge branch 'master' into fix_trivial_warnings

pull/1529/head
Kim Kulling 2017-11-03 20:05:16 +01:00 committed by GitHub
commit 4587e63e2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions

View File

@ -381,6 +381,11 @@ bool PLY::Element::ParseElement(IOStreamBuffer<char> &streamBuffer, std::vector<
{
char* endPos = &buffer[0] + (strlen(&buffer[0]) - 1);
pOut->szName = std::string(&buffer[0], endPos);
// go to the next line
PLY::DOM::SkipSpacesAndLineEnd(buffer);
return true;
}
//parse the number of occurrences of this element
@ -933,7 +938,7 @@ bool PLY::PropertyInstance::ParseValue(const char* &pCur,
{
ai_assert(NULL != pCur);
ai_assert(NULL != out);
//calc element size
bool ret = true;
switch (eType)