diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2018-04-30 10:23:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-30 10:23:06 +0200 |
| commit | da677f2690ab7745c0c8b7f61696c937cf248bdd (patch) | |
| tree | 62a39430f4e98a01ade1850bded1fc9144d7dacd /src | |
| parent | 5bbeb0c6fc80b05f6ae92cf4fbc25f4fb41201cf (diff) | |
| parent | 1c1dc406893dca639a93a3c7d2a196582a469c37 (diff) | |
| download | PROJ-da677f2690ab7745c0c8b7f61696c937cf248bdd.tar.gz PROJ-da677f2690ab7745c0c8b7f61696c937cf248bdd.zip | |
Merge pull request #957 from Geomatys/master
Update the JNI build, without API change for now
Diffstat (limited to 'src')
| -rw-r--r-- | src/jniproj.c | 9 | ||||
| -rw-r--r-- | src/org_proj4_PJ.h | 2 |
2 files changed, 5 insertions, 6 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; diff --git a/src/org_proj4_PJ.h b/src/org_proj4_PJ.h index 7e690e7a..be5d3f58 100644 --- a/src/org_proj4_PJ.h +++ b/src/org_proj4_PJ.h @@ -44,7 +44,7 @@ JNIEXPORT jstring JNICALL Java_org_proj4_PJ_getDefinition /* * Class: org_proj4_PJ * Method: getType - * Signature: ()Lorg/proj4/PJ$Type; + * Signature: ()Lorg/proj4/PJ/Type; */ JNIEXPORT jobject JNICALL Java_org_proj4_PJ_getType (JNIEnv *, jobject); |