aboutsummaryrefslogtreecommitdiff
path: root/src/jniproj.c
diff options
context:
space:
mode:
authorMartin Desruisseaux <martin.desruisseaux@geomatys.com>2018-04-27 15:42:36 +0200
committerMartin Desruisseaux <martin.desruisseaux@geomatys.com>2018-04-27 15:42:36 +0200
commit44b83cbb394639f6c393c349b56360af27bc3020 (patch)
tree7256962d13525a7b42c0dae3ec2ca52fc82ca4b2 /src/jniproj.c
parent5bbeb0c6fc80b05f6ae92cf4fbc25f4fb41201cf (diff)
downloadPROJ-44b83cbb394639f6c393c349b56360af27bc3020.tar.gz
PROJ-44b83cbb394639f6c393c349b56360af27bc3020.zip
Apply the https://github.com/opengeospatial/geoapi/issues/26 patch.
Update contributor names in copyright header.
Diffstat (limited to 'src/jniproj.c')
-rw-r--r--src/jniproj.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/jniproj.c b/src/jniproj.c
index 85d984da..072fa04c 100644
--- a/src/jniproj.c
+++ b/src/jniproj.c
@@ -5,7 +5,9 @@
* Martin Desruisseaux
*
******************************************************************************
- * Copyright (c) 2005, Antonello Andrea
+ * Copyright (c) 2005, Andrea Antonello
+ * Copyright (c) 2011, Martin Desruisseaux
+ * Copyright (c) 2018, Even Rouault
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -351,11 +353,8 @@ void convertAngularOrdinates(PJ *pj, double* data, jint numPts, int dimension, d
if (pj_is_latlong(pj)) {
/* Convert only the 2 first ordinates and skip all the other dimensions. */
dimToSkip = dimension - 2;
- } else if (pj_is_geocent(pj)) {
- /* Convert only the 3 first ordinates and skip all the other dimensions. */
- dimToSkip = dimension - 3;
} else {
- /* Not a geographic or geocentric CRS: nothing to convert. */
+ /* Not a geographic CRS: nothing to convert. */
return;
}
double *stop = data + dimension*numPts;