Skip to content
Permalink
Browse files

fix warning

  • Loading branch information
jef-n committed Feb 20, 2018
1 parent 4eef948 commit 34553d36243b7cd13ff5980f22eaa13600bad430
@@ -32,6 +32,8 @@ static void _heightMapMinMax( const QByteArray &heightMap, float &zMin, float &z
const float *zBits = ( const float * ) heightMap.constData();
int zCount = heightMap.count() / sizeof( float );
bool first = true;

zMin = zMax = std::numeric_limits<float>::quiet_NaN();
for ( int i = 0; i < zCount; ++i )
{
float z = zBits[i];
@@ -45,9 +47,6 @@ static void _heightMapMinMax( const QByteArray &heightMap, float &zMin, float &z
zMin = qMin( zMin, z );
zMax = qMax( zMax, z );
}

if ( first )
zMin = zMax = std::numeric_limits<float>::quiet_NaN();
}


@@ -951,7 +951,7 @@ void QgsLayoutItem::applyDataDefinedOrientation( double &width, double &height,
QgsLayoutItemPage::Orientation orientation = QgsLayoutUtils::decodePaperOrientation( orientationString, ok );
if ( ok )
{
double heightD, widthD;
double heightD = 0.0, widthD = 0.0;
switch ( orientation )
{
case QgsLayoutItemPage::Portrait:
@@ -140,7 +140,7 @@ void QgsExtentGroupBox::setOutputExtent( const QgsRectangle &r, const QgsCoordin
}
}

int decimals;
int decimals = 4;
switch ( mOutputCrs.mapUnits() )
{
case QgsUnitTypes::DistanceDegrees:

0 comments on commit 34553d3

Please sign in to comment.
You can’t perform that action at this time.