Fix WMS 1.3. compliance: distort image if width/height ratio of bbox is different to WIDTH/HEIGHT of requested image

rldhont · rldhont · commit d44f1eba2fed · 2016-12-13T15:56:38.000+01:00
Not decrease but increase image
diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp
@@ -2006,13 +2006,13 @@ QImage* QgsWMSServer::createImage( int width, int height, bool useBbox ) const
       {
         if ( mapWidthHeightRatio >= imageWidthHeightRatio )
         {
-          //decrease image height
-          height = width / mapWidthHeightRatio;
+          //increase image height
+          height = width * mapWidthHeightRatio;
         }
         else
         {
-          //decrease image width
-          width = height * mapWidthHeightRatio;
+          //increase image width
+          width = height / mapWidthHeightRatio;
         }
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -2006,13 +2006,13 @@ QImage* QgsWMSServer::createImage( int width, int height, bool useBbox ) const`
`2006`	`2006`	`{`
`2007`	`2007`	`if ( mapWidthHeightRatio >= imageWidthHeightRatio )`
`2008`	`2008`	`{`
`2009`		`- //decrease image height`
`2010`		`- height = width / mapWidthHeightRatio;`
	`2009`	`+ //increase image height`
	`2010`	`+ height = width * mapWidthHeightRatio;`
`2011`	`2011`	`}`
`2012`	`2012`	`else`
`2013`	`2013`	`{`
`2014`		`- //decrease image width`
`2015`		`- width = height * mapWidthHeightRatio;`
	`2014`	`+ //increase image width`
	`2015`	`+ width = height / mapWidthHeightRatio;`
`2016`	`2016`	`}`
`2017`	`2017`	`}`
`2018`	`2018`	`}`