[Git][debian-gis-team/proj][master] 2 commits: Add patch to fix height_unit() in proj_transform.c.

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / proj


Commits:
992f4472 by Bas Couwenberg at 2018-03-09T12:20:50+01:00
Add patch to fix height_unit() in proj_transform.c.

- - - - -
799d3118 by Bas Couwenberg at 2018-03-09T12:21:02+01:00
Set distribution to experimental.

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/pj_transform-height_unit.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+proj (5.0.0-3~exp2) experimental; urgency=medium
+
+  * Add patch to fix height_unit() in proj_transform.c.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 09 Mar 2018 12:20:41 +0100
+
 proj (5.0.0-3~exp1) experimental; urgency=medium
 
   * Add upstream patches to fix regressions in 5.0.0:


=====================================
debian/patches/pj_transform-height_unit.patch
=====================================
--- /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++)


=====================================
debian/patches/series
=====================================
--- 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



View it on GitLab: https://salsa.debian.org/debian-gis-team/proj/compare/448ec3c2e0c340db31e1f5fed57f16e02ff8e03b...799d3118974766dd6535f87d786c9fbb9d7074e3

---
View it on GitLab: https://salsa.debian.org/debian-gis-team/proj/compare/448ec3c2e0c340db31e1f5fed57f16e02ff8e03b...799d3118974766dd6535f87d786c9fbb9d7074e3
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-grass-devel/attachments/20180309/5d6b9f63/attachment-0001.html>