The following commit has been merged in the master branch: commit 9d3fbeaa0cc72c685b10bf99eec4f1da1a13863e Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Fri Jan 17 23:54:32 2014 +0100
Add patch to fix a crash when a WMS-C tile matrix set isn't available anymore. diff --git a/debian/changelog b/debian/changelog index 282a687..e7d973d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,8 @@ qgis (2.0.1-1) unstable; urgency=low * Add patch to explicitly use /usr/bin/python2.7, update X-Python-Version and dependencies accordingly. (closes: #729495) + * Add patch to fix a crash when a WMS-C tile matrix set isn't available + anymore. -- Bas Couwenberg <sebas...@xs4all.nl> Thu, 16 Jan 2014 21:28:09 +0100 diff --git a/debian/patches/series b/debian/patches/series index c74c5dc..1851bd8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -24,3 +24,4 @@ increase-decimaps-for-gdal-contour.patch ogr-only-call-repack-when-closing-a-data-provider.patch remove-google-adsense.patch python-env.patch +wms-c-don-t-crash-if-tile-matrix-set-isn-t-available.patch diff --git a/debian/patches/wms-c-don-t-crash-if-tile-matrix-set-isn-t-available.patch b/debian/patches/wms-c-don-t-crash-if-tile-matrix-set-isn-t-available.patch new file mode 100644 index 0000000..e11ad70 --- /dev/null +++ b/debian/patches/wms-c-don-t-crash-if-tile-matrix-set-isn-t-available.patch @@ -0,0 +1,14 @@ +Description: wms-c: don't crash if tile matrix set isn't available anymore +Origin: https://github.com/qgis/QGIS/commit/c2a8ad0a35894418d98ccc44b02f3b8e8f89de86 +Bug: http://hub.qgis.org/issues/9361 +--- a/src/providers/wms/qgswmsprovider.cpp ++++ b/src/providers/wms/qgswmsprovider.cpp +@@ -518,7 +518,7 @@ bool QgsWmsProvider::setImageCrs( QStrin + + setProperty( "resolutions", resolutions ); + +- if ( mTileLayer == 0 && mTileMatrixSet == 0 ) ++ if ( mTileLayer == 0 || mTileMatrixSet == 0 ) + { + appendError( ERR( tr( "Tile layer or tile matrix set not found" ) ) ); + return false; -- The Quantum GIS in Debian project _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel