diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2020-01-13 00:22:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-13 00:22:56 +0100 |
| commit | 9d8647371d27bdbd717644f7df5514a6f2b07a00 (patch) | |
| tree | 1ff8fa7fd812fea2ae53792b5488a90f6418095c /src/datum_set.cpp | |
| parent | b6f0153e5aa27dc11d2c879dc4a62a0f35a122cb (diff) | |
| parent | 22792cd55ba41ffadb248c246cc871612a5139c1 (diff) | |
| download | PROJ-9d8647371d27bdbd717644f7df5514a6f2b07a00.tar.gz PROJ-9d8647371d27bdbd717644f7df5514a6f2b07a00.zip | |
Merge pull request #1777 from rouault/rfc4_impl
[RFC4_dev] Grid loading refactoring
Diffstat (limited to 'src/datum_set.cpp')
| -rw-r--r-- | src/datum_set.cpp | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/src/datum_set.cpp b/src/datum_set.cpp index 873d7be5..15d51613 100644 --- a/src/datum_set.cpp +++ b/src/datum_set.cpp @@ -41,7 +41,7 @@ int pj_datum_set(projCtx ctx, paralist *pl, PJ *projdef) { - const char *name, *towgs84, *nadgrids, *catalog; + const char *name, *towgs84, *nadgrids; projdef->datum_type = PJD_UNKNOWN; @@ -118,25 +118,6 @@ int pj_datum_set(projCtx ctx, paralist *pl, PJ *projdef) } /* -------------------------------------------------------------------- */ -/* Check for grid catalog parameter, and optional date. */ -/* -------------------------------------------------------------------- */ - else if( (catalog = pj_param(ctx, pl,"scatalog").s) != nullptr ) - { - const char *date; - - projdef->datum_type = PJD_GRIDSHIFT; - projdef->catalog_name = pj_strdup(catalog); - if (!projdef->catalog_name) { - pj_ctx_set_errno(ctx, ENOMEM); - return 1; - } - - date = pj_param(ctx, pl, "sdate").s; - if( date != nullptr) - projdef->datum_date = pj_gc_parsedate( ctx, date); - } - -/* -------------------------------------------------------------------- */ /* Check for towgs84 parameter. */ /* -------------------------------------------------------------------- */ else if( (towgs84 = pj_param(ctx, pl,"stowgs84").s) != nullptr ) |