Fix same expression warnings (#1952)

* plugins/matlab/filters/Script.cpp: mxDOUBLE_CLASS and mxINT32_CLASS are compared twice * Vlr::matches(): compare userId to m_userId instead of self
PDAL · Apr 21, 2018 · 2bfe763 · 2bfe763
1 parent e7ed147
commit 2bfe763
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/plugins/matlab/filters/Script.cpp b/plugins/matlab/filters/Script.cpp
@@ -125,8 +125,6 @@ PointLayoutPtr Script::getStructLayout(mxArray* array, LogPtr log)
             mt == mxINT16_CLASS  ||
             mt == mxUINT16_CLASS ||
             mt == mxINT32_CLASS  ||
-            mt == mxDOUBLE_CLASS ||
-            mt == mxINT32_CLASS  ||
             mt == mxUINT32_CLASS ||
             mt == mxINT64_CLASS  ||
             mt == mxUINT64_CLASS )

diff --git a/tools/lasdump/Vlr.hpp b/tools/lasdump/Vlr.hpp
@@ -47,7 +47,7 @@ class Vlr
 {
 public:
     bool matches(std::string userId, uint16_t recordId)
-        { return userId == userId && recordId == m_recordId; }
+        { return userId == m_userId && recordId == m_recordId; }
     const char *data() const
         { return (const char *)m_data.data(); }
     uint64_t dataLen() const