You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2017/08/18 21:30:05 UTC
svn commit: r1805473 - in /sis/branches/JDK8/storage/sis-gdal/src:
main/c/org_apache_sis_storage_gdal_PJ.c
main/resources/native/darwin/libproj-binding.so
test/java/org/apache/sis/storage/gdal/PJTest.java
Author: desruisseaux
Date: Fri Aug 18 21:30:05 2017
New Revision: 1805473
URL: http://svn.apache.org/viewvc?rev=1805473&view=rev
Log:
Trim leading space in definition string.
Modified:
sis/branches/JDK8/storage/sis-gdal/src/main/c/org_apache_sis_storage_gdal_PJ.c
sis/branches/JDK8/storage/sis-gdal/src/main/resources/native/darwin/libproj-binding.so
sis/branches/JDK8/storage/sis-gdal/src/test/java/org/apache/sis/storage/gdal/PJTest.java
Modified: sis/branches/JDK8/storage/sis-gdal/src/main/c/org_apache_sis_storage_gdal_PJ.c
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-gdal/src/main/c/org_apache_sis_storage_gdal_PJ.c?rev=1805473&r1=1805472&r2=1805473&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-gdal/src/main/c/org_apache_sis_storage_gdal_PJ.c [UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-gdal/src/main/c/org_apache_sis_storage_gdal_PJ.c [UTF-8] Fri Aug 18 21:30:05 2017
@@ -106,7 +106,9 @@ JNIEXPORT jstring JNICALL Java_org_apach
if (pj) {
const char *desc = pj_get_def(pj, 0);
if (desc) {
- jstring str = (*env)->NewStringUTF(env, desc);
+ const char *trim = desc;
+ if (*trim == ' ') trim++;
+ jstring str = (*env)->NewStringUTF(env, trim);
pj_dalloc((char*) desc);
return str;
}
Modified: sis/branches/JDK8/storage/sis-gdal/src/main/resources/native/darwin/libproj-binding.so
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-gdal/src/main/resources/native/darwin/libproj-binding.so?rev=1805473&r1=1805472&r2=1805473&view=diff
==============================================================================
Binary files - no diff available.
Modified: sis/branches/JDK8/storage/sis-gdal/src/test/java/org/apache/sis/storage/gdal/PJTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-gdal/src/test/java/org/apache/sis/storage/gdal/PJTest.java?rev=1805473&r1=1805472&r2=1805473&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-gdal/src/test/java/org/apache/sis/storage/gdal/PJTest.java [UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-gdal/src/test/java/org/apache/sis/storage/gdal/PJTest.java [UTF-8] Fri Aug 18 21:30:05 2017
@@ -60,7 +60,7 @@ public final strictfp class PJTest exten
* Ensures that the given object is the WGS84 definition.
*/
private static void assertIsWGS84(final PJ pj) {
- assertEquals("+proj=latlong +datum=WGS84 +ellps=WGS84 +towgs84=0,0,0", pj.getCode().trim());
+ assertEquals("+proj=latlong +datum=WGS84 +ellps=WGS84 +towgs84=0,0,0", pj.getCode());
assertEquals("Proj4", pj.getCodeSpace());
assertSame (Citations.PROJ4, pj.getAuthority());
assertTrue (Character.isDigit( pj.getVersion().codePointAt(0)));