Fix cherry-picking [BUGFIX][Server] WMS compliance: stretched, distort, increase, decrease

rldhont · rldhont · commit 0a1d3412d76c · 2017-01-03T15:55:41.000+01:00
diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp
@@ -2006,7 +2006,7 @@ QImage* QgsWMSServer::createImage( int width, int height, bool useBbox ) const
   {
     bool bboxOk;
     QgsRectangle mapExtent = _parseBBOX( mParameters.value( "BBOX" ), bboxOk );
-    QString crs = mParameters.value( QStringLiteral( "CRS" ), mParameters.value( QStringLiteral( "SRS" ) ) );
+    QString crs = mParameters.value( "CRS", mParameters.value( "SRS" ) );
     if ( crs.compare( "CRS:84", Qt::CaseInsensitive ) == 0 )
     {
       crs = QString( "EPSG:4326" );

Original file line number	Diff line number	Diff line change
`@@ -2006,7 +2006,7 @@ QImage* QgsWMSServer::createImage( int width, int height, bool useBbox ) const`
`2006`	`2006`	`{`
`2007`	`2007`	`bool bboxOk;`
`2008`	`2008`	`QgsRectangle mapExtent = _parseBBOX( mParameters.value( "BBOX" ), bboxOk );`
`2009`		`- QString crs = mParameters.value( QStringLiteral( "CRS" ), mParameters.value( QStringLiteral( "SRS" ) ) );`
	`2009`	`+ QString crs = mParameters.value( "CRS", mParameters.value( "SRS" ) );`
`2010`	`2010`	`if ( crs.compare( "CRS:84", Qt::CaseInsensitive ) == 0 )`
`2011`	`2011`	`{`
`2012`	`2012`	`crs = QString( "EPSG:4326" );`