Fix for uninitialised variable in interpolator and for possible divis…

…ion by zero git-svn-id: http://svn.osgeo.org/qgis/trunk@11509 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Aug 26, 2009 · 1d8d723 · 1d8d723
1 parent 0467062
commit 1d8d723
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/plugins/interpolation/qgsidwinterpolator.cpp b/src/plugins/interpolation/qgsidwinterpolator.cpp
@@ -62,6 +62,11 @@ int QgsIDWInterpolator::interpolatePoint( double x, double y, double& result )
     sumDenominator += currentWeight;
   }
 
+  if ( sumDenominator == 0.0 )
+  {
+    return 1;
+  }
+
   result = sumCounter / sumDenominator;
   return 0;
 }
diff --git a/src/plugins/interpolation/qgsinterpolator.cpp b/src/plugins/interpolation/qgsinterpolator.cpp
@@ -28,7 +28,7 @@
 #define isnan(f) _isnan(f)
 #endif
 
-QgsInterpolator::QgsInterpolator( const QList<LayerData>& layerData ): mLayerData( layerData )
+QgsInterpolator::QgsInterpolator( const QList<LayerData>& layerData ): mDataIsCached( false ), mLayerData( layerData )
 {
 
 }