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

Merge pull request #9777 from mbernasocchi/fix_maxwmswidth

Browse Source 
[server] fix wmsMaxHeightEnv leftover code
This commit is contained in:
Marco Bernasocchi 2019-04-12 09:45:44 +02:00 committed by GitHub
commit a0a8e49e8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/services/wms/qgswmsrenderer.cpp
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 );