Skip to content

Commit 3d44f43

Browse files
author
jef
committedNov 19, 2010
use Qt macros also for min/max/abs/fabs - removes OSX cmath kludges
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14713 c8812cc2-4d05-0410-92ff-de0c093fc19c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+250
-296
lines changed
 

‎src/analysis/interpolation/CloughTocherInterpolator.cc

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,8 @@
1616

1717
#include "CloughTocherInterpolator.h"
1818
#include "qgslogger.h"
19-
#ifndef Q_OS_MACX
19+
2020
#include <cmath>
21-
#else
22-
#include <math.h>
23-
#endif
2421

2522
double CloughTocherInterpolator::calcBernsteinPoly( int n, int i, int j, int k, double u, double v, double w )
2623
{

‎src/analysis/interpolation/DualEdgeTriangulation.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ int DualEdgeTriangulation::addPoint( Point3D* p )
383383
//Take the higher z-Value in case of two equal points
384384
Point3D* newPoint = mPointVector[mPointVector.count()-1];
385385
Point3D* existingPoint = mPointVector[mTwiceInsPoint];
386-
existingPoint->setZ( std::max( newPoint->getZ(), existingPoint->getZ() ) );
386+
existingPoint->setZ( qMax( newPoint->getZ(), existingPoint->getZ() ) );
387387

388388
mPointVector.remove( mPointVector.count() - 1 );
389389
delete newPoint;

0 commit comments

Comments
 (0)
Please sign in to comment.