cmake/unix_compiler_options.cmake

@@ -24,7 +24,6 @@ function(pdal_target_compile_settings target)
         ${PDAL_CXX_STANDARD}
         -Wall
         -Wextra
-        -Wpedantic
         -Wpointer-arith
         -Wcast-align
         -Wcast-qual

debian/changelog

+pdal (1.7.2~rc3-1~exp1) experimental; urgency=medium
+
+  * New upstream release candidate.
+  * Update symbols for other architectures.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Fri, 11 May 2018 21:48:42 +0200
+
 pdal (1.7.2~rc2-1~exp1) experimental; urgency=medium
 
   * New upstream release candidate.

debian/libpdal-util6.symbols

-# SymbolsHelper-Confirmed: 1.7.2~rc1 amd64 arm64 ppc64 s390x sparc64
+# SymbolsHelper-Confirmed: 1.7.2~rc3 amd64
 libpdal_util.so.6 #PACKAGE# #MINVER#
  _ZN4pdal12georeference17georeferenceWgs84EddRKNS0_14RotationMatrixES3_RKNS0_3XyzE@Base 1.1.0
  _ZN4pdal5BOX2D23getDefaultSpatialExtentEv@Base 1.1.0
@@ -92,11 +92,9 @@ libpdal_util.so.6 #PACKAGE# #MINVER#
  (arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !x32)_ZN9pdalboost10filesystem16filesystem_errorC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEENS_6system10error_codeE@Base 1.2.0
  _ZN9pdalboost10filesystem16filesystem_errorC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS0_4pathENS_6system10error_codeE@Base 1.2.0
  _ZN9pdalboost10filesystem16filesystem_errorC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS0_4pathESC_NS_6system10error_codeE@Base 1.2.0
- (arch=!amd64)_ZN9pdalboost10filesystem16filesystem_errorC1ERKS1_@Base 1.7.2~rc1
  (arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !x32)_ZN9pdalboost10filesystem16filesystem_errorC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEENS_6system10error_codeE@Base 1.2.0
  _ZN9pdalboost10filesystem16filesystem_errorC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS0_4pathENS_6system10error_codeE@Base 1.2.0
  _ZN9pdalboost10filesystem16filesystem_errorC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS0_4pathESC_NS_6system10error_codeE@Base 1.2.0
- (arch=!amd64)_ZN9pdalboost10filesystem16filesystem_errorC2ERKS1_@Base 1.7.2~rc1
  _ZN9pdalboost10filesystem16filesystem_errorD0Ev@Base 1.2.0
  _ZN9pdalboost10filesystem16filesystem_errorD1Ev@Base 1.2.0
  _ZN9pdalboost10filesystem16filesystem_errorD2Ev@Base 1.2.0
@@ -179,8 +177,6 @@ libpdal_util.so.6 #PACKAGE# #MINVER#
  _ZN9pdalboost6detail17sp_counted_impl_pINS_10filesystem6detail11dir_itr_impEED0Ev@Base 1.2.0
  _ZN9pdalboost6detail17sp_counted_impl_pINS_10filesystem6detail11dir_itr_impEED1Ev@Base 1.2.0
  _ZN9pdalboost6detail17sp_counted_impl_pINS_10filesystem6detail11dir_itr_impEED2Ev@Base 1.2.0
- (arch=amd64 armel hurd-i386 i386)_ZN9pdalboost6system12system_errorC1ERKS1_@Base 1.7.1
- (arch=amd64 armel hurd-i386 i386)_ZN9pdalboost6system12system_errorC2ERKS1_@Base 1.7.1
  _ZN9pdalboost6system12system_errorD0Ev@Base 1.2.0
  _ZN9pdalboost6system12system_errorD1Ev@Base 1.2.0
  _ZN9pdalboost6system12system_errorD2Ev@Base 1.2.0

filters/AssignFilter.cpp

@@ -95,7 +95,7 @@ std::istream& operator>>(std::istream& in, AssignRange& r)
     {
         r.parse(s);
     }
-    catch (DimRange::error)
+    catch (DimRange::error&)
     {
         in.setstate(std::ios_base::failbit);
     }

io/LasHeader.cpp

@@ -218,7 +218,7 @@ void LasHeader::setSrs()
         else
             setSrsFromGeotiff();
     }
-    catch (Geotiff::error err)
+    catch (Geotiff::error& err)
     {
         m_log->get(LogLevel::Error) << "Could not create an SRS: " <<
             err.what() << std::endl;

io/PlyReader.cpp

@@ -172,7 +172,7 @@ Dimension::Type PlyReader::getType(const std::string& name)
     {
         return types.at(name);
     }
-    catch (std::out_of_range)
+    catch (std::out_of_range&)
     {}
     return Dimension::Type::None;
 }

