Skip to content

Commit 7bc1a64

Browse files
author
jef
committed
fix some warnings and maybe fix OSX build
git-svn-id: http://svn.osgeo.org/qgis/trunk@11238 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 2cb735b commit 7bc1a64

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

src/plugins/interpolation/qgsinterpolationdialog.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ void QgsInterpolationDialog::on_buttonBox_accepted()
146146
if ( interpolationAttString == "Z_COORD" )
147147
{
148148
currentLayerData.zCoordInterpolation = true;
149+
currentLayerData.interpolationAttribute = -1;
149150
}
150151
else
151152
{

src/plugins/interpolation/qgstininterpolator.cpp

+8-2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@
2525
#include "qgsvectorlayer.h"
2626
#include <QProgressDialog>
2727

28+
#ifndef Q_OS_MACX
29+
#include <cmath>
30+
#else
31+
#include <math.h>
32+
#endif
2833
#ifdef WIN32
2934
#include <float.h>
3035
#define isnan(f) _isnan(f)
@@ -243,10 +248,11 @@ int QgsTINInterpolator::insertData( QgsFeature* f, bool zCoord, int attr, InputT
243248
}
244249
break;
245250
}
251+
default:
252+
//todo: add the same for multiline, polygon, multipolygon
253+
break;
246254
}
247255

248-
//todo: add the same for multiline, polygon, multipolygon
249-
250256
return 0;
251257
}
252258

0 commit comments

Comments
 (0)