sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix use of banned methods

Browse Source
This commit is contained in:
Nyall Dawson 2018-06-17 11:13:41 +10:00
parent e90b58f6a1
commit 8bf3d23afa
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/dxf/qgsdxfexport.cpp
View File

@ -4019,27 +4019,27 @@ void QgsDxfExport::clipValueToMapUnitScale( double &value, const QgsMapUnitScale
double mapUnitsPerPixel = mMapSettings.mapToPixel().mapUnitsPerPixel();
double minSizeMU = -DBL_MAX;
double minSizeMU = std::numeric_limits<double>::lowest();
if ( scale.minSizeMMEnabled )
{
minSizeMU = scale.minSizeMM * pixelToMMFactor * mapUnitsPerPixel;
}
if ( !qgsDoubleNear( scale.minScale, 0.0 ) )
{
minSizeMU = qMax( minSizeMU, value );
minSizeMU = std::max( minSizeMU, value );
}
value = qMax( value, minSizeMU );
value = std::max( value, minSizeMU );
double maxSizeMU = DBL_MAX;
double maxSizeMU = std::numeric_limits<double>::max();
if ( scale.maxSizeMMEnabled )
{
maxSizeMU = scale.maxSizeMM * pixelToMMFactor * mapUnitsPerPixel;
}
if ( !qgsDoubleNear( scale.maxScale, 0.0 ) )
{
maxSizeMU = qMin( maxSizeMU, value );
maxSizeMU = std::min( maxSizeMU, value );
}
value = qMin( value, maxSizeMU );
value = std::min( value, maxSizeMU );
}
QList< QPair< QgsSymbolLayer *, QgsSymbol * > > QgsDxfExport::symbolLayers( QgsRenderContext &context )