io/PlyWriter.cpp

@@ -109,7 +109,7 @@ std::string PlyWriter::getType(Dimension::Type type) const
     {
         return types.at(type);
     }
-    catch (std::out_of_range)
+    catch (std::out_of_range&)
     {
         throwError("Can't write dimension of type '" +
                 Dimension::interpretationName(type) + "'.");

kernels/TIndexKernel.cpp

@@ -393,7 +393,7 @@ void TIndexKernel::mergeFile()
         options.add("offset_z", "auto");
         writer.addOptions(options);
     }
-    catch (std::bad_cast)
+    catch (std::bad_cast&)
     {}
 
     PointTable table;
@@ -457,7 +457,7 @@ bool TIndexKernel::createFeature(const FieldIndexes& indexes,
         {
             err = OSRExportToProj4(srcSrs.get(), &pszProj4);
         }
-        catch (pdal_error)
+        catch (pdal_error&)
         {}
         if (err != OGRERR_NONE)
         {

pdal/Kernel.cpp

@@ -264,7 +264,7 @@ int Kernel::innerRun(ProgramArgs& args)
         // do any user-level sanity checking
         validateSwitches(args);
     }
-    catch (pdal_error e)
+    catch (pdal_error& e)
     {
         Utils::printError(e.what());
         outputHelp(args);

pdal/Metadata.cpp

@@ -56,7 +56,7 @@ std::string Metadata::inferType(const std::string& val)
         pos = 0;
         l = std::stol(val, &pos);
     }
-    catch (std::invalid_argument)
+    catch (std::invalid_argument&)
     {}
     if (pos == val.length())
         return (l < 0 ? "nonNegativeInteger" : "integer");
@@ -66,7 +66,7 @@ std::string Metadata::inferType(const std::string& val)
         pos = 0;
         std::stod(val, &pos);
     }
-    catch(std::invalid_argument)
+    catch(std::invalid_argument&)
     {}
 
     if (pos == val.length())

pdal/Metadata.hpp

@@ -349,6 +349,34 @@ inline void MetadataNodeImpl::setValue(const Uuid& u)
     m_value = u.toString();
 }
 
+namespace MetadataDetail
+{
+
+class value_error
+{};
+
+template<typename T>
+T value(const std::string& type, const std::string& value)
+{
+    T t{};
+
+    if (type == "base64Binary")
+    {
+        std::vector<uint8_t> encVal = Utils::base64_decode(value);
+        encVal.resize(sizeof(T));
+        memcpy(&t, encVal.data(), sizeof(T));
+    }
+    else if (!Utils::fromString(value, t))
+        throw value_error();
+    return t;
+}
+
+template<>
+inline std::string value(const std::string&, const std::string& value)
+{ return value; }
+
+} // namespace MetadataDetail
+
 
 class PDAL_DLL MetadataNode
 {
@@ -483,30 +511,25 @@ public:
     {
         T t{};
 
-        if (m_impl->m_type == "base64Binary")
+        try
         {
-            std::vector<uint8_t> encVal =
-                Utils::base64_decode(m_impl->m_value);
-            encVal.resize(sizeof(T));
-            memcpy(&t, encVal.data(), sizeof(T));
+            t = MetadataDetail::value<T>(m_impl->m_type, m_impl->m_value);
         }
-        else
-        {
-            if (!Utils::fromString(m_impl->m_value, t))
+        catch (MetadataDetail::value_error&)
         {
-                // Static to get default initialization.
-                static T t2;
+            // Reset in case the fromString conversion messed it up.
+            t = T();
             std::cerr << "Error converting metadata [" << name() <<
                 "] = " << m_impl->m_value << " to type " <<
                 Utils::typeidName<T>() << " -- return default initialized.";
-                t = t2;
-            }
         }
         return t;
     }
 
     std::string value() const
-        { return m_impl->m_value; }
+    {
+        return value<std::string>();
+    }
 
     std::string jsonValue() const
     {
@@ -712,7 +735,6 @@ private:
 };
 typedef std::shared_ptr<Metadata> MetadataPtr;
 
-
 } // namespace pdal
 
 

pdal/PDALUtils.cpp

@@ -272,7 +272,7 @@ std::ostream *createFile(const std::string& path, bool asBinary)
             ofs = new ArbiterOutStream(tempFilename(path), path,
                 asBinary ? ios::out | ios::binary : ios::out);
         }
