Update src/server/services/wms/qgswmsrenderer.cpp

m-kuhn · mbernasocchi · web-flow · commit b9a807b6e7b6 · 2019-04-12T09:01:33.000+02:00
Co-Authored-By: mbernasocchi &lt;marco@opengis.ch&gt;
diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -2080,7 +2080,7 @@ namespace QgsWms
     int wmsMaxHeightProj = QgsServerProjectUtils::wmsMaxHeight( *mProject );
     int wmsMaxHeightEnv = mSettings.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( QgsServerProjectUtils::wmsMaxHeight( *mProject ), wmsMaxHeightEnv );

Original file line number	Diff line number	Diff line change
`@@ -2080,7 +2080,7 @@ namespace QgsWms`
`2080`	`2080`	`int wmsMaxHeightProj = QgsServerProjectUtils::wmsMaxHeight( *mProject );`
`2081`	`2081`	`int wmsMaxHeightEnv = mSettings.wmsMaxHeight();`
`2082`	`2082`	`int wmsMaxHeight;`
`2083`		`- if ( wmsMaxWidthEnv != -1 && wmsMaxWidthProj != -1 )`
	`2083`	`+ if ( wmsMaxHeightEnv != -1 && wmsMaxHeightProj != -1 )`
`2084`	`2084`	`{`
`2085`	`2085`	`// both are set, so we take the more conservative one`
`2086`	`2086`	`wmsMaxHeight = std::min( QgsServerProjectUtils::wmsMaxHeight( *mProject ), wmsMaxHeightEnv );`