aboutsummaryrefslogtreecommitdiff
path: root/src/iso19111/io.cpp
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2019-03-17 19:16:04 +0100
committerEven Rouault <even.rouault@spatialys.com>2019-03-17 19:16:04 +0100
commite1350cac43d5a9854207af3fb318a74be7fcd12f (patch)
treea8b2326828e61038a4bbb55835099b0ad55ce96e /src/iso19111/io.cpp
parent8cf492acb3840eff5064a2da421c143e1fd1646c (diff)
downloadPROJ-e1350cac43d5a9854207af3fb318a74be7fcd12f.tar.gz
PROJ-e1350cac43d5a9854207af3fb318a74be7fcd12f.zip
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.
Diffstat (limited to 'src/iso19111/io.cpp')
-rw-r--r--src/iso19111/io.cpp8
1 files changed, 4 insertions, 4 deletions
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)