[qgis] 10/14: Add patch from upstream release_2.2 branch: 0001-wms-allow-image-jpgpng-fixes-9622.patch

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository qgis.

commit c170d0b396c4c25cd09f0da9edad402a3b9dc71a
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Mar 1 14:41:13 2014 +0100

    Add patch from upstream release_2.2 branch: 0001-wms-allow-image-jpgpng-fixes-9622.patch
---
 .../0001-wms-allow-image-jpgpng-fixes-9622.patch   | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/debian/patches/0001-wms-allow-image-jpgpng-fixes-9622.patch b/debian/patches/0001-wms-allow-image-jpgpng-fixes-9622.patch
new file mode 100644
index 0000000..35a780d
--- /dev/null
+++ b/debian/patches/0001-wms-allow-image-jpgpng-fixes-9622.patch
@@ -0,0 +1,23 @@
+From 2027505b186655402d1891febf510f72c8faa008 Mon Sep 17 00:00:00 2001
+From: "Juergen E. Fischer" <jef at norbit.de>
+Date: Wed, 26 Feb 2014 22:34:51 +0100
+Subject: wms: allow image/jpgpng (fixes #9622)
+Bug: http://hub.qgis.org/issues/9622
+Origin: https://github.com/qgis/QGIS/commit/2027505b186655402d1891febf510f72c8faa008
+
+---
+ src/providers/wms/qgswmsprovider.cpp |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/src/providers/wms/qgswmsprovider.cpp
++++ b/src/providers/wms/qgswmsprovider.cpp
+@@ -4740,7 +4740,8 @@ QVector<QgsWmsSupportedFormat> QgsWmsPro
+   if ( supportedFormats.contains( "png" ) && supportedFormats.contains( "jpg" ) )
+   {
+     QgsWmsSupportedFormat g1 = { "image/x-jpegorpng", "JPEG/PNG" }; // used by cubewerx
+-    formats << g1;
++    QgsWmsSupportedFormat g2 = { "image/jpgpng", "JPEG/PNG" }; // used by ESRI
++    formats << g1 << g2;
+   }
+ 
+   if ( supportedFormats.contains( "gif" ) )

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git