Merge pull request tinyobjloader#40 from MutterOberin/master

syoyo · syoyo · commit 2c005ddad17d · 2015-06-02T17:46:38.000+09:00
Changed pow function to use double overload
diff --git a/tiny_obj_loader.cc b/tiny_obj_loader.cc
@@ -185,7 +185,7 @@ static bool tryParseDouble(const char *s, const char *s_end, double *result)
 		while ((end_not_reached = (curr != s_end)) && isdigit(*curr))
 		{
 			// NOTE: Don't use powf here, it will absolutely murder precision.
-			mantissa += static_cast<int>(*curr - 0x30) * pow(10, -read);
+			mantissa += static_cast<int>(*curr - 0x30) * pow(10.0, -read);
 			read++; curr++;
 		}
 	}
@@ -228,7 +228,7 @@ static bool tryParseDouble(const char *s, const char *s_end, double *result)
 	}
 
 assemble:
-	*result = (sign == '+'? 1 : -1) * ldexp(mantissa * pow(5, exponent), exponent);
+	*result = (sign == '+'? 1 : -1) * ldexp(mantissa * pow(5.0, exponent), exponent);
 	return true;
 fail:
 	return false;

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ static bool tryParseDouble(const char s, const char s_end, double *result)`
`185`	`185`	`while ((end_not_reached = (curr != s_end)) && isdigit(*curr))`
`186`	`186`	`{`
`187`	`187`	`// NOTE: Don't use powf here, it will absolutely murder precision.`
`188`		`- mantissa += static_cast<int>(curr - 0x30) pow(10, -read);`
	`188`	`+ mantissa += static_cast<int>(curr - 0x30) pow(10.0, -read);`
`189`	`189`	`read++; curr++;`
`190`	`190`	`}`
`191`	`191`	`}`
`@@ -228,7 +228,7 @@ static bool tryParseDouble(const char s, const char s_end, double *result)`
`228`	`228`	`}`
`229`	`229`
`230`	`230`	`assemble:`
`231`		`- result = (sign == '+'? 1 : -1) ldexp(mantissa * pow(5, exponent), exponent);`
	`231`	`+ result = (sign == '+'? 1 : -1) ldexp(mantissa * pow(5.0, exponent), exponent);`
`232`	`232`	`return true;`
`233`	`233`	`fail:`
`234`	`234`	`return false;`