Skip to content

Commit 8bf3d23

Browse files
committedJun 17, 2018
Fix use of banned methods
1 parent e90b58f commit 8bf3d23

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed
 

‎src/core/dxf/qgsdxfexport.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4019,27 +4019,27 @@ void QgsDxfExport::clipValueToMapUnitScale( double &value, const QgsMapUnitScale
40194019

40204020
double mapUnitsPerPixel = mMapSettings.mapToPixel().mapUnitsPerPixel();
40214021

4022-
double minSizeMU = -DBL_MAX;
4022+
double minSizeMU = std::numeric_limits<double>::lowest();
40234023
if ( scale.minSizeMMEnabled )
40244024
{
40254025
minSizeMU = scale.minSizeMM * pixelToMMFactor * mapUnitsPerPixel;
40264026
}
40274027
if ( !qgsDoubleNear( scale.minScale, 0.0 ) )
40284028
{
4029-
minSizeMU = qMax( minSizeMU, value );
4029+
minSizeMU = std::max( minSizeMU, value );
40304030
}
4031-
value = qMax( value, minSizeMU );
4031+
value = std::max( value, minSizeMU );
40324032

4033-
double maxSizeMU = DBL_MAX;
4033+
double maxSizeMU = std::numeric_limits<double>::max();
40344034
if ( scale.maxSizeMMEnabled )
40354035
{
40364036
maxSizeMU = scale.maxSizeMM * pixelToMMFactor * mapUnitsPerPixel;
40374037
}
40384038
if ( !qgsDoubleNear( scale.maxScale, 0.0 ) )
40394039
{
4040-
maxSizeMU = qMin( maxSizeMU, value );
4040+
maxSizeMU = std::min( maxSizeMU, value );
40414041
}
4042-
value = qMin( value, maxSizeMU );
4042+
value = std::min( value, maxSizeMU );
40434043
}
40444044

40454045
QList< QPair< QgsSymbolLayer *, QgsSymbol * > > QgsDxfExport::symbolLayers( QgsRenderContext &context )

0 commit comments

Comments
 (0)
Please sign in to comment.