aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKristian Evers <kristianevers@gmail.com>2019-09-23 09:29:25 +0200
committerGitHub <noreply@github.com>2019-09-23 09:29:25 +0200
commit91d3d51a5abafb773fca3e4aae3223cdedfc51af (patch)
tree20df766bc2bad11aa1862ddfb853a67b18c36db7 /src
parentfcfde94401c8841527e5dbd43928f70fc40a5225 (diff)
parente414ddcc8fb4334d82a29a25bb274f977e2ed8f1 (diff)
downloadPROJ-91d3d51a5abafb773fca3e4aae3223cdedfc51af.tar.gz
PROJ-91d3d51a5abafb773fca3e4aae3223cdedfc51af.zip
Merge pull request #1630 from snowman2/promote
promote proj_assign_context to proj.h from proj_experimental.h
Diffstat (limited to 'src')
-rw-r--r--src/proj.h1
-rw-r--r--src/proj_experimental.h6
2 files changed, 1 insertions, 6 deletions
diff --git a/src/proj.h b/src/proj.h
index a01c8a36..9c3412e8 100644
--- a/src/proj.h
+++ b/src/proj.h
@@ -363,6 +363,7 @@ PJ PROJ_DLL *proj_create_crs_to_crs_from_pj(PJ_CONTEXT *ctx,
PJ_AREA *area,
const char* const *options);
PJ PROJ_DLL *proj_normalize_for_visualization(PJ_CONTEXT *ctx, const PJ* obj);
+void PROJ_DLL proj_assign_context(PJ* pj, PJ_CONTEXT* ctx);
PJ PROJ_DLL *proj_destroy (PJ *P);
diff --git a/src/proj_experimental.h b/src/proj_experimental.h
index 0452eb4b..dcb2e888 100644
--- a/src/proj_experimental.h
+++ b/src/proj_experimental.h
@@ -922,12 +922,6 @@ PJ PROJ_DLL *proj_create_conversion_equal_earth(
/**@}*/
-/*! @cond Doxygen_Suppress */
-
-void PROJ_DLL proj_assign_context( PJ* pj, PJ_CONTEXT* ctx );
-
-/*! @endcond */
-
#ifdef __cplusplus
}
#endif