Applied patch from smizuno #1313

mhugent · mhugent · commit 8566c43f94b8 · 2008-09-15T07:08:05.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9330 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgsscalecalculator.cpp b/src/core/qgsscalecalculator.cpp
@@ -81,7 +81,7 @@ double QgsScaleCalculator::calculate( const QgsRect &mapExtent, int canvasWidth
     QgsDebugMsg( "Can't calculate scale from the input values" );
     return 0;
   }
-  double scale = ( delta * conversionFactor ) / ( canvasWidth / mDpi );
+  double scale = ( delta * conversionFactor ) / ( (double)canvasWidth / mDpi );
   return scale;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ double QgsScaleCalculator::calculate( const QgsRect &mapExtent, int canvasWidth`
`81`	`81`	`QgsDebugMsg( "Can't calculate scale from the input values" );`
`82`	`82`	`return 0;`
`83`	`83`	`}`
`84`		`- double scale = ( delta * conversionFactor ) / ( canvasWidth / mDpi );`
	`84`	`+ double scale = ( delta * conversionFactor ) / ( (double)canvasWidth / mDpi );`
`85`	`85`	`return scale;`
`86`	`86`	`}`
`87`	`87`