@@ -681,8 +681,8 @@ void TestQgsGeometry::point()
681
681
//toQPointF
682
682
QgsPoint p11a( 5.0, 9.0 );
683
683
QPointF result = p11a.toQPointF();
684
- QGSCOMPARENEAR( result.x(), 5.0, 4 * DBL_EPSILON );
685
- QGSCOMPARENEAR( result.y(), 9.0, 4 * DBL_EPSILON );
684
+ QGSCOMPARENEAR( result.x(), 5.0, 4 * std::numeric_limits<double>::epsilon() );
685
+ QGSCOMPARENEAR( result.y(), 9.0, 4 * std::numeric_limits<double>::epsilon() );
686
686
687
687
//to/from WKB
688
688
QgsPoint p12( QgsWkbTypes::PointZM, 1.0, 2.0, 3.0, -4.0 );
@@ -4199,26 +4199,26 @@ void TestQgsGeometry::lineString()
4199
4199
l35.setPoints( QgsPointSequence() << QgsPoint( 5, 10 ) );
4200
4200
QVERIFY( l35.closestSegment( QgsPoint( 5, 10 ), p, v ) < 0 );
4201
4201
l35.setPoints( QgsPointSequence() << QgsPoint( 5, 10 ) << QgsPoint( 10, 10 ) );
4202
- QGSCOMPARENEAR( l35.closestSegment( QgsPoint( 4, 11 ), p, v, &leftOf ), 2.0, 4 * DBL_EPSILON );
4202
+ QGSCOMPARENEAR( l35.closestSegment( QgsPoint( 4, 11 ), p, v, &leftOf ), 2.0, 4 * std::numeric_limits<double>::epsilon() );
4203
4203
QCOMPARE( p, QgsPoint( 5, 10 ) );
4204
4204
QCOMPARE( v, QgsVertexId( 0, 0, 1 ) );
4205
4205
QCOMPARE( leftOf, -1 );
4206
- QGSCOMPARENEAR( l35.closestSegment( QgsPoint( 8, 11 ), p, v, &leftOf ), 1.0, 4 * DBL_EPSILON );
4206
+ QGSCOMPARENEAR( l35.closestSegment( QgsPoint( 8, 11 ), p, v, &leftOf ), 1.0, 4 * std::numeric_limits<double>::epsilon() );
4207
4207
QCOMPARE( p, QgsPoint( 8, 10 ) );
4208
4208
QCOMPARE( v, QgsVertexId( 0, 0, 1 ) );
4209
4209
QCOMPARE( leftOf, -1 );
4210
- QGSCOMPARENEAR( l35.closestSegment( QgsPoint( 8, 9 ), p, v, &leftOf ), 1.0, 4 * DBL_EPSILON );
4210
+ QGSCOMPARENEAR( l35.closestSegment( QgsPoint( 8, 9 ), p, v, &leftOf ), 1.0, 4 * std::numeric_limits<double>::epsilon() );
4211
4211
QCOMPARE( p, QgsPoint( 8, 10 ) );
4212
4212
QCOMPARE( v, QgsVertexId( 0, 0, 1 ) );
4213
4213
QCOMPARE( leftOf, 1 );
4214
- QGSCOMPARENEAR( l35.closestSegment( QgsPoint( 11, 9 ), p, v, &leftOf ), 2.0, 4 * DBL_EPSILON );
4214
+ QGSCOMPARENEAR( l35.closestSegment( QgsPoint( 11, 9 ), p, v, &leftOf ), 2.0, 4 * std::numeric_limits<double>::epsilon() );
4215
4215
QCOMPARE( p, QgsPoint( 10, 10 ) );
4216
4216
QCOMPARE( v, QgsVertexId( 0, 0, 1 ) );
4217
4217
QCOMPARE( leftOf, 1 );
4218
4218
l35.setPoints( QgsPointSequence() << QgsPoint( 5, 10 )
4219
4219
<< QgsPoint( 10, 10 )
4220
4220
<< QgsPoint( 10, 15 ) );
4221
- QGSCOMPARENEAR( l35.closestSegment( QgsPoint( 11, 12 ), p, v, &leftOf ), 1.0, 4 * DBL_EPSILON );
4221
+ QGSCOMPARENEAR( l35.closestSegment( QgsPoint( 11, 12 ), p, v, &leftOf ), 1.0, 4 * std::numeric_limits<double>::epsilon() );
4222
4222
QCOMPARE( p, QgsPoint( 10, 12 ) );
4223
4223
QCOMPARE( v, QgsVertexId( 0, 0, 2 ) );
4224
4224
QCOMPARE( leftOf, 1 );
@@ -4227,7 +4227,7 @@ void TestQgsGeometry::lineString()
4227
4227
<< QgsPoint( 6, 4 )
4228
4228
<< QgsPoint( 4, 4 )
4229
4229
<< QgsPoint( 5, 5 ) );
4230
- QGSCOMPARENEAR( l35.closestSegment( QgsPoint( 2.35, 4 ), p, v, &leftOf ), 2.7225, 4 * DBL_EPSILON );
4230
+ QGSCOMPARENEAR( l35.closestSegment( QgsPoint( 2.35, 4 ), p, v, &leftOf ), 2.7225, 4 * std::numeric_limits<double>::epsilon() );
4231
4231
QCOMPARE( p, QgsPoint( 4, 4 ) );
4232
4232
QCOMPARE( v, QgsVertexId( 0, 0, 2 ) );
4233
4233
QCOMPARE( leftOf, -1 );
@@ -4236,7 +4236,7 @@ void TestQgsGeometry::lineString()
4236
4236
<< QgsPoint( 4, 4 )
4237
4237
<< QgsPoint( 6, 4 )
4238
4238
<< QgsPoint( 5, 5 ) );
4239
- QGSCOMPARENEAR( l35.closestSegment( QgsPoint( 2.35, 4 ), p, v, &leftOf ), 2.7225, 4 * DBL_EPSILON );
4239
+ QGSCOMPARENEAR( l35.closestSegment( QgsPoint( 2.35, 4 ), p, v, &leftOf ), 2.7225, 4 * std::numeric_limits<double>::epsilon() );
4240
4240
QCOMPARE( p, QgsPoint( 4, 4 ) );
4241
4241
QCOMPARE( v, QgsVertexId( 0, 0, 1 ) );
4242
4242
QCOMPARE( leftOf, 1 );
@@ -4245,7 +4245,7 @@ void TestQgsGeometry::lineString()
4245
4245
<< QgsPoint( 6, 4 )
4246
4246
<< QgsPoint( 4, 4 )
4247
4247
<< QgsPoint( 5, 5 ) );
4248
- QGSCOMPARENEAR( l35.closestSegment( QgsPoint( 3.5, 2 ), p, v, &leftOf ), 4.250000, 4 * DBL_EPSILON );
4248
+ QGSCOMPARENEAR( l35.closestSegment( QgsPoint( 3.5, 2 ), p, v, &leftOf ), 4.250000, 4 * std::numeric_limits<double>::epsilon() );
4249
4249
QCOMPARE( p, QgsPoint( 4, 4 ) );
4250
4250
QCOMPARE( v, QgsVertexId( 0, 0, 2 ) );
4251
4251
QCOMPARE( leftOf, -1 );
@@ -4254,7 +4254,7 @@ void TestQgsGeometry::lineString()
4254
4254
<< QgsPoint( 4, 4 )
4255
4255
<< QgsPoint( 6, 4 )
4256
4256
<< QgsPoint( 5, 5 ) );
4257
- QGSCOMPARENEAR( l35.closestSegment( QgsPoint( 3.5, 2 ), p, v, &leftOf ), 4.250000, 4 * DBL_EPSILON );
4257
+ QGSCOMPARENEAR( l35.closestSegment( QgsPoint( 3.5, 2 ), p, v, &leftOf ), 4.250000, 4 * std::numeric_limits<double>::epsilon() );
4258
4258
QCOMPARE( p, QgsPoint( 4, 4 ) );
4259
4259
QCOMPARE( v, QgsVertexId( 0, 0, 1 ) );
4260
4260
QCOMPARE( leftOf, 1 );
@@ -4263,7 +4263,7 @@ void TestQgsGeometry::lineString()
4263
4263
<< QgsPoint( 1, 4 )
4264
4264
<< QgsPoint( 2, 2 )
4265
4265
<< QgsPoint( 1, 1 ) );
4266
- QGSCOMPARENEAR( l35.closestSegment( QgsPoint( 1, 0 ), p, v, &leftOf ), 1, 4 * DBL_EPSILON );
4266
+ QGSCOMPARENEAR( l35.closestSegment( QgsPoint( 1, 0 ), p, v, &leftOf ), 1, 4 * std::numeric_limits<double>::epsilon() );
4267
4267
QCOMPARE( p, QgsPoint( 1, 1 ) );
4268
4268
QCOMPARE( v, QgsVertexId( 0, 0, 1 ) );
4269
4269
QCOMPARE( leftOf, -1 );
@@ -4272,7 +4272,7 @@ void TestQgsGeometry::lineString()
4272
4272
<< QgsPoint( 2, 2 )
4273
4273
<< QgsPoint( 1, 4 )
4274
4274
<< QgsPoint( 1, 1 ) );
4275
- QGSCOMPARENEAR( l35.closestSegment( QgsPoint( 1, 0 ), p, v, &leftOf ), 1, 4 * DBL_EPSILON );
4275
+ QGSCOMPARENEAR( l35.closestSegment( QgsPoint( 1, 0 ), p, v, &leftOf ), 1, 4 * std::numeric_limits<double>::epsilon() );
4276
4276
QCOMPARE( p, QgsPoint( 1, 1 ) );
4277
4277
QCOMPARE( v, QgsVertexId( 0, 0, 1 ) );
4278
4278
QCOMPARE( leftOf, 1 );
@@ -4287,13 +4287,13 @@ void TestQgsGeometry::lineString()
4287
4287
QCOMPARE( area, 1.0 );
4288
4288
l36.setPoints( QgsPointSequence() << QgsPoint( 5, 10 ) << QgsPoint( 10, 10 ) );
4289
4289
l36.sumUpArea( area );
4290
- QGSCOMPARENEAR( area, -24, 4 * DBL_EPSILON );
4290
+ QGSCOMPARENEAR( area, -24, 4 * std::numeric_limits<double>::epsilon() );
4291
4291
l36.setPoints( QgsPointSequence() << QgsPoint( 0, 0 ) << QgsPoint( 2, 0 ) << QgsPoint( 2, 2 ) );
4292
4292
l36.sumUpArea( area );
4293
- QGSCOMPARENEAR( area, -22, 4 * DBL_EPSILON );
4293
+ QGSCOMPARENEAR( area, -22, 4 * std::numeric_limits<double>::epsilon() );
4294
4294
l36.setPoints( QgsPointSequence() << QgsPoint( 0, 0 ) << QgsPoint( 2, 0 ) << QgsPoint( 2, 2 ) << QgsPoint( 0, 2 ) );
4295
4295
l36.sumUpArea( area );
4296
- QGSCOMPARENEAR( area, -18, 4 * DBL_EPSILON );
4296
+ QGSCOMPARENEAR( area, -18, 4 * std::numeric_limits<double>::epsilon() );
4297
4297
4298
4298
//boundingBox - test that bounding box is updated after every modification to the line string
4299
4299
QgsLineString l37;
@@ -4342,8 +4342,8 @@ void TestQgsGeometry::lineString()
4342
4342
QGSCOMPARENEAR( l38.vertexAngle( QgsVertexId( 0, 0, 1 ) ), 1.5708, 0.0001 );
4343
4343
( void )l38.vertexAngle( QgsVertexId( 0, 0, 2 ) ); //no crash
4344
4344
l38.setPoints( QgsPointSequence() << QgsPoint( 0, 0 ) << QgsPoint( 0, 1 ) );
4345
- QGSCOMPARENEAR( l38.vertexAngle( QgsVertexId( 0, 0, 0 ) ), 0.0, 4 * DBL_EPSILON );
4346
- QGSCOMPARENEAR( l38.vertexAngle( QgsVertexId( 0, 0, 1 ) ), 0.0, 4 * DBL_EPSILON );
4345
+ QGSCOMPARENEAR( l38.vertexAngle( QgsVertexId( 0, 0, 0 ) ), 0.0, 4 * std::numeric_limits<double>::epsilon() );
4346
+ QGSCOMPARENEAR( l38.vertexAngle( QgsVertexId( 0, 0, 1 ) ), 0.0, 4 * std::numeric_limits<double>::epsilon() );
4347
4347
l38.setPoints( QgsPointSequence() << QgsPoint( 1, 0 ) << QgsPoint( 0, 0 ) );
4348
4348
QGSCOMPARENEAR( l38.vertexAngle( QgsVertexId( 0, 0, 0 ) ), 4.71239, 0.0001 );
4349
4349
QGSCOMPARENEAR( l38.vertexAngle( QgsVertexId( 0, 0, 1 ) ), 4.71239, 0.0001 );
@@ -10927,7 +10927,7 @@ void TestQgsGeometry::compoundCurve()
10927
10927
<< QgsPoint( 1, 1 ) );
10928
10928
double lsArea = 0.0;
10929
10929
ls.sumUpArea( lsArea );
10930
- QGSCOMPARENEAR( ccArea, lsArea, 4 * DBL_EPSILON );
10930
+ QGSCOMPARENEAR( ccArea, lsArea, 4 * std::numeric_limits<double>::epsilon() );
10931
10931
10932
10932
10933
10933
//addVertex
0 commit comments