diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2018-03-20 22:44:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-20 22:44:12 +0100 |
| commit | 50c80eceb7d61bbc0a2c8e5909ee54e0051c3d96 (patch) | |
| tree | 5d94d8df7d0b5d077b900e88bcb439c3a3dcbbc3 /src/pj_init.c | |
| parent | 03c9db503cb525a2da88896f8f895c30bb3d8fa9 (diff) | |
| parent | 60b08570aa47be15bf5e41745a0a00c22304c41d (diff) | |
| download | PROJ-50c80eceb7d61bbc0a2c8e5909ee54e0051c3d96.tar.gz PROJ-50c80eceb7d61bbc0a2c8e5909ee54e0051c3d96.zip | |
Merge pull request #877 from kbevers/fix-datum-param-in-pipelines
Introduce late expansion of +datum parameters.
Diffstat (limited to 'src/pj_init.c')
| -rw-r--r-- | src/pj_init.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/pj_init.c b/src/pj_init.c index 2d549317..e5b1441a 100644 --- a/src/pj_init.c +++ b/src/pj_init.c @@ -590,9 +590,12 @@ pj_init_ctx(projCtx ctx, int argc, char **argv) { PIN->vgridlist_geoid = NULL; PIN->vgridlist_geoid_count = 0; - /* Set datum parameters */ - if (pj_datum_set(ctx, start, PIN)) - return pj_default_destructor (PIN, proj_errno(PIN)); + /* Set datum parameters. Similarly to +init parameters we want to expand */ + /* +datum parameters as late as possible when dealing with pipelines. */ + /* otherwise only the first occurrence of +datum will be expanded and that */ + if (n_pipelines == 0) + if (pj_datum_set(ctx, start, PIN)) + return pj_default_destructor (PIN, proj_errno(PIN)); err = pj_ellipsoid (PIN); |