Fix bug in roundFixed (#32)

Pharap · web-flow · commit e5ac682a12b5 · 2018-04-04T07:51:32.000+01:00
The bug was due to part of the former code being left in by mistake.
diff --git a/src/FixedPoints/Utils.h b/src/FixedPoints/Utils.h
@@ -127,7 +127,7 @@ template< unsigned Integer, unsigned Fraction >
 constexpr UFixed<Integer, Fraction> roundFixed(const UFixed<Integer, Fraction> & value)
 {
 	using OutputType = UFixed<Integer, Fraction>;
-	return ((value.getFraction() >= OutputType(0.5).getFraction()) != 0) ? ceilFixed(value) : floorFixed(value);
+	return (value.getFraction() >= OutputType(0.5).getFraction()) ? ceilFixed(value) : floorFixed(value);
 }
 
 template< unsigned Integer, unsigned Fraction >
@@ -136,8 +136,8 @@ constexpr SFixed<Integer, Fraction> roundFixed(const SFixed<Integer, Fraction> &
 	using OutputType = SFixed<Integer, Fraction>;
 	return		
 		signbitFixed(value)
-		? ((value.getFraction() <= OutputType(0.5).getFraction()) != 0) ? floorFixed(value) : ceilFixed(value)
-		: ((value.getFraction() >= OutputType(0.5).getFraction()) != 0) ? ceilFixed(value) : floorFixed(value);
+		? (value.getFraction() <= OutputType(0.5).getFraction()) ? floorFixed(value) : ceilFixed(value)
+		: (value.getFraction() >= OutputType(0.5).getFraction()) ? ceilFixed(value) : floorFixed(value);
 }
 
 template< unsigned Integer, unsigned Fraction >

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ template< unsigned Integer, unsigned Fraction >`
`127`	`127`	`constexpr UFixed<Integer, Fraction> roundFixed(const UFixed<Integer, Fraction> & value)`
`128`	`128`	`{`
`129`	`129`	`using OutputType = UFixed<Integer, Fraction>;`
`130`		`- return ((value.getFraction() >= OutputType(0.5).getFraction()) != 0) ? ceilFixed(value) : floorFixed(value);`
	`130`	`+ return (value.getFraction() >= OutputType(0.5).getFraction()) ? ceilFixed(value) : floorFixed(value);`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`template< unsigned Integer, unsigned Fraction >`
`@@ -136,8 +136,8 @@ constexpr SFixed<Integer, Fraction> roundFixed(const SFixed<Integer, Fraction> &`
`136`	`136`	`using OutputType = SFixed<Integer, Fraction>;`
`137`	`137`	`return`
`138`	`138`	`signbitFixed(value)`
`139`		`- ? ((value.getFraction() <= OutputType(0.5).getFraction()) != 0) ? floorFixed(value) : ceilFixed(value)`
`140`		`- : ((value.getFraction() >= OutputType(0.5).getFraction()) != 0) ? ceilFixed(value) : floorFixed(value);`
	`139`	`+ ? (value.getFraction() <= OutputType(0.5).getFraction()) ? floorFixed(value) : ceilFixed(value)`
	`140`	`+ : (value.getFraction() >= OutputType(0.5).getFraction()) ? ceilFixed(value) : floorFixed(value);`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`template< unsigned Integer, unsigned Fraction >`