diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2019-01-22 19:47:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-22 19:47:18 +0100 |
| commit | f0197a532b9ed0facafa0be135c208d5b570ac57 (patch) | |
| tree | 5ba1c8d7aefbbfc40a80834d6ba5a772e9bc04b3 /src/4D_api.cpp | |
| parent | 8ff49e280c446421ca4669e851687847b0da7c9a (diff) | |
| parent | 7e11edaa2d1abc09478f3bd3fb9926cb0ef3fdda (diff) | |
| download | PROJ-f0197a532b9ed0facafa0be135c208d5b570ac57.tar.gz PROJ-f0197a532b9ed0facafa0be135c208d5b570ac57.zip | |
Merge pull request #1233 from rouault/fix_1232
Coordinate operation computation with boundcrs / wktext: drop useless early bindins terms in generated pipeline (fixes #1232)
Diffstat (limited to 'src/4D_api.cpp')
| -rw-r--r-- | src/4D_api.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/4D_api.cpp b/src/4D_api.cpp index 67460f3a..97aadb12 100644 --- a/src/4D_api.cpp +++ b/src/4D_api.cpp @@ -494,6 +494,9 @@ Returns 1 on success, 0 on failure /* Swap axes? */ p = pj_param_exists (P->params, "axis"); + const bool disable_grid_presence_check = pj_param_exists ( + P->params, "disable_grid_presence_check") != nullptr; + /* Don't axisswap if data are already in "enu" order */ if (p && (0!=strcmp ("enu", p->param))) { char *def = static_cast<char*>(malloc (100+strlen(P->axis))); @@ -509,7 +512,7 @@ Returns 1 on success, 0 on failure /* Geoid grid(s) given? */ p = pj_param_exists (P->params, "geoidgrids"); - if (p && strlen (p->param) > strlen ("geoidgrids=")) { + if (!disable_grid_presence_check && p && strlen (p->param) > strlen ("geoidgrids=")) { char *gridnames = p->param + strlen ("geoidgrids="); char *def = static_cast<char*>(malloc (100+2*strlen(gridnames))); if (nullptr==def) @@ -525,7 +528,7 @@ Returns 1 on success, 0 on failure /* Datum shift grid(s) given? */ p = pj_param_exists (P->params, "nadgrids"); - if (p && strlen (p->param) > strlen ("nadgrids=")) { + if (!disable_grid_presence_check && p && strlen (p->param) > strlen ("nadgrids=")) { char *gridnames = p->param + strlen ("nadgrids="); char *def = static_cast<char*>(malloc (100+2*strlen(gridnames))); if (nullptr==def) |