[qgis] 02/07: Add patch from upstream release_2.2 branch: 0001-Fix-for-9655-fix-invalid-polygons-with-buffer_0.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 3a1c86c52b97c9726ee67d79450c2180c00aa683
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Mar 13 21:36:10 2014 +0100

    Add patch from upstream release_2.2 branch: 0001-Fix-for-9655-fix-invalid-polygons-with-buffer_0.patch
---
 ...r-9655-fix-invalid-polygons-with-buffer_0.patch | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/debian/patches/0001-Fix-for-9655-fix-invalid-polygons-with-buffer_0.patch b/debian/patches/0001-Fix-for-9655-fix-invalid-polygons-with-buffer_0.patch
new file mode 100644
index 0000000..1a55e9d
--- /dev/null
+++ b/debian/patches/0001-Fix-for-9655-fix-invalid-polygons-with-buffer_0.patch
@@ -0,0 +1,26 @@
+From 5b824ac85e86ff4bccc7aeb81a5c48461fcc4def Mon Sep 17 00:00:00 2001
+From: ahuarte47 <ahuarte47 at yahoo.es>
+Date: Mon, 3 Mar 2014 23:53:41 +0100
+Subject: Fix for #9655: fix invalid polygons with buffer_0
+Origin: https://github.com/qgis/QGIS/commit/5b824ac85e86ff4bccc7aeb81a5c48461fcc4def
+Bug: http://hub.qgis.org/issues/9655
+
+---
+ src/core/qgspallabeling.cpp |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/src/core/qgspallabeling.cpp
++++ b/src/core/qgspallabeling.cpp
+@@ -1818,6 +1818,12 @@ void QgsPalLayerSettings::registerFeatur
+     }
+   }
+ 
++  // fix invalid polygons
++  if ( geom->type() == QGis::Polygon && !geom->isGeosValid() )
++  {
++    geom->fromGeos( GEOSBuffer( geom->asGeos(), 0, 0 ) );
++  }
++
+   // CLIP the geometry if it is bigger than the extent
+   // don't clip if centroid is requested for whole feature
+   bool do_clip = false;

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