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

Fix some minor bugs

pull/5770/head
dataisland 2024-09-11 03:24:28 +00:00
parent dc1f9b2fab
commit 7697d8c3de
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/assimp/LineSplitter.h
View File

@ -155,7 +155,7 @@ AI_FORCE_INLINE LineSplitter::LineSplitter(StreamReaderLE& stream, bool skip_emp
mSkip_empty_lines(skip_empty_lines), mSkip_empty_lines(skip_empty_lines),
mTrim(trim) { mTrim(trim) {
mCur.reserve(1024); mCur.reserve(1024);
mEnd = mCur.c_str() + 1024; mEnd = mCur.c_str() + mCur.size();
operator++(); operator++();
mIdx = 0; mIdx = 0;
} }
@ -172,6 +172,7 @@ AI_FORCE_INLINE LineSplitter& LineSplitter::operator++() {
char s; char s;
mCur.clear(); mCur.clear();
mEnd = mCur.c_str() + mCur.size();
while (mStream.GetRemainingSize() && (s = mStream.GetI1(), 1)) { while (mStream.GetRemainingSize() && (s = mStream.GetI1(), 1)) {
if (s == '\n' || s == '\r') { if (s == '\n' || s == '\r') {
if (mSkip_empty_lines) { if (mSkip_empty_lines) {
@ -194,6 +195,7 @@ AI_FORCE_INLINE LineSplitter& LineSplitter::operator++() {
break; break;
} }
mCur += s; mCur += s;
mEnd = mCur.c_str() + mCur.size();
} }
++mIdx; ++mIdx;

6
include/assimp/ParsingUtils.h
View File

@ -107,7 +107,7 @@ AI_FORCE_INLINE bool SkipSpaces(const char_t *in, const char_t **out, const char
++in; ++in;
} }
*out = in; *out = in;
return !IsLineEnd<char_t>(*in); return in < end && !IsLineEnd<char_t>(*in);
} }
// --------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------
@ -128,7 +128,7 @@ AI_FORCE_INLINE bool SkipLine(const char_t *in, const char_t **out, const char_t
++in; ++in;
} }
*out = in; *out = in;
return *in != (char_t)'\0'; return in < end && *in != (char_t)'\0';
} }
// --------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------
@ -144,7 +144,7 @@ AI_FORCE_INLINE bool SkipSpacesAndLineEnd(const char_t *in, const char_t **out,
++in; ++in;
} }
*out = in; *out = in;
return *in != '\0'; return in < end && *in != '\0';
} }
// --------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------