From e1350cac43d5a9854207af3fb318a74be7fcd12f Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 17 Mar 2019 19:16:04 +0100
Subject: Fix some issues raised by latest cppcheck

- coordinateoperation_internal.hpp: missing 'explicit' keyword
- proj.cpp: unused 'generic' member in enumeration
- init.cpp: useless assignment to a_orig and es_orig, because done again a
            few lines below.
- crs.cpp: unused variable
- datum.cpp: inefficient use of find() function
- io.cpp:
  * missing 'static' qualifier for method
  * useles ternary test (left and right have same value)
- aeqd.cpp: useless assignment of inv and fwd, snice done again a few lines
            below
- isea.cpp: useless assignment of resolution and aperture since done again a
            few lines below, and with default values when params are absent
- mod_ster.cpp: useless assignment of lp.lam, overriden in below code paths.
- stere.cpp: false positive, but better not modify another variable than the
             iterator in a for() loop.
---
 src/iso19111/crs.cpp   | 1 -
 src/iso19111/datum.cpp | 4 ++--
 src/iso19111/io.cpp    | 8 ++++----
 3 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'src/iso19111')

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)
-- 
cgit v1.2.3