[proj] 01/02: Add patch to fix height_unit() in proj_transform.c.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository proj.

commit 992f4472ad3353f9c4c5d4fced13ac6fbe1a9c38
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Mar 9 12:05:10 2018 +0100

    Add patch to fix height_unit() in proj_transform.c.
---
 debian/changelog                              |  6 ++++++
 debian/patches/pj_transform-height_unit.patch | 18 ++++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4bdf130..671f5c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+proj (5.0.0-3~exp2) UNRELEASED; urgency=medium
+
+  * Add patch to fix height_unit() in proj_transform.c.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 09 Mar 2018 12:05:07 +0100
+
 proj (5.0.0-3~exp1) experimental; urgency=medium
 
   * Add upstream patches to fix regressions in 5.0.0:
diff --git a/debian/patches/pj_transform-height_unit.patch b/debian/patches/pj_transform-height_unit.patch
new file mode 100644
index 0000000..abee647
--- /dev/null
+++ b/debian/patches/pj_transform-height_unit.patch
@@ -0,0 +1,18 @@
+Description: Fix height_unit() in proj_transform.c.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/OSGeo/proj.4/pull/845#issuecomment-371785556
+
+--- a/src/pj_transform.c
++++ b/src/pj_transform.c
+@@ -397,7 +397,10 @@ static int height_unit (PJ *P, PJ_DIRECT
+         fac = P->vfr_meter;
+ 
+     /* Nothing to do? */
+-    if (P->vto_meter==0.0)
++    if (fac == 1.0)
++        return 0;
++
++    if (z == NULL)
+         return 0;
+ 
+     for (i = 0;  i < n;  i++)
diff --git a/debian/patches/series b/debian/patches/series
index acc3907..33c6100 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Revert-fix-to-22.patch
 pr845_Refactor-pj_transform-reintroduce-support-for-vertical-scaling.patch
+pj_transform-height_unit.patch

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