No divide by zero, thanks

homann · homann · commit 5d88748656e6 · 2012-09-06T00:01:31.000+02:00
diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp
@@ -1207,8 +1207,8 @@ void QgsOptions::populateEllipsoidList()
 
   myItem.acronym = GEO_NONE;
   myItem.description =  tr( GEO_NONE_DESC );
-  myItem.semiMajor = 1 / 0.0; // Should return +Inf
-  myItem.semiMinor = 1 / 0.0; // Should reutrn +Inf;
+  myItem.semiMajor = 0.0;
+  myItem.semiMinor = 0.0;
   mEllipsoidList.append( myItem );
 
   myItem.acronym = QString( "PARAMETER:6370997:6370997" );
@@ -1256,7 +1256,7 @@ void QgsOptions::populateEllipsoidList()
       else if ( para2.left( 3 ) == "rf=" )
       {
         double invFlattening = para2.mid( 3 ).toDouble();
-        if ( invFlattening > 0.0 )
+        if ( invFlattening != 0.0 )
         {
           myItem.semiMinor = myItem.semiMajor - ( myItem.semiMajor / invFlattening );
         }

Original file line number	Diff line number	Diff line change
`@@ -1207,8 +1207,8 @@ void QgsOptions::populateEllipsoidList()`
`1207`	`1207`
`1208`	`1208`	`myItem.acronym = GEO_NONE;`
`1209`	`1209`	`myItem.description = tr( GEO_NONE_DESC );`
`1210`		`- myItem.semiMajor = 1 / 0.0; // Should return +Inf`
`1211`		`- myItem.semiMinor = 1 / 0.0; // Should reutrn +Inf;`
	`1210`	`+ myItem.semiMajor = 0.0;`
	`1211`	`+ myItem.semiMinor = 0.0;`
`1212`	`1212`	`mEllipsoidList.append( myItem );`
`1213`	`1213`
`1214`	`1214`	`myItem.acronym = QString( "PARAMETER:6370997:6370997" );`
`@@ -1256,7 +1256,7 @@ void QgsOptions::populateEllipsoidList()`
`1256`	`1256`	`else if ( para2.left( 3 ) == "rf=" )`
`1257`	`1257`	`{`
`1258`	`1258`	`double invFlattening = para2.mid( 3 ).toDouble();`
`1259`		`- if ( invFlattening > 0.0 )`
	`1259`	`+ if ( invFlattening != 0.0 )`
`1260`	`1260`	`{`
`1261`	`1261`	`myItem.semiMinor = myItem.semiMajor - ( myItem.semiMajor / invFlattening );`
`1262`	`1262`	`}`