aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Warmerdam <warmerdam@pobox.com>2011-02-08 23:35:42 +0000
committerFrank Warmerdam <warmerdam@pobox.com>2011-02-08 23:35:42 +0000
commit565f820c2729178e72a4fb8678036be4866a5af3 (patch)
treee935a096f24ac4827b61cd91356d6bce2f95b734
parent5c012e674b5a149312973f626ab2913f8fd0ae29 (diff)
downloadPROJ-565f820c2729178e72a4fb8678036be4866a5af3.tar.gz
PROJ-565f820c2729178e72a4fb8678036be4866a5af3.zip
fix particular problem with CEA (#94)
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1967 4e78687f-474d-0410-85f9-8d5e500ac6b2
-rw-r--r--ChangeLog2
-rw-r--r--src/PJ_cea.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e81c2961..4a5eab32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2011-02-08 Frank Warmerdam <warmerdam@pobox.com>
+ * src/PJ_cea.c: Fix particular CEA case (#94).
+
* src/pj_auth.c: correct precision of constants (#93)
* src/pj_init.c, pj_malloc.c, jniproj.c: avoid C++ comments (#92)
diff --git a/src/PJ_cea.c b/src/PJ_cea.c
index 786eadcb..f5b78838 100644
--- a/src/PJ_cea.c
+++ b/src/PJ_cea.c
@@ -43,9 +43,8 @@ ENTRY1(cea, apa)
double t;
if (pj_param(P->ctx, P->params, "tlat_ts").i &&
- (P->k0 = cos(t = pj_param(P->ctx, P->params, "rlat_ts").f)) < 0.) E_ERROR(-24)
- else
- t = 0.;
+ (P->k0 = cos(t = pj_param(P->ctx, P->params, "rlat_ts").f)) < 0.)
+ E_ERROR(-24);
if (P->es) {
t = sin(t);
P->k0 /= sqrt(1. - P->es * t * t);