Merge pull request #9777 from mbernasocchi/fix_maxwmswidth

mbernasocchi · web-flow · commit a0a8e49e8f47 · 2019-04-12T09:45:44.000+02:00
[server] fix wmsMaxHeightEnv leftover code
diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/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 );

Original file line number	Diff line number	Diff line change
`@@ -1905,7 +1905,7 @@ namespace QgsWms`
`1905`	`1905`	`int wmsMaxHeightProj = QgsServerProjectUtils::wmsMaxHeight( *mProject );`
`1906`	`1906`	`int wmsMaxHeightEnv = mContext.settings().wmsMaxHeight();`
`1907`	`1907`	`int wmsMaxHeight;`
`1908`		`- if ( wmsMaxWidthEnv != -1 && wmsMaxWidthProj != -1 )`
	`1908`	`+ if ( wmsMaxHeightEnv != -1 && wmsMaxHeightProj != -1 )`
`1909`	`1909`	`{`
`1910`	`1910`	`// both are set, so we take the more conservative one`
`1911`	`1911`	`wmsMaxHeight = std::min( wmsMaxHeightProj, wmsMaxHeightEnv );`