diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2019-01-20 16:16:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-20 16:16:10 +0100 |
| commit | a4ec5e49bbcf3de1c779c3ed13389def99dd6a4e (patch) | |
| tree | 179b4b60d3e387d3f8ba528db73c8e348819bd70 /src/4D_api.cpp | |
| parent | aba9c7747fc47bbc6f0ec6e6957449ea5090c5fc (diff) | |
| parent | 53a8cbbec1a6c9c644b35da86bc26a33ff1279e0 (diff) | |
| download | PROJ-a4ec5e49bbcf3de1c779c3ed13389def99dd6a4e.tar.gz PROJ-a4ec5e49bbcf3de1c779c3ed13389def99dd6a4e.zip | |
Merge pull request #1230 from rouault/space_in_grid_names
Add support for spaces in grid name parameters (fixes #1152)
Diffstat (limited to 'src/4D_api.cpp')
| -rw-r--r-- | src/4D_api.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/4D_api.cpp b/src/4D_api.cpp index 37afd289..642fbb1f 100644 --- a/src/4D_api.cpp +++ b/src/4D_api.cpp @@ -473,10 +473,11 @@ Returns 1 on success, 0 on failure p = pj_param_exists (P->params, "geoidgrids"); if (p && strlen (p->param) > strlen ("geoidgrids=")) { char *gridnames = p->param + strlen ("geoidgrids="); - char *def = static_cast<char*>(malloc (100+strlen(gridnames))); + char *def = static_cast<char*>(malloc (100+2*strlen(gridnames))); if (nullptr==def) return 0; - sprintf (def, "break_cs2cs_recursion proj=vgridshift grids=%s", gridnames); + sprintf (def, "break_cs2cs_recursion proj=vgridshift grids=%s", + pj_double_quote_string_param_if_needed(gridnames).c_str()); Q = pj_create_internal (P->ctx, def); free (def); if (nullptr==Q) @@ -488,10 +489,11 @@ Returns 1 on success, 0 on failure p = pj_param_exists (P->params, "nadgrids"); if (p && strlen (p->param) > strlen ("nadgrids=")) { char *gridnames = p->param + strlen ("nadgrids="); - char *def = static_cast<char*>(malloc (100+strlen(gridnames))); + char *def = static_cast<char*>(malloc (100+2*strlen(gridnames))); if (nullptr==def) return 0; - sprintf (def, "break_cs2cs_recursion proj=hgridshift grids=%s", gridnames); + sprintf (def, "break_cs2cs_recursion proj=hgridshift grids=%s", + pj_double_quote_string_param_if_needed(gridnames).c_str()); Q = pj_create_internal (P->ctx, def); free (def); if (nullptr==Q) |