Merge pull request #878 from szczukot/1wire

gizmocuz · web-flow · commit 20202c4891a2 · 2016-09-21T05:04:02.000+02:00
Fix fo is_number() method
diff --git a/main/Helper.cpp b/main/Helper.cpp
@@ -596,7 +596,7 @@ void rgb2hsb(const int r, const int g, const int b, float hsbvals[3])
 bool is_number(const std::string& s)
 {
 	std::string::const_iterator it = s.begin();
-	while (it != s.end() && (isdigit(*it) || (*it == '.') || (*it == '-') || (*it == ' '))) ++it;
+	while (it != s.end() && (isdigit(*it) || (*it == '.') || (*it == '-') || (*it == ' ') || (*it == 0x00))) ++it;
 	return !s.empty() && it == s.end();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -596,7 +596,7 @@ void rgb2hsb(const int r, const int g, const int b, float hsbvals[3])`
`596`	`596`	`bool is_number(const std::string& s)`
`597`	`597`	`{`
`598`	`598`	`std::string::const_iterator it = s.begin();`
`599`		`- while (it != s.end() && (isdigit(it) \|\| (it == '.') \|\| (it == '-') \|\| (it == ' '))) ++it;`
	`599`	`+ while (it != s.end() && (isdigit(it) \|\| (it == '.') \|\| (it == '-') \|\| (it == ' ') \|\| (*it == 0x00))) ++it;`
`600`	`600`	`return !s.empty() && it == s.end();`
`601`	`601`	`}`
`602`	`602`