[postgis] 01/02: Add patch by Sandro Santilli to fix test failure on various architectures.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository postgis.

commit 110b1ff2c8d19535cc1252539e8e0b7c98eb2a55
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jan 15 13:55:40 2016 +0100

    Add patch by Sandro Santilli to fix test failure on various architectures.
---
 debian/changelog                                   |  1 +
 ...-any-drift-of-cutter-point-on-lines-split.patch | 37 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 39 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 741a7ca..1023181 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ postgis (2.2.1+dfsg-2) UNRELEASED; urgency=medium
   [ Bas Couwenberg ]
   * Add patch by Helge Deller to fix wkb_output test failure on hppa & mips.
     (closes: #810859)
+  * Add patch by Sandro Santilli to fix test failure on various architectures.
 
   [ Markus Wanner ]
   * Add patch relax-test-timing-constraints.patch to increase chances of
diff --git a/debian/patches/avoid-any-drift-of-cutter-point-on-lines-split.patch b/debian/patches/avoid-any-drift-of-cutter-point-on-lines-split.patch
new file mode 100644
index 0000000..4eb230d
--- /dev/null
+++ b/debian/patches/avoid-any-drift-of-cutter-point-on-lines-split.patch
@@ -0,0 +1,37 @@
+Description: Avoid any drift of cutter point on lines split.
+ Should fix splitting operations on at least arm64, ppc64el and s390x.
+ See #3422 and #3401 (for 2.2 branch)
+Author: Sandro Santilli <strk at keybit.net>
+Bug: https://trac.osgeo.org/postgis/ticket/3422
+Origin: https://trac.osgeo.org/postgis/changeset/14595
+
+--- a/liblwgeom/lwgeom_geos_split.c
++++ b/liblwgeom/lwgeom_geos_split.c
+@@ -258,6 +258,7 @@ lwline_split_by_point_to(const LWLINE* l
+ 		{
+ 			mindist = dist;
+ 			seg=i;
++			if ( mindist == 0.0 ) break; /* can't be closer than ON line */
+ 		}
+ 		p1 = p2;
+ 	}
+@@ -273,11 +274,18 @@ lwline_split_by_point_to(const LWLINE* l
+ 
+ 	/*
+ 	 * We need to project the
+-	 * point on the closest segment.
++	 * point on the closest segment,
++	 * to interpolate Z and M if needed
+ 	 */
+ 	getPoint4d_p(ipa, seg, &p1);
+ 	getPoint4d_p(ipa, seg+1, &p2);
+ 	closest_point_on_segment(&pt, &p1, &p2, &pt_projected);
++	/* But X and Y we want the ones of the input point,
++	 * as on some architectures the interpolation math moves the
++	 * coordinates (see #3422)
++	 */
++	pt_projected.x = pt.x;
++	pt_projected.y = pt.y;
+ 
+ 	LWDEBUGF(3, "Projected point:(%g %g), seg:%d, p1:(%g %g), p2:(%g %g)", pt_projected.x, pt_projected.y, seg, p1.x, p1.y, p2.x, p2.y);
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 138cd0a..2ccdc94 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 link-liblwgeom
 hppa.patch
 relax-test-timing-constraints.patch
+avoid-any-drift-of-cutter-point-on-lines-split.patch

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