Fix for uninitialised variable in interpolator and for possible division by zero

mhugent · mhugent · commit a25a5282c866 · 2009-08-26T11:56:41.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11509 c8812cc2-4d05-0410-92ff-de0c093fc19c
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 )
 {
 
 }

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,11 @@ int QgsIDWInterpolator::interpolatePoint( double x, double y, double& result )`
`62`	`62`	`sumDenominator += currentWeight;`
`63`	`63`	`}`
`64`	`64`
	`65`	`+ if ( sumDenominator == 0.0 )`
	`66`	`+ {`
	`67`	`+ return 1;`
	`68`	`+ }`
	`69`	`+`
`65`	`70`	`result = sumCounter / sumDenominator;`
`66`	`71`	`return 0;`
`67`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`#define isnan(f) _isnan(f)`
`29`	`29`	`#endif`
`30`	`30`
`31`		`-QgsInterpolator::QgsInterpolator( const QList<LayerData>& layerData ): mLayerData( layerData )`
	`31`	`+QgsInterpolator::QgsInterpolator( const QList<LayerData>& layerData ): mDataIsCached( false ), mLayerData( layerData )`
`32`	`32`	`{`
`33`	`33`
`34`	`34`	`}`