Changeset 1579:94ea2e8f3d8c

Timestamp:

02/13/10 08:36:41 (6 months ago)

Author:

Howard Butler <hobu.inc@…>

Branch:

default

Message:

actually use ReaderI and WriterI for pimpls for LASReader/LASWriter

Files:

• include/liblas/lasreader.hpp (modified) (2 diffs)
• include/liblas/laswriter.hpp (modified) (2 diffs)
• src/lasreader.cpp (modified) (3 diffs)
• src/laswriter.cpp (modified) (2 diffs)

include/liblas/lasreader.hpp

@@ -143 +143 @@
     void Init(); // throws on error
 
-    const std::auto_ptr<detail::ReaderImpl> m_pimpl;
+    const std::auto_ptr<ReaderI> m_pimpl;
     LASHeader m_header;
     LASPoint* m_point;
@@ -151 +151 @@
     // read from the istream
     bool bCustomHeader;
+
+    std::istream& m_ifs;
     
 };

include/liblas/laswriter.hpp

@@ -47 +47 @@
 #include <liblas/laspoint.hpp>
 #include <liblas/detail/fwd.hpp>
+#include <liblas/interfaces.hpp>
 
 // std
@@ -99 +100 @@
     LASWriter& operator=(LASWriter const& rhs);
 
-    const std::auto_ptr<detail::WriterImpl> m_pimpl;
+    const std::auto_ptr<WriterI> m_pimpl;
 
     LASHeader m_header;
     detail::PointRecord m_record;
+    std::ostream& m_ofs;
+
 };
 

src/lasreader.cpp

@@ -61 +61 @@
     m_point(0),
     m_empty_point(new LASPoint()),
-    bCustomHeader(false)
+    bCustomHeader(false),
+    m_ifs(ifs)
 {
     Init();
@@ -70 +71 @@
     m_point(0),
     m_empty_point(new LASPoint()),
-    bCustomHeader(false)
+    bCustomHeader(false),
+    m_ifs(ifs)
 
 {
@@ -164 +166 @@
 std::istream& LASReader::GetStream() const
 {
-    return m_pimpl->GetStream();
+    return m_ifs;
 }
 

src/laswriter.cpp

@@ -55 +55 @@
 
 LASWriter::LASWriter(std::ostream& ofs, LASHeader const& header) :
-    m_pimpl(detail::WriterFactory::Create(ofs, header)), m_header(header)
+    m_pimpl(detail::WriterFactory::Create(ofs, header)), m_header(header),
+    m_ofs(ofs)
 {
     m_pimpl->WriteHeader(m_header);
@@ -86 +87 @@
 std::ostream& LASWriter::GetStream() const
 {
-    return m_pimpl->GetStream();
+    return m_ofs;
 }