aboutsummaryrefslogtreecommitdiff
path: root/src/pipeline.cpp
diff options
context:
space:
mode:
authorCharles Karney <charles.karney@sri.com>2019-09-22 16:44:57 -0400
committerCharles Karney <charles.karney@sri.com>2019-09-22 16:46:34 -0400
commita2efc211eb5fa79ce3c6e666e83c3e65afd22e46 (patch)
tree131a746927cdff29cb6a445c425e9701c616adb3 /src/pipeline.cpp
parentd1bf22381344f4377d54386b6adb80c6d772967b (diff)
downloadPROJ-a2efc211eb5fa79ce3c6e666e83c3e65afd22e46.tar.gz
PROJ-a2efc211eb5fa79ce3c6e666e83c3e65afd22e46.zip
Update to version 1.50 of the geodesic library.
* Allow arbitrarily complex polygons in geod_polygon_*. In the case of self-intersecting polygons the area is accumulated "algebraically", e.g., the areas of the 2 loops in a figure-8 polygon will partially cancel. * Simplify code by using C99 functions remainder and remquo. * More test coverage. Fixes to associated files: * src/pipeline.cpp invoke geod_init with f = es / (1 + sqrt(1 - es)) instead of (the less accurate) f = 1 - sqrt(1 - es) * src/apps/geod_set.cpp remove "#undef f" (a dangling relic?).
Diffstat (limited to 'src/pipeline.cpp')
-rw-r--r--src/pipeline.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pipeline.cpp b/src/pipeline.cpp
index afa3b19a..a82fce31 100644
--- a/src/pipeline.cpp
+++ b/src/pipeline.cpp
@@ -330,7 +330,7 @@ static void set_ellipsoid(PJ *P) {
pj_calc_ellipsoid_params (P, P->a, P->es);
- geod_init(P->geod, P->a, (1 - sqrt (1 - P->es)));
+ geod_init(P->geod, P->a, P->es / (1 + sqrt(P->one_es)));
/* Re-attach the dangling list */
/* Note: cur will always be non 0 given argv_sentinel presence, */