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

Merge pull request #525 from VirusFree/pr_strtol 

add strtol10_64 and fix FBX text parsing for int_64 (for animation KTime)
pull/527/head
Alexander Gessler 2015-04-05 15:06:24 +02:00
parent 3fa6882384 da3c347a57
commit 253871faa5
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/FBXParser.cpp
View File

@ -459,7 +459,7 @@ int64_t ParseTokenAsInt64(const Token& t, const char*& err_out)
ai_assert(length > 0); ai_assert(length > 0);
const char* out; const char* out;
const int64_t id = strtoul10_64(t.begin(), &out, &length); const int64_t id = strtol10_64(t.begin(), &out, &length);
if (out > t.end()) { if (out > t.end()) {
err_out = "failed to parse Int64 (text)"; err_out = "failed to parse Int64 (text)";
return 0L; return 0L;

17
code/fast_atof.h
View File

@ -220,6 +220,23 @@ inline uint64_t strtoul10_64( const char* in, const char** out=0, unsigned int*
return value; return value;
} }
// ------------------------------------------------------------------------------------
// signed variant of strtoul10_64
// ------------------------------------------------------------------------------------
inline int64_t strtol10_64(const char* in, const char** out = 0, unsigned int* max_inout = 0)
{
bool inv = (*in == '-');
if (inv || *in == '+')
++in;
int value = strtoul10_64(in, out, max_inout);
if (inv) {
value = -value;
}
return value;
}
// Number of relevant decimals for floating-point parsing. // Number of relevant decimals for floating-point parsing.
#define AI_FAST_ATOF_RELAVANT_DECIMALS 15 #define AI_FAST_ATOF_RELAVANT_DECIMALS 15