sqrt with an integer ambiguous on MSVC

jef-n · jef-n · commit c84ad6e9d5fe · 2013-09-16T11:41:50.000+02:00
diff --git a/src/mapserver/qgsprojectparser.cpp b/src/mapserver/qgsprojectparser.cpp
@@ -774,8 +774,8 @@ void QgsProjectParser::addLayers( QDomDocument &doc,
       {
         if ( version == "1.1.1" )
         {
-          double OGC_PX_M = 0.00028; // OGC referance pixel size in meter, also used by qgis
-          double SCALE_TO_SCALEHINT = OGC_PX_M * sqrt( 2 );
+          double OGC_PX_M = 0.00028; // OGC reference pixel size in meter, also used by qgis
+          double SCALE_TO_SCALEHINT = OGC_PX_M * sqrt( 2.0 );
 
           QDomElement scaleHintElem = doc.createElement( "ScaleHint" );
           scaleHintElem.setAttribute( "min", QString::number( currentLayer->minimumScale() * SCALE_TO_SCALEHINT ) );

Original file line number	Diff line number	Diff line change
`@@ -774,8 +774,8 @@ void QgsProjectParser::addLayers( QDomDocument &doc,`
`774`	`774`	`{`
`775`	`775`	`if ( version == "1.1.1" )`
`776`	`776`	`{`
`777`		`- double OGC_PX_M = 0.00028; // OGC referance pixel size in meter, also used by qgis`
`778`		`- double SCALE_TO_SCALEHINT = OGC_PX_M * sqrt( 2 );`
	`777`	`+ double OGC_PX_M = 0.00028; // OGC reference pixel size in meter, also used by qgis`
	`778`	`+ double SCALE_TO_SCALEHINT = OGC_PX_M * sqrt( 2.0 );`
`779`	`779`
`780`	`780`	`QDomElement scaleHintElem = doc.createElement( "ScaleHint" );`
`781`	`781`	`scaleHintElem.setAttribute( "min", QString::number( currentLayer->minimumScale() * SCALE_TO_SCALEHINT ) );`