Skip to content
Permalink
Browse files

Merge pull request #9777 from mbernasocchi/fix_maxwmswidth

[server] fix wmsMaxHeightEnv leftover code
  • Loading branch information
mbernasocchi committed Apr 12, 2019
2 parents 6092d56 + c1546d9 commit a0a8e49e8f47a43e583fd92439da635848e2f722
Showing with 1 addition and 1 deletion.
  1. +1 −1 src/server/services/wms/qgswmsrenderer.cpp
@@ -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 );

0 comments on commit a0a8e49

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