Skip to content

Commit

Permalink
fix msvc build errors
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13730 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
mhugent committed Jun 14, 2010
1 parent 805b971 commit d885491
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/core/symbology-ng/qgsrulebasedrendererv2.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions src/plugins/georeferencer/qgsresidualplotitem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit d885491

Please sign in to comment.