aboutsummaryrefslogtreecommitdiff
path: root/src/proj_4D_api.c
diff options
context:
space:
mode:
authorKristian Evers <kristianevers@gmail.com>2018-10-11 11:19:02 +0200
committerKristian Evers <kristianevers@gmail.com>2018-10-11 11:19:02 +0200
commit0e3debf173bfe9d9dccf337a5c41fe2e1bf1ded3 (patch)
tree65c85a6fd82d8410f5fe743965f1b5d1b2d15a71 /src/proj_4D_api.c
parente649eb7369caa87f0e5e8076fb7bffe72485b646 (diff)
parent6c203a4395f30eae4f49230d2e2cb7652006b959 (diff)
downloadPROJ-0e3debf173bfe9d9dccf337a5c41fe2e1bf1ded3.tar.gz
PROJ-0e3debf173bfe9d9dccf337a5c41fe2e1bf1ded3.zip
Merge remote-tracking branch 'osgeo/master' into bertin1953
Diffstat (limited to 'src/proj_4D_api.c')
-rw-r--r--src/proj_4D_api.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/proj_4D_api.c b/src/proj_4D_api.c
index 74cf45d6..81967a1d 100644
--- a/src/proj_4D_api.c
+++ b/src/proj_4D_api.c
@@ -519,6 +519,17 @@ Returns 1 on success, 0 on failure
if (P->is_geocent || P->helmert || do_cart) {
char def[150];
sprintf (def, "break_cs2cs_recursion proj=cart a=%40.20g es=%40.20g", P->a_orig, P->es_orig);
+ {
+ /* In case the current locale does not use dot but comma as decimal */
+ /* separator, replace it with dot, so that proj_atof() behaves */
+ /* correctly. */
+ /* TODO later: use C++ ostringstream with imbue(std::locale::classic()) */
+ /* to be locale unaware */
+ char* next_pos;
+ for (next_pos = def; (next_pos = strchr (next_pos, ',')) != NULL; next_pos++) {
+ *next_pos = '.';
+ }
+ }
Q = proj_create (P->ctx, def);
if (0==Q)
return 0;