fix msvc build errors

mhugent · mhugent · commit d885491df6d4 · 2010-06-14T13:18:34.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13730 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/symbology-ng/qgsrulebasedrendererv2.h b/src/core/symbology-ng/qgsrulebasedrendererv2.h
@@ -40,7 +40,7 @@ class CORE_EXPORT QgsRuleBasedRendererV2 : public QgsFeatureRendererV2
       If one of the min/max scale denominators is zero, there is no lower/upper bound for scales.
       A rule matches if both filter and scale range match.
      */
-    class Rule
+    class CORE_EXPORT Rule
     {
       public:
         //! Constructor takes ownership of the symbol
diff --git a/src/plugins/georeferencer/qgsresidualplotitem.cpp b/src/plugins/georeferencer/qgsresidualplotitem.cpp
@@ -116,16 +116,16 @@ void QgsResidualPlotItem::paint( QPainter* painter, const QStyleOptionGraphicsIt
   if ( scaleBarWidthUnits < 1 )
   {
     nDecPlaces = -floor( log10( scaleBarWidthUnits ) );
-    scaleBarWidthUnits *= pow( 10, nDecPlaces );
+	scaleBarWidthUnits *= pow( 10.0, nDecPlaces );
     scaleBarWidthUnits = ( int )( scaleBarWidthUnits + 0.5 );
-    scaleBarWidthUnits /= pow( 10, nDecPlaces );
+	scaleBarWidthUnits /= pow( 10.0, nDecPlaces );
   }
   else
   {
     nDecPlaces = ( int )log10( scaleBarWidthUnits );
-    scaleBarWidthUnits /= pow( 10, nDecPlaces );
+    scaleBarWidthUnits /= pow( 10.0, nDecPlaces );
     scaleBarWidthUnits = ( int )( scaleBarWidthUnits + 0.5 );
-    scaleBarWidthUnits *= pow( 10, nDecPlaces );
+    scaleBarWidthUnits *= pow( 10.0, nDecPlaces );
   }
   initialScaleBarWidth = scaleBarWidthUnits * minMMPixelRatio;
 

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ class CORE_EXPORT QgsRuleBasedRendererV2 : public QgsFeatureRendererV2`
`40`	`40`	`If one of the min/max scale denominators is zero, there is no lower/upper bound for scales.`
`41`	`41`	`A rule matches if both filter and scale range match.`
`42`	`42`	`*/`
`43`		`- class Rule`
	`43`	`+ class CORE_EXPORT Rule`
`44`	`44`	`{`
`45`	`45`	`public:`
`46`	`46`	`//! Constructor takes ownership of the symbol`
Original file line number	Diff line number	Diff line change
`@@ -116,16 +116,16 @@ void QgsResidualPlotItem::paint( QPainter* painter, const QStyleOptionGraphicsIt`
`116`	`116`	`if ( scaleBarWidthUnits < 1 )`
`117`	`117`	`{`
`118`	`118`	`nDecPlaces = -floor( log10( scaleBarWidthUnits ) );`
`119`		`- scaleBarWidthUnits *= pow( 10, nDecPlaces );`
	`119`	`+ scaleBarWidthUnits *= pow( 10.0, nDecPlaces );`
`120`	`120`	`scaleBarWidthUnits = ( int )( scaleBarWidthUnits + 0.5 );`
`121`		`- scaleBarWidthUnits /= pow( 10, nDecPlaces );`
	`121`	`+ scaleBarWidthUnits /= pow( 10.0, nDecPlaces );`
`122`	`122`	`}`
`123`	`123`	`else`
`124`	`124`	`{`
`125`	`125`	`nDecPlaces = ( int )log10( scaleBarWidthUnits );`
`126`		`- scaleBarWidthUnits /= pow( 10, nDecPlaces );`
	`126`	`+ scaleBarWidthUnits /= pow( 10.0, nDecPlaces );`
`127`	`127`	`scaleBarWidthUnits = ( int )( scaleBarWidthUnits + 0.5 );`
`128`		`- scaleBarWidthUnits *= pow( 10, nDecPlaces );`
	`128`	`+ scaleBarWidthUnits *= pow( 10.0, nDecPlaces );`
`129`	`129`	`}`
`130`	`130`	`initialScaleBarWidth = scaleBarWidthUnits * minMMPixelRatio;`
`131`	`131`