fix wmsMaxHeightEnv leftover code

Signed-off-by: Marco Bernasocchi <marco@opengis.ch>
This commit is contained in:
Marco Bernasocchi 2019-04-12 09:05:36 +02:00
parent f6970faa84
commit c1546d9dcb

View File

@ -1905,7 +1905,7 @@ namespace QgsWms
int wmsMaxHeightProj = QgsServerProjectUtils::wmsMaxHeight( *mProject );
int wmsMaxHeightEnv = mContext.settings().wmsMaxHeight();
int wmsMaxHeight;
if ( wmsMaxWidthEnv != -1 && wmsMaxWidthProj != -1 )
if ( wmsMaxHeightEnv != -1 && wmsMaxHeightProj != -1 )
{
// both are set, so we take the more conservative one
wmsMaxHeight = std::min( wmsMaxHeightProj, wmsMaxHeightEnv );