aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Evers <kristianevers@gmail.com>2019-09-16 17:00:19 +0200
committerGitHub <noreply@github.com>2019-09-16 17:00:19 +0200
commit8a92356e9715a5845e329ff00bafcfc845b5b1ce (patch)
tree67ff69f211f413e85d851643293cb1f10e193af4
parent3c0a5f0c147556f3badbef940fe5e415ff6f5708 (diff)
parent03276de30c2b2553ae6ad585b08b6377d2ae64c2 (diff)
downloadPROJ-8a92356e9715a5845e329ff00bafcfc845b5b1ce.tar.gz
PROJ-8a92356e9715a5845e329ff00bafcfc845b5b1ce.zip
Merge pull request #1582 from rschmunk/patch-1
Debug Bertin1953
-rw-r--r--docs/source/operations/projections/images/bertin1953.pngbin177358 -> 305990 bytes
-rw-r--r--src/projections/bertin1953.cpp2
-rw-r--r--test/gie/more_builtins.gie2
3 files changed, 2 insertions, 2 deletions
diff --git a/docs/source/operations/projections/images/bertin1953.png b/docs/source/operations/projections/images/bertin1953.png
index 9b272033..e8a8634d 100644
--- a/docs/source/operations/projections/images/bertin1953.png
+++ b/docs/source/operations/projections/images/bertin1953.png
Binary files differ
diff --git a/src/projections/bertin1953.cpp b/src/projections/bertin1953.cpp
index 63154084..b864f83a 100644
--- a/src/projections/bertin1953.cpp
+++ b/src/projections/bertin1953.cpp
@@ -67,7 +67,7 @@ static PJ_XY bertin1953_s_forward (PJ_LP lp, PJ *P) {
xy.x *= 1. + d;
}
if (xy.y > 0.) {
- xy.x *= 1. + d / 1.5 * xy.x * xy.x;
+ xy.y *= 1. + d / 1.5 * xy.x * xy.x;
}
return xy;
diff --git a/test/gie/more_builtins.gie b/test/gie/more_builtins.gie
index 53513d49..10d3ea47 100644
--- a/test/gie/more_builtins.gie
+++ b/test/gie/more_builtins.gie
@@ -109,7 +109,7 @@ accept 80 7
expect 0.929377425352 -0.215443296201
accept 128 35
-expect 0.937431733950 0.700084268525
+expect 0.920230566844 0.713170409026
accept 170 -41
expect 2.162845830414 -0.046534568425