diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2018-03-21 08:54:12 +0100 |
|---|---|---|
| committer | Kristian Evers <kristianevers@gmail.com> | 2018-03-21 10:12:06 +0100 |
| commit | 11396b45a09f175cdbd1c6f562f1b165df64146d (patch) | |
| tree | 542445f41f17acb5f63cb0c69e9db1f5b11873f7 /src | |
| parent | 35a2b5cbe6386e985ae53c95b618dc89f60d6e60 (diff) | |
| download | PROJ-11396b45a09f175cdbd1c6f562f1b165df64146d.tar.gz PROJ-11396b45a09f175cdbd1c6f562f1b165df64146d.zip | |
Merge branch 'master' into ctable-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 ba440de4..978e19d7 100644 --- a/src/pj_gridinfo.c +++ b/src/pj_gridinfo.c @@ -923,13 +923,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)\n", - 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 |