Fix crash in simplify tool, from Richard Kostecky

wonder · wonder · commit 938ee1a4e587 · 2009-07-06T10:01:20.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11028 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgsmaptoolsimplify.cpp b/src/app/qgsmaptoolsimplify.cpp
@@ -52,7 +52,7 @@ void QgsSimplifyDialog::setRange( int minValue, int maxValue )
   // let's have 20 page steps
   horizontalSlider->setPageStep(( maxValue - minValue ) / 20 );
 
-  horizontalSlider->setMinimum( minValue - 1 );// -1 for count with minimum tolerance end caused by double imprecision
+  horizontalSlider->setMinimum( (minValue - 1 < 0 ? 0: minValue - 1 ) );// -1 for count with minimum tolerance end caused by double imprecision
   horizontalSlider->setMaximum( maxValue );
 
 }
@@ -355,6 +355,7 @@ bool QgsSimplifyFeature::simplifyPolygon( QgsFeature& polygonFeature,  double to
   {
     return FALSE;
   }
+
   QVector<QgsPoint> resultPoints = simplifyPoints( polygon->asPolygon()[0], tolerance );
   //resultPoints.push_back(resultPoints[0]);
   QVector<QgsPolyline> poly;
@@ -366,6 +367,9 @@ bool QgsSimplifyFeature::simplifyPolygon( QgsFeature& polygonFeature,  double to
 
 QVector<QgsPoint> QgsSimplifyFeature::simplifyPoints( const QVector<QgsPoint>& pts, double tolerance )
 {
+  //just safety precaution
+  if (tolerance < 0)
+    return pts;
   // Douglas-Peucker simplification algorithm
 
   int anchor  = 0;

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ void QgsSimplifyDialog::setRange( int minValue, int maxValue )`
`52`	`52`	`// let's have 20 page steps`
`53`	`53`	`horizontalSlider->setPageStep(( maxValue - minValue ) / 20 );`
`54`	`54`
`55`		`- horizontalSlider->setMinimum( minValue - 1 );// -1 for count with minimum tolerance end caused by double imprecision`
	`55`	`+ horizontalSlider->setMinimum( (minValue - 1 < 0 ? 0: minValue - 1 ) );// -1 for count with minimum tolerance end caused by double imprecision`
`56`	`56`	`horizontalSlider->setMaximum( maxValue );`
`57`	`57`
`58`	`58`	`}`
`@@ -355,6 +355,7 @@ bool QgsSimplifyFeature::simplifyPolygon( QgsFeature& polygonFeature, double to`
`355`	`355`	`{`
`356`	`356`	`return FALSE;`
`357`	`357`	`}`
	`358`	`+`
`358`	`359`	`QVector<QgsPoint> resultPoints = simplifyPoints( polygon->asPolygon()[0], tolerance );`
`359`	`360`	`//resultPoints.push_back(resultPoints[0]);`
`360`	`361`	`QVector<QgsPolyline> poly;`
`@@ -366,6 +367,9 @@ bool QgsSimplifyFeature::simplifyPolygon( QgsFeature& polygonFeature, double to`
`366`	`367`
`367`	`368`	`QVector<QgsPoint> QgsSimplifyFeature::simplifyPoints( const QVector<QgsPoint>& pts, double tolerance )`
`368`	`369`	`{`
	`370`	`+ //just safety precaution`
	`371`	`+ if (tolerance < 0)`
	`372`	`+ return pts;`
`369`	`373`	`// Douglas-Peucker simplification algorithm`
`370`	`374`
`371`	`375`	`int anchor = 0;`