Merge pull request #23 from r0mai/nans

epezent · web-flow · commit 59bc426aadc2 · 2020-05-10T11:47:10.000-05:00
Identify NANs with isnan()
diff --git a/implot.cpp b/implot.cpp
@@ -104,7 +104,7 @@ inline float Remap(float x, float x0, float x1, float y0, float y1) {
 
 /// Turns NANs to 0s
 inline float ConstrainNan(float val) {
-    return val == NAN || val == -NAN ? 0 : val;
+    return isnan(val) ? 0 : val;
 }
 
 /// Turns INFINITYs to FLT_MAXs
@@ -119,7 +119,7 @@ inline float ConstrainLog(float val) {
 
 /// Returns true if val is NAN or INFINITY
 inline bool NanOrInf(float val) {
-    return val == INFINITY || val == NAN || val == -INFINITY  || val == -NAN;
+    return val == INFINITY || val == -INFINITY || isnan(val);
 }
 
 /// Utility function to that rounds x to powers of 2,5 and 10 for generating axis labels

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ inline float Remap(float x, float x0, float x1, float y0, float y1) {`
`104`	`104`
`105`	`105`	`/// Turns NANs to 0s`
`106`	`106`	`inline float ConstrainNan(float val) {`
`107`		`- return val == NAN \|\| val == -NAN ? 0 : val;`
	`107`	`+ return isnan(val) ? 0 : val;`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`/// Turns INFINITYs to FLT_MAXs`
`@@ -119,7 +119,7 @@ inline float ConstrainLog(float val) {`
`119`	`119`
`120`	`120`	`/// Returns true if val is NAN or INFINITY`
`121`	`121`	`inline bool NanOrInf(float val) {`
`122`		`- return val == INFINITY \|\| val == NAN \|\| val == -INFINITY \|\| val == -NAN;`
	`122`	`+ return val == INFINITY \|\| val == -INFINITY \|\| isnan(val);`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`/// Utility function to that rounds x to powers of 2,5 and 10 for generating axis labels`