[QGIS Commit] r11238 - trunk/qgis/src/plugins/interpolation

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-08-01 12:02:29 -0400 (Sat, 01 Aug 2009)
New Revision: 11238

Modified:
   trunk/qgis/src/plugins/interpolation/qgsinterpolationdialog.cpp
   trunk/qgis/src/plugins/interpolation/qgstininterpolator.cpp
Log:
fix some warnings and maybe fix OSX build

Modified: trunk/qgis/src/plugins/interpolation/qgsinterpolationdialog.cpp
===================================================================
--- trunk/qgis/src/plugins/interpolation/qgsinterpolationdialog.cpp	2009-08-01 10:48:27 UTC (rev 11237)
+++ trunk/qgis/src/plugins/interpolation/qgsinterpolationdialog.cpp	2009-08-01 16:02:29 UTC (rev 11238)
@@ -146,6 +146,7 @@
     if ( interpolationAttString == "Z_COORD" )
     {
       currentLayerData.zCoordInterpolation = true;
+      currentLayerData.interpolationAttribute = -1;
     }
     else
     {

Modified: trunk/qgis/src/plugins/interpolation/qgstininterpolator.cpp
===================================================================
--- trunk/qgis/src/plugins/interpolation/qgstininterpolator.cpp	2009-08-01 10:48:27 UTC (rev 11237)
+++ trunk/qgis/src/plugins/interpolation/qgstininterpolator.cpp	2009-08-01 16:02:29 UTC (rev 11238)
@@ -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 @@
       }
       break;
     }
+    default:
+      //todo: add the same for multiline, polygon, multipolygon
+      break;
   }
 
-  //todo: add the same for multiline, polygon, multipolygon
-
   return 0;
 }