[QGIS Commit] r13730 - in trunk/qgis/src: core/symbology-ng plugins/georeferencer

svn_qgis at osgeo.org svn_qgis at osgeo.org
Mon Jun 14 09:18:34 EDT 2010


Author: mhugent
Date: 2010-06-14 13:18:34 +0000 (Mon, 14 Jun 2010)
New Revision: 13730

Modified:
   trunk/qgis/src/core/symbology-ng/qgsrulebasedrendererv2.h
   trunk/qgis/src/plugins/georeferencer/qgsresidualplotitem.cpp
Log:
fix msvc build errors

Modified: trunk/qgis/src/core/symbology-ng/qgsrulebasedrendererv2.h
===================================================================
--- trunk/qgis/src/core/symbology-ng/qgsrulebasedrendererv2.h	2010-06-13 22:46:00 UTC (rev 13729)
+++ trunk/qgis/src/core/symbology-ng/qgsrulebasedrendererv2.h	2010-06-14 13:18:34 UTC (rev 13730)
@@ -40,7 +40,7 @@
       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

Modified: trunk/qgis/src/plugins/georeferencer/qgsresidualplotitem.cpp
===================================================================
--- trunk/qgis/src/plugins/georeferencer/qgsresidualplotitem.cpp	2010-06-13 22:46:00 UTC (rev 13729)
+++ trunk/qgis/src/plugins/georeferencer/qgsresidualplotitem.cpp	2010-06-14 13:18:34 UTC (rev 13730)
@@ -116,16 +116,16 @@
   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;
 



More information about the QGIS-commit mailing list