[Liblas-commits] hg-main-tree: include ostream for defn

[liblas-commits at liblas.org]

details:   http://hg.libpc.orghg-main-tree/rev/c30f37a19746
changeset: 569:c30f37a19746
user:      Howard Butler <hobu.inc at gmail.com>
date:      Fri Apr 15 14:48:40 2011 -0500
description:
include ostream for defn
Subject: hg-main-tree: add a default: case to handle other pointformats

details:   http://hg.libpc.orghg-main-tree/rev/a2c06e450ba2
changeset: 570:a2c06e450ba2
user:      Howard Butler <hobu.inc at gmail.com>
date:      Fri Apr 15 14:49:00 2011 -0500
description:
add a default: case to handle other pointformats

diffstat:

 include/libpc/drivers/las/SummaryData.hpp |   2 +-
 include/libpc/drivers/oci/Common.hpp      |  24 ++++++++++++++++++++++++
 include/libpc/drivers/oci/Reader.hpp      |   3 +++
 src/drivers/las/Support.cpp               |   3 ++-
 4 files changed, 30 insertions(+), 2 deletions(-)

diffs (80 lines):

diff -r cf246805e92b -r a2c06e450ba2 include/libpc/drivers/las/SummaryData.hpp
--- a/include/libpc/drivers/las/SummaryData.hpp	Fri Apr 15 12:43:44 2011 -0700
+++ b/include/libpc/drivers/las/SummaryData.hpp	Fri Apr 15 14:49:00 2011 -0500
@@ -36,7 +36,7 @@
 #define INCLUDED_DRIVERS_LAS_SUMMARYDATA_HPP
 
 #include <libpc/libpc.hpp>
-
+#include <ostream>
 namespace libpc {
 namespace drivers {
 namespace las {
diff -r cf246805e92b -r a2c06e450ba2 include/libpc/drivers/oci/Common.hpp
--- a/include/libpc/drivers/oci/Common.hpp	Fri Apr 15 12:43:44 2011 -0700
+++ b/include/libpc/drivers/oci/Common.hpp	Fri Apr 15 14:49:00 2011 -0500
@@ -105,6 +105,30 @@
     QUERY_UNKNOWN
 };
 
+
+class Cloud
+{
+public:
+    Cloud(Connection connection);
+    ~Cloud();
+    
+    OCIString* base_table;
+    OCIString* base_column;
+    OCINumber pc_id;
+    OCIString* blk_table;
+    OCIString* ptn_params;
+    sdo_geometry* pc_geometry;
+    OCINumber pc_tol;
+    OCINumber pc_tot_dimensions;
+    sdo_orgscl_type* pc_domain;
+    OCIString* pc_val_attr_tables;
+    boost::scoped_ptr<std::vector<uint8_t> > schema;
+    OCILobLocator           *locator;
+    Connection              m_connection;
+        
+};
+typedef boost::shared_ptr<Cloud> CloudPtr;
+
 class Block
 {
     
diff -r cf246805e92b -r a2c06e450ba2 include/libpc/drivers/oci/Reader.hpp
--- a/include/libpc/drivers/oci/Reader.hpp	Fri Apr 15 12:43:44 2011 -0700
+++ b/include/libpc/drivers/oci/Reader.hpp	Fri Apr 15 14:49:00 2011 -0500
@@ -86,12 +86,15 @@
     void fetchPCFields();
     QueryType describeQueryType() const;    
     BlockPtr defineBlock() const;
+    CloudPtr defineCloud();
 
     Options& m_options;
     Connection m_connection;
     Statement m_statement;
     QueryType m_querytype;
     BlockPtr m_block;
+    CloudPtr m_cloud;
+    sdo_pc* m_pc;
 
 
 };
diff -r cf246805e92b -r a2c06e450ba2 src/drivers/las/Support.cpp
--- a/src/drivers/las/Support.cpp	Fri Apr 15 12:43:44 2011 -0700
+++ b/src/drivers/las/Support.cpp	Fri Apr 15 14:49:00 2011 -0500
@@ -251,9 +251,10 @@
     case PointFormat1: return 28;
     case PointFormat2: return 26;
     case PointFormat3: return 34;
+    default:
+        throw invalid_format("point format unsupported");
     }
 
-    throw invalid_format("point format unsupported");
 }