[BUGFIX][Server] imageQuality has to be used for JPEG images not PNG

During the server refactoring, the imageQuality has been applied to all format even if this option has been defined only for JPEG.

This bugfix respects the initial proposition https://github.com/qgis/QGIS/pull/1403
QGIS Server - new project option imageQuality used for JPEG images #1403
This commit is contained in:
rldhont 2018-01-11 14:25:08 +01:00
parent 5522f10eb6
commit 0bc3d68162
2 changed files with 9 additions and 2 deletions

View File

@ -153,7 +153,14 @@ namespace QgsWms
if ( outputFormat != UNKN )
{
response.setHeader( "Content-Type", contentType );
result.save( response.io(), qPrintable( saveFormat ), imageQuality );
if ( saveFormat == "JPEG" )
{
result.save( response.io(), qPrintable( saveFormat ), imageQuality );
}
else
{
result.save( response.io(), qPrintable( saveFormat ) );
}
}
else
{

View File

@ -276,7 +276,7 @@ class TestAuthManager(unittest.TestCase):
# Check the we've got a likely PNG image
self.assertTrue(self.completed_was_called)
self.assertTrue(os.path.getsize(destination) > 700000, "Image size: %s" % os.path.getsize(destination)) # > 1MB
self.assertTrue(os.path.getsize(destination) > 2000, "Image size: %s" % os.path.getsize(destination)) # > 1MB
with open(destination, 'rb') as f:
self.assertTrue(b'PNG' in f.read()) # is a PNG