From 44b83cbb394639f6c393c349b56360af27bc3020 Mon Sep 17 00:00:00 2001 From: Martin Desruisseaux Date: Fri, 27 Apr 2018 15:42:36 +0200 Subject: Apply the https://github.com/opengeospatial/geoapi/issues/26 patch. Update contributor names in copyright header. --- src/jniproj.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src') 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; -- cgit v1.2.3 From aef6d05bfe86b810dbd38dbdb9c757dae7b8368e Mon Sep 17 00:00:00 2001 From: Martin Desruisseaux Date: Fri, 27 Apr 2018 18:15:08 +0200 Subject: Update the Ant build.xml script for: - Generating the C header file during javac task. - Provide more accurate information in META-INF/MANIFEST.MF. - Merge tasks intended to be executed together. The src/org_proj4_PJ.h file has been re-generated with the most recent Java compiler. --- src/org_proj4_PJ.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') 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); -- cgit v1.2.3