[Liblas-commits] hg-main-tree: guards

[liblas-commits at liblas.org]

details:   http://hg.libpc.orghg-main-tree/rev/0bbe98eda357
changeset: 352:0bbe98eda357
user:      Michael P. Gerlek <mpg at flaxen.com>
date:      Thu Mar 17 15:38:27 2011 -0400
description:
guards
Subject: hg-main-tree: merge

details:   http://hg.libpc.orghg-main-tree/rev/73ac2a30a2f6
changeset: 353:73ac2a30a2f6
user:      Michael P. Gerlek <mpg at flaxen.com>
date:      Thu Mar 17 15:38:48 2011 -0400
description:
merge

diffstat:

 include/libpc/libpc.hpp        |  2 +-
 include/libpc/libpc_config.hpp |  5 +++++
 src/drivers/liblas/Writer.cpp  |  1 -
 src/drivers/oci/Reader.cpp     |  1 -
 src/drivers/oci/Writer.cpp     |  3 +--
 src/filters/CropFilter.cpp     |  2 ++
 6 files changed, 9 insertions(+), 5 deletions(-)

diffs (86 lines):

diff -r 274b836e6540 -r 73ac2a30a2f6 include/libpc/libpc.hpp
--- a/include/libpc/libpc.hpp	Thu Mar 17 15:26:33 2011 -0400
+++ b/include/libpc/libpc.hpp	Thu Mar 17 15:38:48 2011 -0400
@@ -37,7 +37,7 @@
 
 #include <libpc/export.hpp>
 #include <libpc/libpc_defines.h>
-#include <libpc/libpc_config.hpp>
+// #include <libpc/libpc_config.hpp>
 #include <libpc/types.hpp>
 
 #endif
diff -r 274b836e6540 -r 73ac2a30a2f6 include/libpc/libpc_config.hpp
--- a/include/libpc/libpc_config.hpp	Thu Mar 17 15:26:33 2011 -0400
+++ b/include/libpc/libpc_config.hpp	Thu Mar 17 15:38:48 2011 -0400
@@ -41,6 +41,9 @@
  * OF SUCH DAMAGE.
  ****************************************************************************/
 
+#ifndef INCLUDED_LIBPC_CONFIG_HPP
+#define INCLUDED_LIBPC_CONFIG_HPP
+
 #include <string>
 #include <libpc/export.hpp>
 
@@ -60,3 +63,5 @@
 LIBPC_DLL int GetVersionPatch();
 
 } // namespace libpc
+
+#endif
diff -r 274b836e6540 -r 73ac2a30a2f6 src/drivers/liblas/Writer.cpp
--- a/src/drivers/liblas/Writer.cpp	Thu Mar 17 15:26:33 2011 -0400
+++ b/src/drivers/liblas/Writer.cpp	Thu Mar 17 15:38:48 2011 -0400
@@ -40,7 +40,6 @@
 #include <liblas/Writer.hpp>
 
 #include <libpc/exceptions.hpp>
-#include <libpc/libpc_config.hpp>
 
 
 namespace libpc { namespace drivers { namespace liblas {
diff -r 274b836e6540 -r 73ac2a30a2f6 src/drivers/oci/Reader.cpp
--- a/src/drivers/oci/Reader.cpp	Thu Mar 17 15:26:33 2011 -0400
+++ b/src/drivers/oci/Reader.cpp	Thu Mar 17 15:38:48 2011 -0400
@@ -43,7 +43,6 @@
 
 
 #include <libpc/exceptions.hpp>
-#include <libpc/libpc_config.hpp>
 
 #include <cstdlib>
 #include <iostream>
diff -r 274b836e6540 -r 73ac2a30a2f6 src/drivers/oci/Writer.cpp
--- a/src/drivers/oci/Writer.cpp	Thu Mar 17 15:26:33 2011 -0400
+++ b/src/drivers/oci/Writer.cpp	Thu Mar 17 15:38:48 2011 -0400
@@ -41,7 +41,6 @@
 #include <libpc/drivers/oci/Header.hpp>
 
 #include <libpc/exceptions.hpp>
-#include <libpc/libpc_config.hpp>
 
 #include <cstdlib>
 #include <iostream>
@@ -951,7 +950,7 @@
             m_stage.seekToPoint(*it);
             
             // FIXME: Use a user bounds here instead of reading everything  
-            m_stage.read(buffer, libpc::Bounds<double>());
+            m_stage.read(buffer);
             
             block.copyPointsFast(static_cast<std::size_t>(count), static_cast<std::size_t>(0), buffer, 1); // put single point onto our block
 
diff -r 274b836e6540 -r 73ac2a30a2f6 src/filters/CropFilter.cpp
--- a/src/filters/CropFilter.cpp	Thu Mar 17 15:26:33 2011 -0400
+++ b/src/filters/CropFilter.cpp	Thu Mar 17 15:38:48 2011 -0400
@@ -65,7 +65,9 @@
 boost::uint32_t CropFilter::readBuffer(PointData& data)
 {
     PointData srcData(data.getSchemaLayout(), data.getCapacity());
+
     boost::uint32_t numSrcPointsRead = m_prevStage.read(srcData);
+    if (numSrcPointsRead == 0) return 0;
 
     const SchemaLayout& schemaLayout = data.getSchemaLayout();
     const Schema& schema = schemaLayout.getSchema();