diff options
Diffstat (limited to 'src/geod_set.cpp')
| -rw-r--r-- | src/geod_set.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/geod_set.cpp b/src/geod_set.cpp index b5bd0667..b9e9c42f 100644 --- a/src/geod_set.cpp +++ b/src/geod_set.cpp @@ -11,7 +11,7 @@ void geod_set(int argc, char **argv) { - paralist *start = 0, *curr; + paralist *start = nullptr, *curr; double es; char *name; int i; @@ -22,7 +22,7 @@ geod_set(int argc, char **argv) { start = curr = pj_mkparam(argv[0]); if (!curr) emess(1, "memory allocation failed"); - for (i = 1; curr != 0 && i < argc; ++i) { + for (i = 1; curr != nullptr && i < argc; ++i) { curr->next = pj_mkparam(argv[i]); if (!curr->next) emess(1, "memory allocation failed"); @@ -31,7 +31,7 @@ geod_set(int argc, char **argv) { /* set elliptical parameters */ if (pj_ell_set(pj_get_default_ctx(),start, &geod_a, &es)) emess(1,"ellipse setup failure"); /* set units */ - if ((name = pj_param(NULL,start, "sunits").s) != NULL) { + if ((name = pj_param(nullptr,start, "sunits").s) != nullptr) { const char *s; const struct PJ_UNITS *unit_list = proj_list_units(); for (i = 0; (s = unit_list[i].id) && strcmp(name, s) ; ++i) ; @@ -44,27 +44,27 @@ geod_set(int argc, char **argv) { geod_f = es/(1 + sqrt(1 - es)); geod_ini(); /* check if line or arc mode */ - if (pj_param(NULL,start, "tlat_1").i) { + if (pj_param(nullptr,start, "tlat_1").i) { double del_S; #undef f - phi1 = pj_param(NULL,start, "rlat_1").f; - lam1 = pj_param(NULL,start, "rlon_1").f; - if (pj_param(NULL,start, "tlat_2").i) { - phi2 = pj_param(NULL,start, "rlat_2").f; - lam2 = pj_param(NULL,start, "rlon_2").f; + phi1 = pj_param(nullptr,start, "rlat_1").f; + lam1 = pj_param(nullptr,start, "rlon_1").f; + if (pj_param(nullptr,start, "tlat_2").i) { + phi2 = pj_param(nullptr,start, "rlat_2").f; + lam2 = pj_param(nullptr,start, "rlon_2").f; geod_inv(); geod_pre(); - } else if ((geod_S = pj_param(NULL,start, "dS").f) != 0.) { - al12 = pj_param(NULL,start, "rA").f; + } else if ((geod_S = pj_param(nullptr,start, "dS").f) != 0.) { + al12 = pj_param(nullptr,start, "rA").f; geod_pre(); geod_for(); } else emess(1,"incomplete geodesic/arc info"); - if ((n_alpha = pj_param(NULL,start, "in_A").i) > 0) { - if ((del_alpha = pj_param(NULL,start, "rdel_A").f) == 0.0) + if ((n_alpha = pj_param(nullptr,start, "in_A").i) > 0) { + if ((del_alpha = pj_param(nullptr,start, "rdel_A").f) == 0.0) emess(1,"del azimuth == 0"); - } else if ((del_S = fabs(pj_param(NULL,start, "ddel_S").f)) != 0.) { + } else if ((del_S = fabs(pj_param(nullptr,start, "ddel_S").f)) != 0.) { n_S = (int)(geod_S / del_S + .5); - } else if ((n_S = pj_param(NULL,start, "in_S").i) <= 0) + } else if ((n_S = pj_param(nullptr,start, "in_S").i) <= 0) emess(1,"no interval divisor selected"); } /* free up linked list */ |