[Liblas-commits] hg: 4 new changesets

liblas-commits at liblas.org liblas-commits at liblas.org
Tue Aug 24 11:12:58 EDT 2010


changeset fe01cc4855dc in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=fe01cc4855dc
summary: Imported Property Tree from Boost trunk r64982 and updated to maintain it as within libLAS tree for a while.

changeset 43749a540761 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=43749a540761
summary: Reverted Boost 1.38+ as min required version

changeset daab52fb2db2 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=daab52fb2db2
summary: Added roperty_tree files to CMakeLists.txt

changeset bc13be248ea8 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=bc13be248ea8
summary: Modified libLAS core lib to use internal copy of property_tree. Tested using Visual C++ 10.0 with Boost 1.39 (no property_tree available) and 1.42 (includes property_tree). Not compiled or tested apps nor tests.

diffstat:

 CMakeLists.txt                                                                              |     6 +-
 include/liblas/lasheader.hpp                                                                |     4 +-
 include/liblas/laspoint.hpp                                                                 |     5 +-
 include/liblas/lasspatialreference.hpp                                                      |    10 +-
 include/liblas/lasvariablerecord.hpp                                                        |     4 +-
 include/liblas/property_tree/.svn/all-wcprops                                               |    71 +
 include/liblas/property_tree/.svn/entries                                                   |   405 +
 include/liblas/property_tree/.svn/prop-base/exceptions.hpp.svn-base                         |    13 +
 include/liblas/property_tree/.svn/prop-base/id_translator.hpp.svn-base                      |    13 +
 include/liblas/property_tree/.svn/prop-base/info_parser.hpp.svn-base                        |    13 +
 include/liblas/property_tree/.svn/prop-base/ini_parser.hpp.svn-base                         |    13 +
 include/liblas/property_tree/.svn/prop-base/json_parser.hpp.svn-base                        |    13 +
 include/liblas/property_tree/.svn/prop-base/ptree.hpp.svn-base                              |    13 +
 include/liblas/property_tree/.svn/prop-base/ptree_fwd.hpp.svn-base                          |    13 +
 include/liblas/property_tree/.svn/prop-base/ptree_serialization.hpp.svn-base                |    13 +
 include/liblas/property_tree/.svn/prop-base/stream_translator.hpp.svn-base                  |    13 +
 include/liblas/property_tree/.svn/prop-base/string_path.hpp.svn-base                        |    13 +
 include/liblas/property_tree/.svn/prop-base/xml_parser.hpp.svn-base                         |    13 +
 include/liblas/property_tree/.svn/text-base/exceptions.hpp.svn-base                         |    84 +
 include/liblas/property_tree/.svn/text-base/id_translator.hpp.svn-base                      |    51 +
 include/liblas/property_tree/.svn/text-base/info_parser.hpp.svn-base                        |   151 +
 include/liblas/property_tree/.svn/text-base/ini_parser.hpp.svn-base                         |   309 +
 include/liblas/property_tree/.svn/text-base/json_parser.hpp.svn-base                        |   139 +
 include/liblas/property_tree/.svn/text-base/ptree.hpp.svn-base                              |   517 ++
 include/liblas/property_tree/.svn/text-base/ptree_fwd.hpp.svn-base                          |   143 +
 include/liblas/property_tree/.svn/text-base/ptree_serialization.hpp.svn-base                |   102 +
 include/liblas/property_tree/.svn/text-base/stream_translator.hpp.svn-base                  |   221 +
 include/liblas/property_tree/.svn/text-base/string_path.hpp.svn-base                        |   272 +
 include/liblas/property_tree/.svn/text-base/xml_parser.hpp.svn-base                         |   153 +
 include/liblas/property_tree/detail/.svn/all-wcprops                                        |   119 +
 include/liblas/property_tree/detail/.svn/entries                                            |   674 ++
 include/liblas/property_tree/detail/.svn/prop-base/exception_implementation.hpp.svn-base    |    13 +
 include/liblas/property_tree/detail/.svn/prop-base/file_parser_error.hpp.svn-base           |    13 +
 include/liblas/property_tree/detail/.svn/prop-base/info_parser_error.hpp.svn-base           |    13 +
 include/liblas/property_tree/detail/.svn/prop-base/info_parser_read.hpp.svn-base            |    13 +
 include/liblas/property_tree/detail/.svn/prop-base/info_parser_utils.hpp.svn-base           |    13 +
 include/liblas/property_tree/detail/.svn/prop-base/info_parser_write.hpp.svn-base           |    13 +
 include/liblas/property_tree/detail/.svn/prop-base/info_parser_writer_settings.hpp.svn-base |    13 +
 include/liblas/property_tree/detail/.svn/prop-base/json_parser_error.hpp.svn-base           |    13 +
 include/liblas/property_tree/detail/.svn/prop-base/json_parser_read.hpp.svn-base            |    13 +
 include/liblas/property_tree/detail/.svn/prop-base/json_parser_write.hpp.svn-base           |    13 +
 include/liblas/property_tree/detail/.svn/prop-base/ptree_implementation.hpp.svn-base        |    13 +
 include/liblas/property_tree/detail/.svn/prop-base/ptree_utils.hpp.svn-base                 |    13 +
 include/liblas/property_tree/detail/.svn/prop-base/rapidxml.hpp.svn-base                    |    13 +
 include/liblas/property_tree/detail/.svn/prop-base/xml_parser_error.hpp.svn-base            |    13 +
 include/liblas/property_tree/detail/.svn/prop-base/xml_parser_flags.hpp.svn-base            |    13 +
 include/liblas/property_tree/detail/.svn/prop-base/xml_parser_read_rapidxml.hpp.svn-base    |    13 +
 include/liblas/property_tree/detail/.svn/prop-base/xml_parser_utils.hpp.svn-base            |    13 +
 include/liblas/property_tree/detail/.svn/prop-base/xml_parser_write.hpp.svn-base            |    13 +
 include/liblas/property_tree/detail/.svn/prop-base/xml_parser_writer_settings.hpp.svn-base  |    13 +
 include/liblas/property_tree/detail/.svn/text-base/exception_implementation.hpp.svn-base    |    83 +
 include/liblas/property_tree/detail/.svn/text-base/file_parser_error.hpp.svn-base           |    88 +
 include/liblas/property_tree/detail/.svn/text-base/info_parser_error.hpp.svn-base           |    32 +
 include/liblas/property_tree/detail/.svn/text-base/info_parser_read.hpp.svn-base            |   380 +
 include/liblas/property_tree/detail/.svn/text-base/info_parser_utils.hpp.svn-base           |    32 +
 include/liblas/property_tree/detail/.svn/text-base/info_parser_write.hpp.svn-base           |   147 +
 include/liblas/property_tree/detail/.svn/text-base/info_parser_writer_settings.hpp.svn-base |    40 +
 include/liblas/property_tree/detail/.svn/text-base/json_parser_error.hpp.svn-base           |    33 +
 include/liblas/property_tree/detail/.svn/text-base/json_parser_read.hpp.svn-base            |   328 +
 include/liblas/property_tree/detail/.svn/text-base/json_parser_write.hpp.svn-base           |   170 +
 include/liblas/property_tree/detail/.svn/text-base/ptree_implementation.hpp.svn-base        |   904 +++
 include/liblas/property_tree/detail/.svn/text-base/ptree_utils.hpp.svn-base                 |   106 +
 include/liblas/property_tree/detail/.svn/text-base/rapidxml.hpp.svn-base                    |  2571 ++++++++++
 include/liblas/property_tree/detail/.svn/text-base/xml_parser_error.hpp.svn-base            |    33 +
 include/liblas/property_tree/detail/.svn/text-base/xml_parser_flags.hpp.svn-base            |    31 +
 include/liblas/property_tree/detail/.svn/text-base/xml_parser_read_rapidxml.hpp.svn-base    |   144 +
 include/liblas/property_tree/detail/.svn/text-base/xml_parser_utils.hpp.svn-base            |   136 +
 include/liblas/property_tree/detail/.svn/text-base/xml_parser_write.hpp.svn-base            |   194 +
 include/liblas/property_tree/detail/.svn/text-base/xml_parser_writer_settings.hpp.svn-base  |    62 +
 include/liblas/property_tree/detail/exception_implementation.hpp                            |    83 +
 include/liblas/property_tree/detail/file_parser_error.hpp                                   |    88 +
 include/liblas/property_tree/detail/info_parser_error.hpp                                   |    32 +
 include/liblas/property_tree/detail/info_parser_read.hpp                                    |   380 +
 include/liblas/property_tree/detail/info_parser_utils.hpp                                   |    32 +
 include/liblas/property_tree/detail/info_parser_write.hpp                                   |   147 +
 include/liblas/property_tree/detail/info_parser_writer_settings.hpp                         |    40 +
 include/liblas/property_tree/detail/json_parser_error.hpp                                   |    33 +
 include/liblas/property_tree/detail/json_parser_read.hpp                                    |   328 +
 include/liblas/property_tree/detail/json_parser_write.hpp                                   |   170 +
 include/liblas/property_tree/detail/ptree_implementation.hpp                                |   907 +++
 include/liblas/property_tree/detail/ptree_utils.hpp                                         |   106 +
 include/liblas/property_tree/detail/rapidxml.hpp                                            |  2571 ++++++++++
 include/liblas/property_tree/detail/xml_parser_error.hpp                                    |    33 +
 include/liblas/property_tree/detail/xml_parser_flags.hpp                                    |    31 +
 include/liblas/property_tree/detail/xml_parser_read_rapidxml.hpp                            |   144 +
 include/liblas/property_tree/detail/xml_parser_utils.hpp                                    |   136 +
 include/liblas/property_tree/detail/xml_parser_write.hpp                                    |   194 +
 include/liblas/property_tree/detail/xml_parser_writer_settings.hpp                          |    62 +
 include/liblas/property_tree/exceptions.hpp                                                 |    84 +
 include/liblas/property_tree/id_translator.hpp                                              |    51 +
 include/liblas/property_tree/info_parser.hpp                                                |   151 +
 include/liblas/property_tree/ini_parser.hpp                                                 |   309 +
 include/liblas/property_tree/json_parser.hpp                                                |   139 +
 include/liblas/property_tree/ptree.hpp                                                      |   517 ++
 include/liblas/property_tree/ptree_fwd.hpp                                                  |   143 +
 include/liblas/property_tree/ptree_serialization.hpp                                        |   102 +
 include/liblas/property_tree/stream_translator.hpp                                          |   221 +
 include/liblas/property_tree/string_path.hpp                                                |   275 +
 include/liblas/property_tree/xml_parser.hpp                                                 |   153 +
 src/CMakeLists.txt                                                                          |    39 +-
 src/lasheader.cpp                                                                           |    12 +-
 src/laspoint.cpp                                                                            |     8 +-
 src/lasspatialreference.cpp                                                                 |     4 +-
 src/lasvariablerecord.cpp                                                                   |     4 +-
 104 files changed, 17041 insertions(+), 32 deletions(-)

