diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2018-03-21 10:08:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-21 10:08:23 +0100 |
| commit | 047c10f3b4531e1bd1f017dc4beb9283c990e9c5 (patch) | |
| tree | aee927392afbebd4a987a7db5cba061b1f1271e4 /src | |
| parent | 88be270f634968692e582a5018696bf45b63a7d9 (diff) | |
| parent | c91d3ddc5eb0509d63e3f35a33a0ba693ecd4cd5 (diff) | |
| download | PROJ-047c10f3b4531e1bd1f017dc4beb9283c990e9c5.tar.gz PROJ-047c10f3b4531e1bd1f017dc4beb9283c990e9c5.zip | |
Merge pull request #883 from schwehr/ctable-null
Handle the case where nad_ctable2_init returns NULL.
Diffstat (limited to 'src')
| -rw-r--r-- | src/pj_gridinfo.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/src/pj_gridinfo.c b/src/pj_gridinfo.c index bca2c363..19113fca 100644 --- a/src/pj_gridinfo.c +++ b/src/pj_gridinfo.c @@ -942,13 +942,21 @@ PJ_GRIDINFO *pj_gridinfo_init( projCtx ctx, const char *gridname ) gilist->format = "ctable2"; gilist->ct = ct; - pj_log( ctx, PJ_LOG_DEBUG_MAJOR, - "Ctable2 %s %dx%d: LL=(%.9g,%.9g) UR=(%.9g,%.9g)", - ct->id, - ct->lim.lam, ct->lim.phi, - ct->ll.lam * RAD_TO_DEG, ct->ll.phi * RAD_TO_DEG, - (ct->ll.lam + (ct->lim.lam-1)*ct->del.lam) * RAD_TO_DEG, - (ct->ll.phi + (ct->lim.phi-1)*ct->del.phi) * RAD_TO_DEG ); + if (ct == NULL) + { + pj_log( ctx, PJ_LOG_DEBUG_MAJOR, + "CTABLE V2 ct is NULL."); + } + else + { + pj_log( ctx, PJ_LOG_DEBUG_MAJOR, + "Ctable2 %s %dx%d: LL=(%.9g,%.9g) UR=(%.9g,%.9g)", + ct->id, + ct->lim.lam, ct->lim.phi, + ct->ll.lam * RAD_TO_DEG, ct->ll.phi * RAD_TO_DEG, + (ct->ll.lam + (ct->lim.lam-1)*ct->del.lam) * RAD_TO_DEG, + (ct->ll.phi + (ct->lim.phi-1)*ct->del.phi) * RAD_TO_DEG ); + } } else |