cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add LL to constants > 2^32 to unbreak 32-bit arches

Browse Source
This commit is contained in:
sthen 2015-11-01 20:48:06 +00:00
parent 8366738916
commit 001d437068
1 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
geo/qgis/patches/patch-tests_src_core_testqgsdistancearea_cpp Normal file
View File

@ -0,0 +1,27 @@
$OpenBSD: patch-tests_src_core_testqgsdistancearea_cpp,v 1.1 2015/11/01 20:48:06 sthen Exp $
--- tests/src/core/testqgsdistancearea.cpp.orig Sun Nov 1 13:45:40 2015
+++ tests/src/core/testqgsdistancearea.cpp Sun Nov 1 13:46:13 2015
@@ -204,19 +204,19 @@ void TestQgsDistanceArea::collections()
//collection of polygons
QgsGeometry polys( QgsGeometryFactory::geomFromWkt( "GeometryCollection( Polygon((0 36.53, 5.76 -48.16, 0 25.54, 0 36.53)), Polygon((10 20, 15 20, 15 10, 10 20)) )" ) );
result = myDa.measure( &polys ); //should meaure area
- QVERIFY( qgsDoubleNear( result, 670434859475, 1 ) );
+ QVERIFY( qgsDoubleNear( result, 670434859475LL, 1 ) );
result = myDa.measureArea( &polys );
- QVERIFY( qgsDoubleNear( result, 670434859475, 1 ) );
+ QVERIFY( qgsDoubleNear( result, 670434859475LL, 1 ) );
result = myDa.measureLength( &polys );
QVERIFY( qgsDoubleNear( result, 0 ) );
//mixed collection
QgsGeometry mixed( QgsGeometryFactory::geomFromWkt( "GeometryCollection( LineString(0 36.53, 5.76 -48.16), LineString(0 25.54, 24.20 36.70), Polygon((0 36.53, 5.76 -48.16, 0 25.54, 0 36.53)), Polygon((10 20, 15 20, 15 10, 10 20)) )" ) );
result = myDa.measure( &mixed ); //should measure area
- QVERIFY( qgsDoubleNear( result, 670434859475, 1 ) );
+ QVERIFY( qgsDoubleNear( result, 670434859475LL, 1 ) );
//measure area specifically
result = myDa.measureArea( &mixed );
- QVERIFY( qgsDoubleNear( result, 670434859475, 1 ) );
+ QVERIFY( qgsDoubleNear( result, 670434859475LL, 1 ) );
//measure length
result = myDa.measureLength( &mixed );
QVERIFY( qgsDoubleNear( result, 12006159, 1 ) );