diffs (truncated from 17661 to 300 lines):

diff -r bb542d024937 -r bc13be248ea8 CMakeLists.txt
--- a/CMakeLists.txt	Tue Aug 24 09:45:20 2010 -0500
+++ b/CMakeLists.txt	Tue Aug 24 16:12:37 2010 +0100
@@ -114,8 +114,8 @@
 # Search for dependencies
 
 # Boost C++ Libraries support - required
-message(STATUS "Searching for Boost 1.41+ - done")
-find_package(Boost 1.41 COMPONENTS program_options REQUIRED)
+message(STATUS "Searching for Boost 1.38+ - done")
+find_package(Boost 1.38 COMPONENTS program_options REQUIRED)
 
 if(Boost_FOUND AND Boost_PROGRAM_OPTIONS_FOUND)
   include_directories(${Boost_INCLUDE_DIRS})
@@ -325,4 +325,4 @@
 include(CPack)
 
 
-add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
\ No newline at end of file
+add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
diff -r bb542d024937 -r bc13be248ea8 include/liblas/lasheader.hpp
--- a/include/liblas/lasheader.hpp	Tue Aug 24 09:45:20 2010 -0500
+++ b/include/liblas/lasheader.hpp	Tue Aug 24 16:12:37 2010 +0100
@@ -50,9 +50,9 @@
 #include <liblas/lasspatialreference.hpp>
 #include <liblas/lasvariablerecord.hpp>
 #include <liblas/lasversion.hpp>
