[Liblas-commits] hg: 3 new changesets

[liblas-commits at liblas.org]

changeset 4be01e8ceed8 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=4be01e8ceed8
summary: add back --stdout switch to las2txt

changeset 36ecd77a3a32 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=36ecd77a3a32
summary: remove typo

changeset 4886121d806e in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=4886121d806e
summary: whitespace normalization

diffstat:

 apps/las2txt.cpp                              |  15 ++++++++++++---
 include/liblas/detail/reader/cachedreader.hpp |   3 +--
 include/liblas/detail/reader/header.hpp       |   1 -
 schemas/las.xml                               |   2 +-
 4 files changed, 14 insertions(+), 7 deletions(-)

diffs (79 lines):

diff -r 249e428e53cc -r 4886121d806e apps/las2txt.cpp
--- a/apps/las2txt.cpp	Wed Nov 24 14:15:17 2010 -0600
+++ b/apps/las2txt.cpp	Mon Nov 29 11:02:49 2010 -0600
@@ -428,6 +428,7 @@
 
             ("verbose,v", po::value<bool>(&verbose)->zero_tokens(), "Verbose message output")
             ("xml", po::value<bool>(&output_xml)->zero_tokens()->implicit_value(true), "Output as XML -- no formatting given by --parse is respected in this case.")
+            ("stdout", po::value<bool>(&bUseStdout)->zero_tokens()->implicit_value(true), "Output data to stdout")
 
         ;
 
@@ -491,9 +492,17 @@
             
 
         } else {
-            std::cerr << "Output text file not specified!\n";
-            OutputHelp(std::cout, options);
-            return 1;
+            
+            if (bUseStdout) 
+            {
+                os = &std::cout;
+            } else 
+            {
+                std::cerr << "Output text file not specified!\n";
+                OutputHelp(std::cout, options);
+                return 1;
+            }
+
         }
         filters = GetFilters(vm, verbose);
 
diff -r 249e428e53cc -r 4886121d806e include/liblas/detail/reader/cachedreader.hpp
--- a/include/liblas/detail/reader/cachedreader.hpp	Wed Nov 24 14:15:17 2010 -0600
+++ b/include/liblas/detail/reader/cachedreader.hpp	Mon Nov 29 11:02:49 2010 -0600
@@ -60,12 +60,10 @@
 public:
 
     CachedReaderImpl(std::istream& ifs, std::size_t cache_size);
-    // ~CachedReaderImpl();
 
     HeaderPtr ReadHeader();
     liblas::Point const& ReadNextPoint(HeaderPtr header);
     liblas::Point const& ReadPointAt(std::size_t n, HeaderPtr header);
-    // void SetOutputSRS(const SpatialReference& srs, const liblas::Header& header);
 
     void Seek(std::size_t n, HeaderPtr header);
     void Reset(HeaderPtr header);
@@ -82,6 +80,7 @@
     void CacheData(boost::uint32_t position, HeaderPtr header);
 
     typedef std::vector<boost::uint8_t> cache_mask_type;
+
     cache_mask_type m_mask;
     cache_mask_type::size_type m_cache_size;    
     cache_mask_type::size_type m_cache_start_position;
diff -r 249e428e53cc -r 4886121d806e include/liblas/detail/reader/header.hpp
--- a/include/liblas/detail/reader/header.hpp	Wed Nov 24 14:15:17 2010 -0600
+++ b/include/liblas/detail/reader/header.hpp	Mon Nov 29 11:02:49 2010 -0600
@@ -64,7 +64,6 @@
 
 protected:
 
-    
     std::istream& m_ifs;
     HeaderPtr m_header;
 
diff -r 249e428e53cc -r 4886121d806e schemas/las.xml
--- a/schemas/las.xml	Wed Nov 24 14:15:17 2010 -0600
+++ b/schemas/las.xml	Mon Nov 29 11:02:49 2010 -0600
@@ -4,7 +4,7 @@
     <las:position>0</las:position>
     <las:size>0</las:size>
     <las:required>true</las:required>
-    <las:name3>las:name</las:name>
+    <las:name>las:name</las:name>
     <las:description>las:description</las:description>
     <las:active>true</las:active>
     <las:units>byte</las:units>