[Liblas-commits] hg-main-tree: nasty lint
liblas-commits at liblas.org
liblas-commits at liblas.org
Fri Mar 25 12:53:47 EDT 2011
details: http://hg.libpc.orghg-main-tree/rev/71b2c5bafaa6
changeset: 453:71b2c5bafaa6
user: Michael P. Gerlek <mpg at flaxen.com>
date: Fri Mar 25 09:53:16 2011 -0700
description:
nasty lint
Subject: hg-main-tree: merge
details: http://hg.libpc.orghg-main-tree/rev/367add3f5d25
changeset: 454:367add3f5d25
user: Michael P. Gerlek <mpg at flaxen.com>
date: Fri Mar 25 09:53:25 2011 -0700
description:
merge
diffstat:
include/libpc/Stage.hpp | 4 ++++
include/libpc/drivers/faux/Reader.hpp | 2 ++
include/libpc/drivers/las/Reader.hpp | 2 ++
include/libpc/drivers/liblas/Reader.hpp | 2 ++
include/libpc/drivers/oci/Reader.hpp | 2 ++
include/libpc/filters/CacheFilter.hpp | 1 +
include/libpc/filters/ColorFilter.hpp | 3 ++-
include/libpc/filters/CropFilter.hpp | 5 ++++-
include/libpc/filters/DecimationFilter.hpp | 3 ++-
include/libpc/filters/MosaicFilter.hpp | 2 ++
src/drivers/faux/Reader.cpp | 10 ++++++++++
src/drivers/las/Reader.cpp | 8 ++++++++
src/drivers/liblas/Reader.cpp | 9 +++++++++
src/filters/CacheFilter.cpp | 8 ++++++++
src/filters/ColorFilter.cpp | 7 +++++++
src/filters/CropFilter.cpp | 8 ++++++++
src/filters/DecimationFilter.cpp | 9 +++++++++
src/filters/MosaicFilter.cpp | 8 ++++++++
test/unit/FauxReaderTest.cpp | 18 +++++++++---------
19 files changed, 99 insertions(+), 12 deletions(-)
diffs (truncated from 364 to 300 lines):
diff -r e6e0f0b32e9b -r 367add3f5d25 include/libpc/Stage.hpp
--- a/include/libpc/Stage.hpp Fri Mar 25 09:50:49 2011 -0700
+++ b/include/libpc/Stage.hpp Fri Mar 25 09:53:25 2011 -0700
@@ -44,6 +44,7 @@
{
class Header;
+class Iterator;
class SequentialIterator;
class RandomIterator;
@@ -67,6 +68,9 @@
Header& getHeader();
virtual boost::uint8_t getIteratorSupport () const { return 0; }
+
+ virtual libpc::Iterator* createIterator(StageIteratorType type) const { return NULL; }
+
virtual bool supportsSequentialIterator() const { return false; }
virtual bool supportsRandomIterator() const { return false; }
virtual SequentialIterator* createSequentialIterator() const { return NULL; }
diff -r e6e0f0b32e9b -r 367add3f5d25 include/libpc/drivers/faux/Reader.hpp
--- a/include/libpc/drivers/faux/Reader.hpp Fri Mar 25 09:50:49 2011 -0700
+++ b/include/libpc/drivers/faux/Reader.hpp Fri Mar 25 09:53:25 2011 -0700
@@ -89,6 +89,8 @@
return mask;
}
+ libpc::Iterator* createIterator(StageIteratorType t) const;
+
bool supportsSequentialIterator() const { return true; }
bool supportsRandomIterator() const { return true; }
libpc::SequentialIterator* createSequentialIterator() const;
diff -r e6e0f0b32e9b -r 367add3f5d25 include/libpc/drivers/las/Reader.hpp
--- a/include/libpc/drivers/las/Reader.hpp Fri Mar 25 09:50:49 2011 -0700
+++ b/include/libpc/drivers/las/Reader.hpp Fri Mar 25 09:53:25 2011 -0700
@@ -68,6 +68,8 @@
return mask;
}
+ libpc::Iterator* createIterator(StageIteratorType t) const;
+
bool supportsSequentialIterator() const { return true; }
bool supportsRandomIterator() const { return true; }
libpc::SequentialIterator* createSequentialIterator() const;
diff -r e6e0f0b32e9b -r 367add3f5d25 include/libpc/drivers/liblas/Reader.hpp
--- a/include/libpc/drivers/liblas/Reader.hpp Fri Mar 25 09:50:49 2011 -0700
+++ b/include/libpc/drivers/liblas/Reader.hpp Fri Mar 25 09:53:25 2011 -0700
@@ -80,6 +80,8 @@
return mask;
}
+ libpc::Iterator* createIterator(StageIteratorType t) const;
+
bool supportsSequentialIterator() const { return true; }
bool supportsRandomIterator() const { return true; }
libpc::SequentialIterator* createSequentialIterator() const;
diff -r e6e0f0b32e9b -r 367add3f5d25 include/libpc/drivers/oci/Reader.hpp
--- a/include/libpc/drivers/oci/Reader.hpp Fri Mar 25 09:50:49 2011 -0700
+++ b/include/libpc/drivers/oci/Reader.hpp Fri Mar 25 09:53:25 2011 -0700
@@ -70,6 +70,8 @@
return mask;
}
+ // libpc::Iterator* createIterator(StageIteratorType t) const;
+
private:
Reader& operator=(const Reader&); // not implemented
diff -r e6e0f0b32e9b -r 367add3f5d25 include/libpc/filters/CacheFilter.hpp
--- a/include/libpc/filters/CacheFilter.hpp Fri Mar 25 09:50:49 2011 -0700
+++ b/include/libpc/filters/CacheFilter.hpp Fri Mar 25 09:53:25 2011 -0700
@@ -94,6 +94,7 @@
return mask;
}
+ libpc::Iterator* createIterator(StageIteratorType t) const;
bool supportsSequentialIterator() const { return true; }
bool supportsRandomIterator() const { return true; }
diff -r e6e0f0b32e9b -r 367add3f5d25 include/libpc/filters/ColorFilter.hpp
--- a/include/libpc/filters/ColorFilter.hpp Fri Mar 25 09:50:49 2011 -0700
+++ b/include/libpc/filters/ColorFilter.hpp Fri Mar 25 09:53:25 2011 -0700
@@ -68,7 +68,8 @@
mask |= StageIterator_Sequential;
return mask;
}
-
+
+ libpc::Iterator* createIterator(StageIteratorType t) const;
bool supportsSequentialIterator() const { return true; }
bool supportsRandomIterator() const { return false; }
diff -r e6e0f0b32e9b -r 367add3f5d25 include/libpc/filters/CropFilter.hpp
--- a/include/libpc/filters/CropFilter.hpp Fri Mar 25 09:50:49 2011 -0700
+++ b/include/libpc/filters/CropFilter.hpp Fri Mar 25 09:53:25 2011 -0700
@@ -38,7 +38,7 @@
#include <libpc/libpc.hpp>
//#include <libpc/export.hpp>
#include <libpc/Filter.hpp>
-//#include <libpc/FilterIterator.hpp>
+#include <libpc/FilterIterator.hpp>
#include <libpc/Bounds.hpp>
namespace libpc
@@ -69,6 +69,9 @@
bool supportsSequentialIterator() const { return true; }
bool supportsRandomIterator() const { return false; }
+
+ libpc::Iterator* createIterator(StageIteratorType type) const;
+
libpc::SequentialIterator* createSequentialIterator() const;
libpc::RandomIterator* createRandomIterator() const { return NULL; }
diff -r e6e0f0b32e9b -r 367add3f5d25 include/libpc/filters/DecimationFilter.hpp
--- a/include/libpc/filters/DecimationFilter.hpp Fri Mar 25 09:50:49 2011 -0700
+++ b/include/libpc/filters/DecimationFilter.hpp Fri Mar 25 09:53:25 2011 -0700
@@ -64,7 +64,8 @@
return mask;
}
-
+ libpc::Iterator* createIterator(StageIteratorType t) const;
+
bool supportsSequentialIterator() const { return true; }
bool supportsRandomIterator() const { return false; }
libpc::SequentialIterator* createSequentialIterator() const;
diff -r e6e0f0b32e9b -r 367add3f5d25 include/libpc/filters/MosaicFilter.hpp
--- a/include/libpc/filters/MosaicFilter.hpp Fri Mar 25 09:50:49 2011 -0700
+++ b/include/libpc/filters/MosaicFilter.hpp Fri Mar 25 09:53:25 2011 -0700
@@ -66,6 +66,8 @@
return mask;
}
+ libpc::Iterator* createIterator(StageIteratorType t) const;
+
bool supportsSequentialIterator() const { return true; }
bool supportsRandomIterator() const { return false; } // BUG: could be true
libpc::SequentialIterator* createSequentialIterator() const;
diff -r e6e0f0b32e9b -r 367add3f5d25 src/drivers/faux/Reader.cpp
--- a/src/drivers/faux/Reader.cpp Fri Mar 25 09:50:49 2011 -0700
+++ b/src/drivers/faux/Reader.cpp Fri Mar 25 09:53:25 2011 -0700
@@ -111,6 +111,16 @@
return new RandomIterator(*this);
}
+libpc::Iterator* Reader::createIterator(StageIteratorType t) const
+{
+ if (t == StageIterator_Sequential)
+ return new SequentialIterator(*this);
+ if (t == StageIterator_Random)
+ return new RandomIterator(*this);
+ return 0;
+}
+
+
boost::uint32_t Reader::processBuffer(PointBuffer& data, boost::uint64_t index) const
{
const SchemaLayout& schemaLayout = data.getSchemaLayout();
diff -r e6e0f0b32e9b -r 367add3f5d25 src/drivers/las/Reader.cpp
--- a/src/drivers/las/Reader.cpp Fri Mar 25 09:50:49 2011 -0700
+++ b/src/drivers/las/Reader.cpp Fri Mar 25 09:53:25 2011 -0700
@@ -98,6 +98,14 @@
return new RandomIterator(*this);
}
+libpc::Iterator* LasReader::createIterator(StageIteratorType t) const
+{
+ if (t == StageIterator_Sequential)
+ return new SequentialIterator(*this);
+ if (t == StageIterator_Random)
+ return new RandomIterator(*this);
+ return 0;
+}
boost::uint32_t LasReader::processBuffer(PointBuffer& data, std::istream& stream) const
{
diff -r e6e0f0b32e9b -r 367add3f5d25 src/drivers/liblas/Reader.cpp
--- a/src/drivers/liblas/Reader.cpp Fri Mar 25 09:50:49 2011 -0700
+++ b/src/drivers/liblas/Reader.cpp Fri Mar 25 09:53:25 2011 -0700
@@ -263,4 +263,13 @@
return new RandomIterator(*this);
}
+libpc::Iterator* LiblasReader::createIterator(StageIteratorType t) const
+{
+ if (t == StageIterator_Sequential)
+ return new SequentialIterator(*this);
+ if (t == StageIterator_Random)
+ return new RandomIterator(*this);
+ return 0;
+}
+
} } } // namespaces
diff -r e6e0f0b32e9b -r 367add3f5d25 src/filters/CacheFilter.cpp
--- a/src/filters/CacheFilter.cpp Fri Mar 25 09:50:49 2011 -0700
+++ b/src/filters/CacheFilter.cpp Fri Mar 25 09:53:25 2011 -0700
@@ -151,5 +151,13 @@
return new CacheFilterRandomIterator(*this);
}
+libpc::Iterator* CacheFilter::createIterator(StageIteratorType t) const
+{
+ if (t == StageIterator_Sequential)
+ return new CacheFilterSequentialIterator(*this);
+ if (t == StageIterator_Random)
+ return new CacheFilterRandomIterator(*this);
+ return 0;
+}
} } // namespaces
diff -r e6e0f0b32e9b -r 367add3f5d25 src/filters/ColorFilter.cpp
--- a/src/filters/ColorFilter.cpp Fri Mar 25 09:50:49 2011 -0700
+++ b/src/filters/ColorFilter.cpp Fri Mar 25 09:53:25 2011 -0700
@@ -143,5 +143,12 @@
return new ColorFilterSequentialIterator(*this);
}
+libpc::Iterator* ColorFilter::createIterator(StageIteratorType t) const
+{
+ if (t == StageIterator_Sequential)
+ return new ColorFilterSequentialIterator(*this);
+
+ return 0;
+}
} } // namespaces
diff -r e6e0f0b32e9b -r 367add3f5d25 src/filters/CropFilter.cpp
--- a/src/filters/CropFilter.cpp Fri Mar 25 09:50:49 2011 -0700
+++ b/src/filters/CropFilter.cpp Fri Mar 25 09:53:25 2011 -0700
@@ -114,5 +114,13 @@
return new CropFilterSequentialIterator(*this);
}
+libpc::Iterator* CropFilter::createIterator(StageIteratorType t) const
+{
+ if (t == StageIterator_Sequential)
+ return new CropFilterSequentialIterator(*this);
+
+ return 0;
+}
+
} } // namespaces
diff -r e6e0f0b32e9b -r 367add3f5d25 src/filters/DecimationFilter.cpp
--- a/src/filters/DecimationFilter.cpp Fri Mar 25 09:50:49 2011 -0700
+++ b/src/filters/DecimationFilter.cpp Fri Mar 25 09:53:25 2011 -0700
@@ -94,5 +94,14 @@
return new DecimationFilterSequentialIterator(*this);
}
+libpc::Iterator* DecimationFilter::createIterator(StageIteratorType t) const
+{
+ if (t == StageIterator_Sequential)
+ return new DecimationFilterSequentialIterator(*this);
+
+ return 0;
+}
+
+
} } // namespaces
diff -r e6e0f0b32e9b -r 367add3f5d25 src/filters/MosaicFilter.cpp
--- a/src/filters/MosaicFilter.cpp Fri Mar 25 09:50:49 2011 -0700
+++ b/src/filters/MosaicFilter.cpp Fri Mar 25 09:53:25 2011 -0700
@@ -115,5 +115,13 @@
return new MosaicFilterSequentialIterator(*this);
}
+libpc::Iterator* MosaicFilter::createIterator(StageIteratorType t) const
+{
+ if (t == StageIterator_Sequential)
+ return new MosaicFilterSequentialIterator(*this);
+
+ return 0;
+}
+
} } // namespaces
diff -r e6e0f0b32e9b -r 367add3f5d25 test/unit/FauxReaderTest.cpp
--- a/test/unit/FauxReaderTest.cpp Fri Mar 25 09:50:49 2011 -0700
+++ b/test/unit/FauxReaderTest.cpp Fri Mar 25 09:53:25 2011 -0700
@@ -62,7 +62,7 @@
SequentialIterator* iter = reader.createSequentialIterator();
boost::uint32_t numRead = iter->read(data);
- BOOST_CHECK_EQUAL(numRead, 750);
+ BOOST_CHECK_EQUAL(numRead, 750u);
int offsetX = schema.getDimensionIndex(Dimension::Field_X);
int offsetY = schema.getDimensionIndex(Dimension::Field_Y);
@@ -108,7 +108,7 @@
RandomIterator* iter = reader.createRandomIterator();
boost::uint32_t numRead = iter->read(data);
- BOOST_CHECK_EQUAL(numRead, 10);
+ BOOST_CHECK_EQUAL(numRead, 10u);
{
More information about the Liblas-commits
mailing list