+#include <liblas/property_tree/ptree.hpp>
 // boost
 #include <boost/cstdint.hpp>
-#include <boost/property_tree/ptree.hpp>
 #include <boost/foreach.hpp>
 
 //std
@@ -332,7 +332,7 @@
     const Bounds<double>& GetExtent() const;
     void SetExtent(Bounds<double> const& extent);
 
-    boost::property_tree::ptree GetPTree() const;
+    liblas::property_tree::ptree GetPTree() const;
 
 private:
     
diff -r bb542d024937 -r bc13be248ea8 include/liblas/laspoint.hpp
--- a/include/liblas/laspoint.hpp	Tue Aug 24 09:45:20 2010 -0500
+++ b/include/liblas/laspoint.hpp	Tue Aug 24 16:12:37 2010 +0100
@@ -46,12 +46,11 @@
 #include <liblas/lascolor.hpp>
 #include <liblas/detail/pointrecord.hpp>
 #include <liblas/detail/fwd.hpp>
+#include <liblas/property_tree/ptree.hpp>
 // boost
 #include <boost/array.hpp>
 #include <boost/cstdint.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/property_tree/ptree.hpp>
-
 // std
 #include <stdexcept> // std::out_of_range
 #include <cstdlib> // std::size_t
@@ -196,7 +195,7 @@
     void SetHeader(HeaderPtr header);
     HeaderPtr GetHeaderPtr() const;
     
