[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 #1403 QGIS Server - new project option imageQuality used for JPEG images #1403
qgis · Jan 11, 2018 · 0bc3d68 · 0bc3d68
1 parent 5522f10
commit 0bc3d68
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
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