[proj] 01/03: Add patch to fix transformation of points outside datum shift grids.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository proj.

commit f2f59d686e53dca18fb6ab66f911774544e3f297
Author: Bas Couwenberg <bas at vmware-debian-unstable.linuxminded.xs4all.nl>
Date:   Tue Feb 2 19:38:02 2016 +0100

    Add patch to fix transformation of points outside datum shift grids.
---
 debian/changelog                                   |  1 +
 ...e-shift-values-whose-abs-value-is-gt-1000.patch | 29 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3018da6..5b7bb49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ proj (4.9.2-2) UNRELEASED; urgency=medium
 
   * Add patch to fix unmatched ')' in man page.
     (closes: 807145)
+  * Add patch to fix transformation of points outside datum shift grids.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sun, 06 Dec 2015 03:13:48 +0100
 
diff --git a/debian/patches/GTX-grids-ignore-shift-values-whose-abs-value-is-gt-1000.patch b/debian/patches/GTX-grids-ignore-shift-values-whose-abs-value-is-gt-1000.patch
new file mode 100644
index 0000000..38fe8c1
--- /dev/null
+++ b/debian/patches/GTX-grids-ignore-shift-values-whose-abs-value-is-gt-1000.patch
@@ -0,0 +1,29 @@
+Origin: https://github.com/OSGeo/proj.4/commit/a12bfb7c207449c9768fa7591684a0240d2e6898
+Bug-Debian: https://bugs.debian.org/813066
+From f3f9f0ca569e6cd14e4d468dfa783881bdd35343 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault at spatialys.com>
+Date: Tue, 2 Feb 2016 14:06:31 +0100
+Subject: [PATCH] GTX grids: ignore shift values whose abs value is > 1000
+
+This partially reverts https://github.com/OSGeo/proj.4/commit/338ea581
+(#271) to solve issue with naptrans2008.gtx grid mentioned in
+http://lists.maptools.org/pipermail/proj/2016-February/007327.html
+---
+ src/pj_apply_vgridshift.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+--- a/src/pj_apply_vgridshift.c
++++ b/src/pj_apply_vgridshift.c
+@@ -151,7 +151,11 @@ int pj_apply_vgridshift( PJ *defn, const
+                 + cvs[grid_ix + 1 + (grid_iy+1) * ct->lim.lam] 
+                 * (grid_x) * (grid_y);
+ 
+-            if( value == -88.88880f ) /* nodata? */
++            /* nodata?  */
++            /* GTX official nodata value if  -88.88880f, but some grids also */
++            /* use other  big values for nodata (e.g naptrans2008.gtx has */
++            /* nodata values like -2147479936), so test them too */
++            if( value > 1000 || value < -1000 || value == -88.88880f )
+                 value = HUGE_VAL;
+             else
+             {
diff --git a/debian/patches/series b/debian/patches/series
index 48f8a7c..bff8025 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 manpage-typos.patch
+GTX-grids-ignore-shift-values-whose-abs-value-is-gt-1000.patch

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