Skip to content

Commit b2f92a3

Browse files
author
jef
committed
add isnan to qgis.h
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14601 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 81512b2 commit b2f92a3

File tree

4 files changed

+11
-21
lines changed

4 files changed

+11
-21
lines changed

src/analysis/interpolation/qgsinterpolator.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,6 @@
1818
#include "qgsinterpolator.h"
1919
#include "qgsvectordataprovider.h"
2020
#include "qgsgeometry.h"
21-
#ifndef Q_OS_MACX
22-
#include <cmath>
23-
#else
24-
#include <math.h>
25-
#endif
26-
#ifdef WIN32
27-
#include <float.h>
28-
#define isnan(f) _isnan(f)
29-
#endif
3021

3122
QgsInterpolator::QgsInterpolator( const QList<LayerData>& layerData ): mDataIsCached( false ), mLayerData( layerData )
3223
{

src/analysis/interpolation/qgstininterpolator.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,6 @@
2727
#include "qgsvectorlayer.h"
2828
#include <QProgressDialog>
2929

30-
#ifndef Q_OS_MACX
31-
#include <cmath>
32-
#else
33-
#include <math.h>
34-
#endif
35-
#ifdef WIN32
36-
#include <float.h>
37-
#define isnan(f) _isnan(f)
38-
#endif
39-
4030
QgsTINInterpolator::QgsTINInterpolator( const QList<LayerData>& inputData, TIN_INTERPOLATION interpolation, bool showProgressDialog ): QgsInterpolator( inputData ), mTriangulation( 0 ), \
4131
mTriangleInterpolator( 0 ), mIsInitialized( false ), mShowProgressDialog( showProgressDialog ), mExportTriangulationToFile( false ), mInterpolation( interpolation )
4232
{

src/core/qgis.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,16 @@
2222
#include <QString>
2323
#include <cfloat>
2424

25+
#ifndef Q_OS_MACX
26+
#include <cmath>
27+
#else
28+
#include <math.h>
29+
#endif
30+
#ifdef WIN32
31+
#include <float.h>
32+
#define isnan(f) _isnan(f)
33+
#endif
34+
2535
/** \ingroup core
2636
* The QGis class provides global constants for use throughout the application.
2737
*/

src/core/qgsclipper.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,11 @@
2020
#ifndef QGSCLIPPER_H
2121
#define QGSCLIPPER_H
2222

23+
#include "qgis.h"
2324
#include "qgspoint.h"
2425

2526
#include <vector>
2627
#include <utility>
27-
#include <cmath>
28-
#include <iostream>
2928

3029
/** \ingroup core
3130
* A class to trim lines and polygons to within a rectangular region.

0 commit comments

Comments
 (0)