fix some warnings and maybe fix OSX build

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11238 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Aug 1, 2009 · 1cffb64 · 1cffb64
1 parent 7c3f1c6
commit 1cffb64
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/plugins/interpolation/qgsinterpolationdialog.cpp b/src/plugins/interpolation/qgsinterpolationdialog.cpp
@@ -146,6 +146,7 @@ void QgsInterpolationDialog::on_buttonBox_accepted()
     if ( interpolationAttString == "Z_COORD" )
     {
       currentLayerData.zCoordInterpolation = true;
+      currentLayerData.interpolationAttribute = -1;
     }
     else
     {

diff --git a/src/plugins/interpolation/qgstininterpolator.cpp b/src/plugins/interpolation/qgstininterpolator.cpp
@@ -25,6 +25,11 @@
 #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)
@@ -243,10 +248,11 @@ int QgsTINInterpolator::insertData( QgsFeature* f, bool zCoord, int attr, InputT
       }
       break;
     }
+    default:
+      //todo: add the same for multiline, polygon, multipolygon
+      break;
   }
 
-  //todo: add the same for multiline, polygon, multipolygon
-
   return 0;
 }