diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2018-12-16 16:05:38 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2018-12-17 20:01:05 +0100 |
| commit | dcb58eb624f87fad1362bfc593b274f84fa44889 (patch) | |
| tree | ed148e4a19f507722383467264bbd02417b7c64a /src/proj.h | |
| parent | a44a6231364d893d906711138035074fb95521a2 (diff) | |
| download | PROJ-dcb58eb624f87fad1362bfc593b274f84fa44889.tar.gz PROJ-dcb58eb624f87fad1362bfc593b274f84fa44889.zip | |
Add WKT1 grammar validation; change prototype of proj_obj_create_from_wkt()
Diffstat (limited to 'src/proj.h')
| -rw-r--r-- | src/proj.h | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -456,6 +456,11 @@ typedef struct PJ_OBJ PJ_OBJ; typedef struct PJ_OBJ_LIST PJ_OBJ_LIST; /*! @endcond */ +/** \brief Type representing a NULL terminated list of NUL-terminate strings. */ +typedef char **PROJ_STRING_LIST; + +void PROJ_DLL proj_string_list_destroy(PROJ_STRING_LIST list); + int PROJ_DLL proj_context_set_database_path(PJ_CONTEXT *ctx, const char *dbPath, const char *const *auxDbPaths, @@ -494,7 +499,9 @@ PJ_OBJ PROJ_DLL *proj_obj_create_from_user_input(PJ_CONTEXT *ctx, const char* const *options); PJ_OBJ PROJ_DLL *proj_obj_create_from_wkt(PJ_CONTEXT *ctx, const char *wkt, - const char* const *options); + const char* const *options, + PROJ_STRING_LIST *out_warnings, + PROJ_STRING_LIST *out_grammar_errors); PJ_OBJ PROJ_DLL *proj_obj_create_from_proj_string(PJ_CONTEXT *ctx, const char *proj_string, @@ -677,9 +684,6 @@ void PROJ_DLL proj_int_list_destroy(int* list); /* ------------------------------------------------------------------------- */ -/** \brief Type representing a NULL terminated list of NUL-terminate strings. */ -typedef char **PROJ_STRING_LIST; - PROJ_STRING_LIST PROJ_DLL proj_get_authorities_from_database(PJ_CONTEXT *ctx); PROJ_STRING_LIST PROJ_DLL proj_get_codes_from_database(PJ_CONTEXT *ctx, @@ -687,8 +691,6 @@ PROJ_STRING_LIST PROJ_DLL proj_get_codes_from_database(PJ_CONTEXT *ctx, PJ_OBJ_TYPE type, int allow_deprecated); -void PROJ_DLL proj_string_list_destroy(PROJ_STRING_LIST list); - /* ------------------------------------------------------------------------- */ |