Skip to content

Commit 2c38552

Browse files
committed
replace pow10 with qPow (fixes #12717)
1 parent 656af53 commit 2c38552

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/core/composer/qgscomposerscalebar.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -226,14 +226,14 @@ void QgsComposerScaleBar::invalidateCurrentMap()
226226
// nextNiceNumber(4573.23, d) = 5000 (d=1) -> 4600 (d=10) -> 4580 (d=100) -> 4574 (d=1000) -> etc
227227
inline double nextNiceNumber( double a, double d = 1 )
228228
{
229-
double s = pow10( floor( log10( a ) ) ) / d;
229+
double s = qPow( 10.0, floor( log10( a ) ) ) / d;
230230
return ceil( a / s ) * s;
231231
}
232232

233233
// prevNiceNumber(4573.23, d) = 4000 (d=1) -> 4500 (d=10) -> 4570 (d=100) -> 4573 (d=1000) -> etc
234234
inline double prevNiceNumber( double a, double d = 1 )
235235
{
236-
double s = pow10( floor( log10( a ) ) ) / d;
236+
double s = qPow( 10.0, floor( log10( a ) ) ) / d;
237237
return floor( a / s ) * s;
238238
}
239239

@@ -455,7 +455,7 @@ void QgsComposerScaleBar::applyDefaultSize( QgsComposerScaleBar::ScaleBarUnits u
455455

456456
double segmentWidth = initialUnitsPerSegment / upperMagnitudeMultiplier;
457457
int segmentMagnitude = floor( log10( segmentWidth ) );
458-
double unitsPerSegment = upperMagnitudeMultiplier * ( pow( 10.0, segmentMagnitude ) );
458+
double unitsPerSegment = upperMagnitudeMultiplier * ( qPow( 10.0, segmentMagnitude ) );
459459
double multiplier = floor(( widthInSelectedUnits / ( unitsPerSegment * 10.0 ) ) / 2.5 ) * 2.5;
460460

461461
if ( multiplier > 0 )

0 commit comments

Comments
 (0)