[QGIS Commit] r14601 - in trunk/qgis/src: analysis/interpolation
core
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sat Nov 13 11:16:16 EST 2010
Author: jef
Date: 2010-11-13 08:16:16 -0800 (Sat, 13 Nov 2010)
New Revision: 14601
Modified:
trunk/qgis/src/analysis/interpolation/qgsinterpolator.cpp
trunk/qgis/src/analysis/interpolation/qgstininterpolator.cpp
trunk/qgis/src/core/qgis.h
trunk/qgis/src/core/qgsclipper.h
Log:
add isnan to qgis.h
Modified: trunk/qgis/src/analysis/interpolation/qgsinterpolator.cpp
===================================================================
--- trunk/qgis/src/analysis/interpolation/qgsinterpolator.cpp 2010-11-13 16:13:44 UTC (rev 14600)
+++ trunk/qgis/src/analysis/interpolation/qgsinterpolator.cpp 2010-11-13 16:16:16 UTC (rev 14601)
@@ -18,15 +18,6 @@
#include "qgsinterpolator.h"
#include "qgsvectordataprovider.h"
#include "qgsgeometry.h"
-#ifndef Q_OS_MACX
-#include <cmath>
-#else
-#include <math.h>
-#endif
-#ifdef WIN32
-#include <float.h>
-#define isnan(f) _isnan(f)
-#endif
QgsInterpolator::QgsInterpolator( const QList<LayerData>& layerData ): mDataIsCached( false ), mLayerData( layerData )
{
Modified: trunk/qgis/src/analysis/interpolation/qgstininterpolator.cpp
===================================================================
--- trunk/qgis/src/analysis/interpolation/qgstininterpolator.cpp 2010-11-13 16:13:44 UTC (rev 14600)
+++ trunk/qgis/src/analysis/interpolation/qgstininterpolator.cpp 2010-11-13 16:16:16 UTC (rev 14601)
@@ -27,16 +27,6 @@
#include "qgsvectorlayer.h"
#include <QProgressDialog>
-#ifndef Q_OS_MACX
-#include <cmath>
-#else
-#include <math.h>
-#endif
-#ifdef WIN32
-#include <float.h>
-#define isnan(f) _isnan(f)
-#endif
-
QgsTINInterpolator::QgsTINInterpolator( const QList<LayerData>& inputData, TIN_INTERPOLATION interpolation, bool showProgressDialog ): QgsInterpolator( inputData ), mTriangulation( 0 ), \
mTriangleInterpolator( 0 ), mIsInitialized( false ), mShowProgressDialog( showProgressDialog ), mExportTriangulationToFile( false ), mInterpolation( interpolation )
{
Modified: trunk/qgis/src/core/qgis.h
===================================================================
--- trunk/qgis/src/core/qgis.h 2010-11-13 16:13:44 UTC (rev 14600)
+++ trunk/qgis/src/core/qgis.h 2010-11-13 16:16:16 UTC (rev 14601)
@@ -22,6 +22,16 @@
#include <QString>
#include <cfloat>
+#ifndef Q_OS_MACX
+#include <cmath>
+#else
+#include <math.h>
+#endif
+#ifdef WIN32
+#include <float.h>
+#define isnan(f) _isnan(f)
+#endif
+
/** \ingroup core
* The QGis class provides global constants for use throughout the application.
*/
Modified: trunk/qgis/src/core/qgsclipper.h
===================================================================
--- trunk/qgis/src/core/qgsclipper.h 2010-11-13 16:13:44 UTC (rev 14600)
+++ trunk/qgis/src/core/qgsclipper.h 2010-11-13 16:16:16 UTC (rev 14601)
@@ -20,12 +20,11 @@
#ifndef QGSCLIPPER_H
#define QGSCLIPPER_H
+#include "qgis.h"
#include "qgspoint.h"
#include <vector>
#include <utility>
-#include <cmath>
-#include <iostream>
/** \ingroup core
* A class to trim lines and polygons to within a rectangular region.
More information about the QGIS-commit
mailing list