-    boost::property_tree::ptree GetPTree() const;
+    property_tree::ptree GetPTree() const;
 
 private:
 
diff -r bb542d024937 -r bc13be248ea8 include/liblas/lasspatialreference.hpp
--- a/include/liblas/lasspatialreference.hpp	Tue Aug 24 09:45:20 2010 -0500
+++ b/include/liblas/lasspatialreference.hpp	Tue Aug 24 16:12:37 2010 +0100
@@ -44,11 +44,10 @@
 
 #include <liblas/detail/fwd.hpp>
 #include <liblas/detail/utility.hpp>
-
 #include <liblas/lasvariablerecord.hpp>
-
 #include <liblas/exception.hpp>
 #include <liblas/capi/las_config.h>
+#include <liblas/property_tree/ptree.hpp>
 
 // GDAL OSR
 #ifdef HAVE_GDAL
@@ -74,11 +73,6 @@
 #include <geovalues.h>
 #endif // HAVE_LIBGEOTIFF
 
-
-// boost
-#include <boost/property_tree/ptree.hpp>
-
-
 // std
 #include <stdexcept> // std::out_of_range
 #include <cstdlib> // std::size_t
@@ -190,7 +184,7 @@
     /// Return a copy of the LASVLRs that SpatialReference maintains
     std::vector<VariableRecord> GetVLRs() const;
 
-    boost::property_tree::ptree GetPTree() const;    
+    liblas::property_tree::ptree GetPTree() const;    
 private:
 
     // FIXME: Define as shared_ptr<GTIF> with custom deleter to get rid of bloated mem management, unsafe anyway --mloskot
diff -r bb542d024937 -r bc13be248ea8 include/liblas/lasvariablerecord.hpp
--- a/include/liblas/lasvariablerecord.hpp	Tue Aug 24 09:45:20 2010 -0500
+++ b/include/liblas/lasvariablerecord.hpp	Tue Aug 24 16:12:37 2010 +0100
@@ -44,10 +44,10 @@
 #define LIBLAS_LASVARIABLERECORD_HPP_INCLUDED
 
 #include <liblas/detail/utility.hpp>
+#include <liblas/property_tree/ptree.hpp>
 // boost
 #include <boost/array.hpp>
 #include <boost/cstdint.hpp>
