diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2018-04-27 15:28:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-27 15:28:37 +0200 |
| commit | 5bbeb0c6fc80b05f6ae92cf4fbc25f4fb41201cf (patch) | |
| tree | 13b4ae987d4c1cdddbc0bef09988709d2c290242 | |
| parent | fdf8f02538bff49ed5b986c26aed68da335f09c8 (diff) | |
| parent | 56f089510a170164ffc4792a7f7c57ba8f64f1c9 (diff) | |
| download | PROJ-5bbeb0c6fc80b05f6ae92cf4fbc25f4fb41201cf.tar.gz PROJ-5bbeb0c6fc80b05f6ae92cf4fbc25f4fb41201cf.zip | |
Merge pull request #956 from Geomatys/master
Remove unused src/org_proj4_Projections.h file
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/lib_proj.cmake | 3 | ||||
| -rw-r--r-- | src/org_proj4_Projections.h | 37 |
3 files changed, 2 insertions, 40 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 78ecfdf8..971ac78c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,7 +10,7 @@ AM_CPPFLAGS = -DPROJ_LIB=\"$(pkgdatadir)\" \ -DMUTEX_@MUTEX_SETTING@ @JNI_INCLUDE@ include_HEADERS = proj.h proj_api.h projects.h geodesic.h \ - org_proj4_Projections.h org_proj4_PJ.h + org_proj4_PJ.h EXTRA_DIST = makefile.vc proj.def bin_cct.cmake bin_gie.cmake bin_cs2cs.cmake \ bin_geod.cmake bin_nad2bin.cmake bin_proj.cmake \ diff --git a/src/lib_proj.cmake b/src/lib_proj.cmake index c0d0a6a9..82a8fc81 100644 --- a/src/lib_proj.cmake +++ b/src/lib_proj.cmake @@ -258,8 +258,7 @@ if(JNI_SUPPORT) set(SRC_LIBPROJ_CORE ${SRC_LIBPROJ_CORE} jniproj.c ) set(HEADERS_LIBPROJ ${HEADERS_LIBPROJ} - org_proj4_PJ.h - org_proj4_Projections.h) + org_proj4_PJ.h) source_group("Source Files\\JNI" FILES ${SRC_LIBPROJ_JNI}) add_definitions(-DJNI_ENABLED) include_directories( ${JNI_INCLUDE_DIRS}) diff --git a/src/org_proj4_Projections.h b/src/org_proj4_Projections.h deleted file mode 100644 index 3841e057..00000000 --- a/src/org_proj4_Projections.h +++ /dev/null @@ -1,37 +0,0 @@ -/* DO NOT EDIT THIS FILE - it is machine generated */ -#include <jni.h> -/* Header for class org_proj4_Projections */ - -#ifndef _Included_org_proj4_Projections -#define _Included_org_proj4_Projections -#ifdef __cplusplus -extern "C" { -#endif -/* - * Class: org_proj4_Projections - * Method: getProjInfo - * Signature: (Ljava/lang/String;)Ljava/lang/String; - */ -JNIEXPORT jstring JNICALL Java_org_proj4_Projections_getProjInfo - (JNIEnv *, jobject, jstring); - -/* - * Class: org_proj4_Projections - * Method: getEllipsInfo - * Signature: (Ljava/lang/String;)Ljava/lang/String; - */ -JNIEXPORT jstring JNICALL Java_org_proj4_Projections_getEllipsInfo - (JNIEnv *, jobject, jstring); - -/* - * Class: org_proj4_Projections - * Method: transform - * Signature: ([D[D[DLjava/lang/String;Ljava/lang/String;JI)V - */ -JNIEXPORT void JNICALL Java_org_proj4_Projections_transform - (JNIEnv *, jobject, jdoubleArray, jdoubleArray, jdoubleArray, jstring, jstring, jlong, jint); - -#ifdef __cplusplus -} -#endif -#endif |