wms provider: add TRANSPARENT parameter when image/x-jpegorpng is choosen (followup 6604d2f)

jef-n · jef-n · commit 01e26da9f5cf · 2013-04-18T09:47:25.000+02:00
diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
@@ -657,8 +657,9 @@ QImage *QgsWmsProvider::draw( QgsRectangle  const &viewExtent, int pixelWidth, i
     }
 
     //MH: jpeg does not support transparency and some servers complain if jpg and transparent=true
-    if ( !mImageMimeType.contains( "jpeg", Qt::CaseInsensitive ) &&
-         !mImageMimeType.contains( "jpg", Qt::CaseInsensitive ) )
+    if ( mImageMimeType == "image/x-jpegorpng" ||
+         ( !mImageMimeType.contains( "jpeg", Qt::CaseInsensitive ) &&
+           !mImageMimeType.contains( "jpg", Qt::CaseInsensitive ) ) )
     {
       setQueryItem( url, "TRANSPARENT", "TRUE" );  // some servers giving error for 'true' (lowercase)
     }
@@ -834,8 +835,9 @@ QImage *QgsWmsProvider::draw( QgsRectangle  const &viewExtent, int pixelWidth, i
           setQueryItem( url, "FORMAT_OPTIONS", QString( "dpi:%1" ).arg( mDpi ) ); //geoserver
         }
 
-        if ( !mImageMimeType.contains( "jpeg", Qt::CaseInsensitive ) &&
-             !mImageMimeType.contains( "jpg", Qt::CaseInsensitive ) )
+        if ( mImageMimeType == "image/x-jpegorpng" ||
+             ( !mImageMimeType.contains( "jpeg", Qt::CaseInsensitive ) &&
+               !mImageMimeType.contains( "jpg", Qt::CaseInsensitive ) ) )
         {
           setQueryItem( url, "TRANSPARENT", "TRUE" );  // some servers giving error for 'true' (lowercase)
         }

Original file line number	Diff line number	Diff line change
`@@ -657,8 +657,9 @@ QImage *QgsWmsProvider::draw( QgsRectangle const &viewExtent, int pixelWidth, i`
`657`	`657`	`}`
`658`	`658`
`659`	`659`	`//MH: jpeg does not support transparency and some servers complain if jpg and transparent=true`
`660`		`- if ( !mImageMimeType.contains( "jpeg", Qt::CaseInsensitive ) &&`
`661`		`- !mImageMimeType.contains( "jpg", Qt::CaseInsensitive ) )`
	`660`	`+ if ( mImageMimeType == "image/x-jpegorpng" \|\|`
	`661`	`+ ( !mImageMimeType.contains( "jpeg", Qt::CaseInsensitive ) &&`
	`662`	`+ !mImageMimeType.contains( "jpg", Qt::CaseInsensitive ) ) )`
`662`	`663`	`{`
`663`	`664`	`setQueryItem( url, "TRANSPARENT", "TRUE" ); // some servers giving error for 'true' (lowercase)`
`664`	`665`	`}`
`@@ -834,8 +835,9 @@ QImage *QgsWmsProvider::draw( QgsRectangle const &viewExtent, int pixelWidth, i`
`834`	`835`	`setQueryItem( url, "FORMAT_OPTIONS", QString( "dpi:%1" ).arg( mDpi ) ); //geoserver`
`835`	`836`	`}`
`836`	`837`
`837`		`- if ( !mImageMimeType.contains( "jpeg", Qt::CaseInsensitive ) &&`
`838`		`- !mImageMimeType.contains( "jpg", Qt::CaseInsensitive ) )`
	`838`	`+ if ( mImageMimeType == "image/x-jpegorpng" \|\|`
	`839`	`+ ( !mImageMimeType.contains( "jpeg", Qt::CaseInsensitive ) &&`
	`840`	`+ !mImageMimeType.contains( "jpg", Qt::CaseInsensitive ) ) )`
`839`	`841`	`{`
`840`	`842`	`setQueryItem( url, "TRANSPARENT", "TRUE" ); // some servers giving error for 'true' (lowercase)`
`841`	`843`	`}`