[BUGFIX] fix qgsRound for negative numbers. Fixes #20861

lbartoletti · nyalldawson · commit cfdc8c26c29b · 2019-01-30T03:27:23.000+11:00
diff --git a/src/core/qgis.h b/src/core/qgis.h
@@ -303,8 +303,9 @@ inline bool qgsDoubleNearSig( double a, double b, int significantDigits = 10 )
  */
 inline double qgsRound( double number, double places )
 {
+  double m = ( number < 0.0 ) ? -1.0 : 1.0;
   double scaleFactor = std::pow( 10.0, places );
-  return std::trunc( number * scaleFactor + 0.5 ) / scaleFactor;
+  return ( std::round( number * m * scaleFactor ) / scaleFactor ) * m;
 }
 
 
diff --git a/tests/src/core/testqgis.cpp b/tests/src/core/testqgis.cpp
@@ -342,6 +342,8 @@ void TestQgis::testQgsAsConst()
 
 void TestQgis::testQgsRound()
 {
+  QGSCOMPARENEAR( qgsRound( 1234.567, 2 ), 1234.57, 0.01 );
+  QGSCOMPARENEAR( qgsRound( -1234.567, 2 ), -1234.57, 0.01 );
   QGSCOMPARENEAR( qgsRound( 98765432198, 8 ), 98765432198, 1.0 );
   QGSCOMPARENEAR( qgsRound( 98765432198, 9 ), 98765432198, 1.0 );
   QGSCOMPARENEAR( qgsRound( 98765432198, 10 ), 98765432198, 1.0 );
@@ -357,9 +359,9 @@ void TestQgis::testQgsRound()
   QGSCOMPARENEAR( qgsRound( 9.8765432198765, 5 ), 9.87654, 0.000001 );
   QGSCOMPARENEAR( qgsRound( 9.8765432198765, 6 ), 9.876543, 0.0000001 );
   QGSCOMPARENEAR( qgsRound( 9.8765432198765, 7 ), 9.8765432, 0.00000001 );
-  QGSCOMPARENEAR( qgsRound( -9.8765432198765, 7 ), -9.876543, 0.000001 );
+  QGSCOMPARENEAR( qgsRound( -9.8765432198765, 7 ), -9.8765432, 0.0000001 );
   QGSCOMPARENEAR( qgsRound( 9876543.2198765, 5 ), 9876543.219880, 0.000001 );
-  QGSCOMPARENEAR( qgsRound( -9876543.2198765, 5 ), -9876543.219870, 0.000001 );
+  QGSCOMPARENEAR( qgsRound( -9876543.2198765, 5 ), -9876543.219880, 0.000001 );
   QGSCOMPARENEAR( qgsRound( 9.87654321987654321, 13 ), 9.87654321987654, 0.0000000000001 );
   QGSCOMPARENEAR( qgsRound( 9.87654321987654321, 14 ), 9.876543219876543, 0.00000000000001 );
   QGSCOMPARENEAR( qgsRound( 9998.87654321987654321, 14 ), 9998.876543219876543, 0.00000000000001 );

Original file line number	Diff line number	Diff line change
`@@ -303,8 +303,9 @@ inline bool qgsDoubleNearSig( double a, double b, int significantDigits = 10 )`
`303`	`303`	`*/`
`304`	`304`	`inline double qgsRound( double number, double places )`
`305`	`305`	`{`
	`306`	`+ double m = ( number < 0.0 ) ? -1.0 : 1.0;`
`306`	`307`	`double scaleFactor = std::pow( 10.0, places );`
`307`		`- return std::trunc( number * scaleFactor + 0.5 ) / scaleFactor;` Code has comments. Press enter to view.
	`308`	`+ return ( std::round( number * m * scaleFactor ) / scaleFactor ) * m;`
`308`	`309`	`}`
`309`	`310`
`310`	`311`