diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2019-03-18 13:26:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-18 13:26:22 +0100 |
| commit | 4b99c3b47e76afdeda2425e39ff53fed0f12b679 (patch) | |
| tree | 6d5e8e549d004eac930ac37f09b85e103a1c3720 /src/iso19111 | |
| parent | 06d7f93ad3a862abca8a404de05fd655a8bc797c (diff) | |
| parent | e1350cac43d5a9854207af3fb318a74be7fcd12f (diff) | |
| download | PROJ-4b99c3b47e76afdeda2425e39ff53fed0f12b679.tar.gz PROJ-4b99c3b47e76afdeda2425e39ff53fed0f12b679.zip | |
Merge pull request #1328 from rouault/cppcheck_fixes
Fix some issues raised by latest cppcheck
Diffstat (limited to 'src/iso19111')
| -rw-r--r-- | src/iso19111/crs.cpp | 1 | ||||
| -rw-r--r-- | src/iso19111/datum.cpp | 4 | ||||
| -rw-r--r-- | src/iso19111/io.cpp | 8 |
3 files changed, 6 insertions, 7 deletions
diff --git a/src/iso19111/crs.cpp b/src/iso19111/crs.cpp index 4293c087..9688883d 100644 --- a/src/iso19111/crs.cpp +++ b/src/iso19111/crs.cpp @@ -2096,7 +2096,6 @@ void VerticalCRS::addLinearUnitConvert( auto &axisList = coordinateSystem()->axisList(); if (!axisList.empty()) { - auto projUnit = axisList[0]->unit().exportToPROJString(); if (axisList[0]->unit().conversionToSI() != 1.0) { formatter->addStep("unitconvert"); formatter->addParam("z_in", "m"); diff --git a/src/iso19111/datum.cpp b/src/iso19111/datum.cpp index 5f7e4775..bf3092c1 100644 --- a/src/iso19111/datum.cpp +++ b/src/iso19111/datum.cpp @@ -783,7 +783,7 @@ bool Ellipsoid::lookForProjWellKnownEllps(std::string &projEllpsName, if (::fabs(b - b_iter) < 1e-10 * b_iter) { projEllpsName = proj_ellps[i].id; ellpsName = proj_ellps[i].name; - if (ellpsName.find("GRS 1980") == 0) { + if (starts_with(ellpsName, "GRS 1980")) { ellpsName = "GRS 1980"; } return true; @@ -794,7 +794,7 @@ bool Ellipsoid::lookForProjWellKnownEllps(std::string &projEllpsName, if (::fabs(rf - rf_iter) < 1e-10 * rf_iter) { projEllpsName = proj_ellps[i].id; ellpsName = proj_ellps[i].name; - if (ellpsName.find("GRS 1980") == 0) { + if (starts_with(ellpsName, "GRS 1980")) { ellpsName = "GRS 1980"; } return true; diff --git a/src/iso19111/io.cpp b/src/iso19111/io.cpp index d5f38fd5..7c2eb625 100644 --- a/src/iso19111/io.cpp +++ b/src/iso19111/io.cpp @@ -1186,7 +1186,7 @@ struct WKTParser::Private { buildPrimeMeridian(const WKTNodeNNPtr &node, const UnitOfMeasure &defaultAngularUnit); - optional<std::string> getAnchor(const WKTNodeNNPtr &node); + static optional<std::string> getAnchor(const WKTNodeNNPtr &node); static void parseDynamic(const WKTNodeNNPtr &dynamicNode, double &frameReferenceEpoch, @@ -6545,9 +6545,9 @@ PROJStringParser::Private::processAxisSwap(Step &step, ? AxisDirection::NORTH : (axisType == AxisType::NORTH_POLE) ? AxisDirection::SOUTH - : (axisType == AxisType::SOUTH_POLE) - ? AxisDirection::NORTH - : AxisDirection::NORTH; + /*: (axisType == AxisType::SOUTH_POLE) + ? AxisDirection::NORTH*/ + : AxisDirection::NORTH; CoordinateSystemAxisNNPtr north = createAxis( northName, northAbbev, northDir, unit, (!isGeographic && axisType == AxisType::NORTH_POLE) |