[Liblas-commits] hg-main-tree: change stupid name
liblas-commits at liblas.org
liblas-commits at liblas.org
Wed Mar 23 12:59:21 EDT 2011
details: http://hg.libpc.orghg-main-tree/rev/0f1af82d2829
changeset: 406:0f1af82d2829
user: Michael P. Gerlek <mpg at flaxen.com>
date: Wed Mar 23 09:59:16 2011 -0700
description:
change stupid name
diffstat:
include/libpc/drivers/faux/Iterator.hpp | 2 +-
include/libpc/drivers/las/Iterator.hpp | 2 +-
include/libpc/drivers/liblas/Iterator.hpp | 2 +-
include/libpc/filters/CacheFilterIterator.hpp | 2 +-
include/libpc/filters/DecimationFilterIterator.hpp | 2 +-
include/libpc/filters/MosaicFilterIterator.hpp | 2 +-
src/drivers/faux/Iterator.cpp | 4 ++--
src/drivers/las/Iterator.cpp | 6 +++---
src/drivers/liblas/Iterator.cpp | 6 +++---
src/filters/CacheFilterIterator.cpp | 4 ++--
src/filters/DecimationFilterIterator.cpp | 4 ++--
src/filters/MosaicFilterIterator.cpp | 2 +-
12 files changed, 19 insertions(+), 19 deletions(-)
diffs (207 lines):
diff -r 7914d91fd2e6 -r 0f1af82d2829 include/libpc/drivers/faux/Iterator.hpp
--- a/include/libpc/drivers/faux/Iterator.hpp Wed Mar 23 11:32:45 2011 -0500
+++ b/include/libpc/drivers/faux/Iterator.hpp Wed Mar 23 09:59:16 2011 -0700
@@ -53,7 +53,7 @@
boost::uint32_t readImpl(PointBuffer&);
bool atEndImpl() const;
- const Reader& m_stageAsDerived;
+ const Reader& m_reader;
};
diff -r 7914d91fd2e6 -r 0f1af82d2829 include/libpc/drivers/las/Iterator.hpp
--- a/include/libpc/drivers/las/Iterator.hpp Wed Mar 23 11:32:45 2011 -0500
+++ b/include/libpc/drivers/las/Iterator.hpp Wed Mar 23 09:59:16 2011 -0700
@@ -55,7 +55,7 @@
boost::uint32_t readImpl(PointBuffer&);
bool atEndImpl() const;
- const LasReader& m_stageAsDerived;
+ const LasReader& m_reader;
};
diff -r 7914d91fd2e6 -r 0f1af82d2829 include/libpc/drivers/liblas/Iterator.hpp
--- a/include/libpc/drivers/liblas/Iterator.hpp Wed Mar 23 11:32:45 2011 -0500
+++ b/include/libpc/drivers/liblas/Iterator.hpp Wed Mar 23 09:59:16 2011 -0700
@@ -63,7 +63,7 @@
boost::uint32_t readImpl(PointBuffer&);
bool atEndImpl() const;
- const LiblasReader& m_stageAsDerived;
+ const LiblasReader& m_reader;
};
} } } // namespaces
diff -r 7914d91fd2e6 -r 0f1af82d2829 include/libpc/filters/CacheFilterIterator.hpp
--- a/include/libpc/filters/CacheFilterIterator.hpp Wed Mar 23 11:32:45 2011 -0500
+++ b/include/libpc/filters/CacheFilterIterator.hpp Wed Mar 23 09:59:16 2011 -0700
@@ -56,7 +56,7 @@
boost::uint32_t readImpl(PointBuffer&);
bool atEndImpl() const;
- const CacheFilter& m_stageAsDerived;
+ const CacheFilter& m_filter;
};
diff -r 7914d91fd2e6 -r 0f1af82d2829 include/libpc/filters/DecimationFilterIterator.hpp
--- a/include/libpc/filters/DecimationFilterIterator.hpp Wed Mar 23 11:32:45 2011 -0500
+++ b/include/libpc/filters/DecimationFilterIterator.hpp Wed Mar 23 09:59:16 2011 -0700
@@ -54,7 +54,7 @@
boost::uint32_t readImpl(PointBuffer&);
bool atEndImpl() const;
- const DecimationFilter& m_stageAsDerived;
+ const DecimationFilter& m_filter;
};
diff -r 7914d91fd2e6 -r 0f1af82d2829 include/libpc/filters/MosaicFilterIterator.hpp
--- a/include/libpc/filters/MosaicFilterIterator.hpp Wed Mar 23 11:32:45 2011 -0500
+++ b/include/libpc/filters/MosaicFilterIterator.hpp Wed Mar 23 09:59:16 2011 -0700
@@ -57,7 +57,7 @@
const std::vector<Iterator*>& getPrevIterators() const;
- const MosaicFilter& m_stageAsDerived;
+ const MosaicFilter& m_filter;
std::vector<Iterator*> m_prevIterators;
};
diff -r 7914d91fd2e6 -r 0f1af82d2829 src/drivers/faux/Iterator.cpp
--- a/src/drivers/faux/Iterator.cpp Wed Mar 23 11:32:45 2011 -0500
+++ b/src/drivers/faux/Iterator.cpp Wed Mar 23 09:59:16 2011 -0700
@@ -49,7 +49,7 @@
Iterator::Iterator(const Reader& reader)
: libpc::Iterator(reader)
- , m_stageAsDerived(reader)
+ , m_reader(reader)
{
return;
}
@@ -72,7 +72,7 @@
boost::uint32_t Iterator::readImpl(PointBuffer& data)
{
- Reader& reader = const_cast<Reader&>(m_stageAsDerived); // BUG BUG BUG
+ Reader& reader = const_cast<Reader&>(m_reader); // BUG BUG BUG
if (data.getSchemaLayout().getSchema().getDimensions().size() != 4)
throw not_yet_implemented("need to add ability to read from arbitrary fields");
diff -r 7914d91fd2e6 -r 0f1af82d2829 src/drivers/las/Iterator.cpp
--- a/src/drivers/las/Iterator.cpp Wed Mar 23 11:32:45 2011 -0500
+++ b/src/drivers/las/Iterator.cpp Wed Mar 23 09:59:16 2011 -0700
@@ -42,7 +42,7 @@
Iterator::Iterator(const LasReader& reader)
: libpc::Iterator(reader)
- , m_stageAsDerived(reader)
+ , m_reader(reader)
{
return;
}
@@ -50,7 +50,7 @@
boost::uint64_t Iterator::skipImpl(boost::uint64_t count)
{
- const LasReader& reader = m_stageAsDerived;
+ const LasReader& reader = m_reader;
const Header& header = reader.getHeader();
boost::uint32_t chunk = (boost::uint32_t)count; // BUG: this needs to be done in blocks if pointNum is large
@@ -72,7 +72,7 @@
boost::uint32_t Iterator::readImpl(PointBuffer& PointBuffer)
{
- LasReader& reader = const_cast<LasReader&>(m_stageAsDerived); // BUG BUG BUG
+ LasReader& reader = const_cast<LasReader&>(m_reader); // BUG BUG BUG
boost::uint32_t numPoints = PointBuffer.getCapacity();
diff -r 7914d91fd2e6 -r 0f1af82d2829 src/drivers/liblas/Iterator.cpp
--- a/src/drivers/liblas/Iterator.cpp Wed Mar 23 11:32:45 2011 -0500
+++ b/src/drivers/liblas/Iterator.cpp Wed Mar 23 09:59:16 2011 -0700
@@ -47,7 +47,7 @@
Iterator::Iterator(const LiblasReader& reader)
: libpc::Iterator(reader)
- , m_stageAsDerived(reader)
+ , m_reader(reader)
{
return;
}
@@ -55,7 +55,7 @@
boost::uint64_t Iterator::skipImpl(boost::uint64_t count)
{
- LiblasReader& reader = const_cast<LiblasReader&>(m_stageAsDerived); // BUG BUG BUG
+ LiblasReader& reader = const_cast<LiblasReader&>(m_reader); // BUG BUG BUG
boost::uint64_t newPos = getIndex() + count;
@@ -75,7 +75,7 @@
boost::uint32_t Iterator::readImpl(PointBuffer& PointBuffer)
{
- LiblasReader& reader = const_cast<LiblasReader&>(m_stageAsDerived); // BUG BUG BUG
+ LiblasReader& reader = const_cast<LiblasReader&>(m_reader); // BUG BUG BUG
boost::uint32_t numPoints = PointBuffer.getCapacity();
boost::uint32_t i = 0;
diff -r 7914d91fd2e6 -r 0f1af82d2829 src/filters/CacheFilterIterator.cpp
--- a/src/filters/CacheFilterIterator.cpp Wed Mar 23 11:32:45 2011 -0500
+++ b/src/filters/CacheFilterIterator.cpp Wed Mar 23 09:59:16 2011 -0700
@@ -43,7 +43,7 @@
CacheFilterIterator::CacheFilterIterator(const CacheFilter& filter)
: libpc::FilterIterator(filter)
- , m_stageAsDerived(filter)
+ , m_filter(filter)
{
return;
}
@@ -64,7 +64,7 @@
boost::uint32_t CacheFilterIterator::readImpl(PointBuffer& data)
{
- CacheFilter& filter = const_cast<CacheFilter&>(m_stageAsDerived); // BUG BUG BUG
+ CacheFilter& filter = const_cast<CacheFilter&>(m_filter); // BUG BUG BUG
const boost::uint64_t currentPointIndex = getIndex();
diff -r 7914d91fd2e6 -r 0f1af82d2829 src/filters/DecimationFilterIterator.cpp
--- a/src/filters/DecimationFilterIterator.cpp Wed Mar 23 11:32:45 2011 -0500
+++ b/src/filters/DecimationFilterIterator.cpp Wed Mar 23 09:59:16 2011 -0700
@@ -41,7 +41,7 @@
DecimationFilterIterator::DecimationFilterIterator(const DecimationFilter& filter)
: libpc::FilterIterator(filter)
- , m_stageAsDerived(filter)
+ , m_filter(filter)
{
return;
}
@@ -100,7 +100,7 @@
// copy points from src (prev stage) into dst (our stage),
// based on the CropFilter's rules (i.e. its bounds)
- const boost::uint32_t numPointsAdded = m_stageAsDerived.processBuffer(dstData, srcData, srcStartIndex);
+ const boost::uint32_t numPointsAdded = m_filter.processBuffer(dstData, srcData, srcStartIndex);
numPointsNeeded -= numPointsAdded;
}
diff -r 7914d91fd2e6 -r 0f1af82d2829 src/filters/MosaicFilterIterator.cpp
--- a/src/filters/MosaicFilterIterator.cpp Wed Mar 23 11:32:45 2011 -0500
+++ b/src/filters/MosaicFilterIterator.cpp Wed Mar 23 09:59:16 2011 -0700
@@ -42,7 +42,7 @@
MosaicFilterIterator::MosaicFilterIterator(const MosaicFilter& filter)
: libpc::Iterator(filter)
- , m_stageAsDerived(filter)
+ , m_filter(filter)
{
for (size_t i=0; i<filter.getPrevStages().size(); ++i)
{
More information about the Liblas-commits
mailing list