-        catch (arbiter::ArbiterError)
+        catch (arbiter::ArbiterError&)
         {}
         if (ofs && !ofs->good())
         {
@@ -305,7 +305,7 @@ std::istream *openFile(const std::string& path, bool asBinary)
             return new ArbiterInStream(tempFilename(path), path,
                 asBinary ? ios::in | ios::binary : ios::in);
         }
-        catch (arbiter::ArbiterError)
+        catch (arbiter::ArbiterError&)
         {
             return nullptr;
         }

pdal/gitsha.cpp

 #include <pdal/gitsha.h>
-#define GIT_SHA1 "f35d65e9b345d8017477225af3b964a28fa8f303"
+#define GIT_SHA1 "22c70bed3d553cc23548fe25a61d242f60e5b59a"
 const char g_GIT_SHA1[] = GIT_SHA1;

pdal/pdal_types.hpp

@@ -182,7 +182,7 @@ inline std::istream& operator>>(std::istream& in, LogLevel& level)
         if (val >= 0 && val < (int)logNames.size())
             level = (LogLevel)val;
     }
-    catch (std::exception)
+    catch (std::exception&)
     {
         sval = Utils::tolower(sval);
         for (size_t i = 0; i < logNames.size(); ++i)

pdal/util/FileUtils.cpp

@@ -154,7 +154,7 @@ std::vector<std::string> directoryList(const std::string& dir)
             it++;
         }
     }
-    catch (pdalboost::filesystem::filesystem_error)
+    catch (pdalboost::filesystem::filesystem_error&)
     {
         files.clear();
     }
@@ -213,7 +213,7 @@ bool fileExists(const std::string& name)
     {
         return pdalboost::filesystem::exists(name);
     }
-    catch (pdalboost::filesystem::filesystem_error)
+    catch (pdalboost::filesystem::filesystem_error&)
     {
     }
     return false;

pdal/util/Utils.hpp

@@ -941,7 +941,7 @@ namespace Utils
                 return true;
             }
         }
-        catch (std::invalid_argument) // Character that isn't a number?
+        catch (std::invalid_argument&) // Character that isn't a number?
         {
             if (s.length() == 1)
             {
@@ -973,7 +973,7 @@ namespace Utils
                 return true;
             }
         }
-        catch (std::invalid_argument) // Character that isn't a number?
+        catch (std::invalid_argument&) // Character that isn't a number?
         {
             if (s.length() == 1)
             {
@@ -1005,7 +1005,7 @@ namespace Utils
                 return true;
             }
         }
-        catch (std::invalid_argument) // Character that isn't a number?
+        catch (std::invalid_argument&) // Character that isn't a number?
         {
             if (s.length() == 1)
             {

vendor/arbiter/arbiter.cpp

@@ -2032,7 +2032,7 @@ std::vector<std::string> S3::glob(std::string path, bool verbose) const
         {
             xml.parse<0>(data.data());
         }
-        catch (Xml::parse_error)
+        catch (Xml::parse_error&)
         {
             throw ArbiterError("Could not parse S3 response.");
         }

vendor/kazhdan/Array.h

@@ -96,7 +96,11 @@ template< class C > ConstArray< C > GetPointer( const C* c , int sz ) { return C
 #define      DeletePointer( ... ) { if( __VA_ARGS__ )      delete[] __VA_ARGS__ ,                     __VA_ARGS__ = NULL; }
 
 template< class C > C*          NewPointer(        size_t size ,                    const char* name=NULL ){ return new C[size]; }
-template< class C > C*        AllocPointer(        size_t size ,                    const char* name=NULL ){ return (C*)        malloc(        sizeof(C) * size             ); }
+template< class C >
+C* AllocPointer(size_t size, const char* name = NULL)
+{
+    return (C*) calloc(size, sizeof(C));
+}
 template< class C > C* AlignedAllocPointer(        size_t size , size_t alignment , const char* name=NULL ){ return (C*)aligned_malloc(        sizeof(C) * size , alignment ); }
 template< class C > C*      ReAllocPointer( C* c , size_t size ,                    const char* name=NULL ){ return (C*)       realloc( c    , sizeof(C) * size             ); }
 

vendor/kazhdan/MultiGridOctreeData.System.inl

@@ -1910,7 +1910,6 @@ void Octree< Real >::_addFEMConstraints( const FEMConstraintFunctor& F , const C
 	delete __constraints;
 
 	DenseNodeData< D > _coefficients( _sNodesEnd(maxDepth-1) );
-	memset( &_coefficients[0] , 0 , sizeof(D) * _sNodesEnd(maxDepth-1) );
 	for( LocalDepth d=maxDepth-1 ; d>=0 ; d-- )
 	{
 #pragma omp parallel for num_threads( threads )