-#include <boost/property_tree/ptree.hpp>
 // std
 #include <string>
 #include <vector>
@@ -123,7 +123,7 @@
     /// Get the total size of the VLR in bytes
     std::size_t GetTotalSize() const;
     
-    boost::property_tree::ptree GetPTree() const;    
+    liblas::property_tree::ptree GetPTree() const;    
 
 private:
 
diff -r bb542d024937 -r bc13be248ea8 include/liblas/property_tree/.svn/all-wcprops
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/include/liblas/property_tree/.svn/all-wcprops	Tue Aug 24 16:12:37 2010 +0100
@@ -0,0 +1,71 @@
+K 25
+svn:wc:ra_dav:version-url
+V 51
+/svn/boost/!svn/ver/63428/trunk/boost/property_tree
+END
+ini_parser.hpp
+K 25
+svn:wc:ra_dav:version-url
+V 66
+/svn/boost/!svn/ver/56121/trunk/boost/property_tree/ini_parser.hpp
+END
+ptree_serialization.hpp
+K 25
+svn:wc:ra_dav:version-url
+V 75
+/svn/boost/!svn/ver/55966/trunk/boost/property_tree/ptree_serialization.hpp
+END
+xml_parser.hpp
+K 25
+svn:wc:ra_dav:version-url
+V 66
+/svn/boost/!svn/ver/56000/trunk/boost/property_tree/xml_parser.hpp
+END
+ptree.hpp
+K 25
+svn:wc:ra_dav:version-url
+V 61
+/svn/boost/!svn/ver/55966/trunk/boost/property_tree/ptree.hpp
+END
+ptree_fwd.hpp
+K 25
+svn:wc:ra_dav:version-url
+V 65
+/svn/boost/!svn/ver/61604/trunk/boost/property_tree/ptree_fwd.hpp
+END
+exceptions.hpp
+K 25
+svn:wc:ra_dav:version-url
+V 66
+/svn/boost/!svn/ver/55966/trunk/boost/property_tree/exceptions.hpp
+END
+string_path.hpp
+K 25
+svn:wc:ra_dav:version-url
+V 67
+/svn/boost/!svn/ver/61604/trunk/boost/property_tree/string_path.hpp
+END
+stream_translator.hpp
+K 25
+svn:wc:ra_dav:version-url
+V 73
+/svn/boost/!svn/ver/56092/trunk/boost/property_tree/stream_translator.hpp
+END
+json_parser.hpp
+K 25
+svn:wc:ra_dav:version-url
+V 67
+/svn/boost/!svn/ver/59739/trunk/boost/property_tree/json_parser.hpp
+END
+id_translator.hpp
+K 25
+svn:wc:ra_dav:version-url
+V 69
+/svn/boost/!svn/ver/55966/trunk/boost/property_tree/id_translator.hpp
+END
+info_parser.hpp
+K 25
+svn:wc:ra_dav:version-url
+V 67
+/svn/boost/!svn/ver/55966/trunk/boost/property_tree/info_parser.hpp
+END
diff -r bb542d024937 -r bc13be248ea8 include/liblas/property_tree/.svn/entries
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/include/liblas/property_tree/.svn/entries	Tue Aug 24 16:12:37 2010 +0100
@@ -0,0 +1,405 @@
+10
+
+dir
+64982
+http://svn.boost.org/svn/boost/trunk/boost/property_tree
+http://svn.boost.org/svn/boost
+
+
+
+2010-06-29T13:59:30.440854Z
+63428
+cornedbee
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+b8fc166d-592f-0410-95f2-cb63ce0dd405
+
+ini_parser.hpp
+file
+
+
+
+
+2009-09-23T14:27:24.952556Z
+93a03eedded67c6784ef8d8492396160
+2009-09-09T12:08:33.739368Z
+56121
+cornedbee
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+12296
+
+detail
+dir
+
+ptree_serialization.hpp
+file
+
+
+
+
+2009-09-23T14:27:24.969558Z
+84edbd6e21ef26dac80a242c91f28ab2
+2009-09-01T21:27:45.485076Z
+55966
+cornedbee
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+


More information about the Liblas-commits mailing list