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

rldhont · rldhont · commit 0bc3d681621d · 2018-01-11T15:10:43.000+01:00
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 #1403 QGIS Server - new project option imageQuality used for JPEG images #1403
diff --git a/src/server/services/wms/qgswmsutils.cpp b/src/server/services/wms/qgswmsutils.cpp
@@ -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
     {
diff --git a/tests/src/python/test_authmanager_password_ows.py b/tests/src/python/test_authmanager_password_ows.py
@@ -276,7 +276,7 @@ def testValidAuthFileDownload(self):
 
         # 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
 

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,14 @@ namespace QgsWms`
`153`	`153`	`if ( outputFormat != UNKN )`
`154`	`154`	`{`
`155`	`155`	`response.setHeader( "Content-Type", contentType );`
`156`		`- result.save( response.io(), qPrintable( saveFormat ), imageQuality );`
	`156`	`+ if ( saveFormat == "JPEG" )`
	`157`	`+ {`
	`158`	`+ result.save( response.io(), qPrintable( saveFormat ), imageQuality );`
	`159`	`+ }`
	`160`	`+ else`
	`161`	`+ {`
	`162`	`+ result.save( response.io(), qPrintable( saveFormat ) );`
	`163`	`+ }`
`157`	`164`	`}`
`158`	`165`	`else`
`159`	`166`	`{`