diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2019-10-28 09:03:10 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2019-10-28 09:03:10 +0100 |
| commit | 4330f9fa4391b4d39c52c972c75327ed2ba6ce33 (patch) | |
| tree | d2718cc258d02faee018c96602f84c814cba5fce /src/transformations | |
| parent | e2d5b13f3442a8e88093a9d68e1be550194a4d77 (diff) | |
| download | PROJ-4330f9fa4391b4d39c52c972c75327ed2ba6ce33.tar.gz PROJ-4330f9fa4391b4d39c52c972c75327ed2ba6ce33.zip | |
Various fixes/workarounds to make cppcheck 1.72 (Ubuntu 16.04) and HEAD/1.90dev happy (fixes #1648)
Diffstat (limited to 'src/transformations')
| -rw-r--r-- | src/transformations/deformation.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/transformations/deformation.cpp b/src/transformations/deformation.cpp index b9e881eb..f1311a54 100644 --- a/src/transformations/deformation.cpp +++ b/src/transformations/deformation.cpp @@ -71,7 +71,7 @@ struct pj_opaque { } // anonymous namespace /********************************************************************************/ -static PJ_XYZ get_grid_shift(PJ* P, PJ_XYZ cartesian) { +static PJ_XYZ get_grid_shift(PJ* P, const PJ_XYZ& cartesian) { /******************************************************************************** Read correction values from grid. The cartesian input coordinates are converted to geodetic coordinates in order look up the correction values @@ -95,7 +95,7 @@ static PJ_XYZ get_grid_shift(PJ* P, PJ_XYZ cartesian) { if (proj_errno(P) == PJD_ERR_GRID_AREA) proj_log_debug(P, "deformation: coordinate (%.3f, %.3f) outside deformation model", - proj_todeg(geodetic.lp.lam), proj_todeg(geodetic.lp.phi)); + proj_todeg(geodetic.lpz.lam), proj_todeg(geodetic.lpz.phi)); /* grid values are stored as mm/yr, we need m/yr */ shift.xyz.x /= 1000; @@ -103,10 +103,10 @@ static PJ_XYZ get_grid_shift(PJ* P, PJ_XYZ cartesian) { shift.xyz.z /= 1000; /* pre-calc cosines and sines */ - sp = sin(geodetic.lp.phi); - cp = cos(geodetic.lp.phi); - sl = sin(geodetic.lp.lam); - cl = cos(geodetic.lp.lam); + sp = sin(geodetic.lpz.phi); + cp = cos(geodetic.lpz.phi); + sl = sin(geodetic.lpz.lam); + cl = cos(geodetic.lpz.lam); /* ENU -> PJ_XYZ */ temp.xyz.x = -sp*cl*shift.enu.n - sl*shift.enu.e + cp*cl*shift.enu.u; |