[Liblas-commits] hg-main-tree: remove
supportsITERATORTYPEIterator() methods in f...
liblas-commits at liblas.org
liblas-commits at liblas.org
Mon Mar 28 12:32:11 EDT 2011
details: http://hg.libpc.orghg-main-tree/rev/a99eccbfb49e
changeset: 477:a99eccbfb49e
user: Howard Butler <hobu.inc at gmail.com>
date: Mon Mar 28 11:31:58 2011 -0500
description:
remove supportsITERATORTYPEIterator() methods in favor of supportsIterator(IteratorType t)
diffstat:
include/libpc/Stage.hpp | 3 +--
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 | 2 --
include/libpc/filters/Chipper.hpp | 2 --
include/libpc/filters/ColorFilter.hpp | 2 --
include/libpc/filters/CropFilter.hpp | 3 ---
include/libpc/filters/DecimationFilter.hpp | 2 --
include/libpc/filters/MosaicFilter.hpp | 3 +--
src/filters/Chipper.cpp | 2 +-
12 files changed, 3 insertions(+), 24 deletions(-)
diffs (151 lines):
diff -r 70a0560cdc38 -r a99eccbfb49e include/libpc/Stage.hpp
--- a/include/libpc/Stage.hpp Mon Mar 28 11:13:35 2011 -0500
+++ b/include/libpc/Stage.hpp Mon Mar 28 11:31:58 2011 -0500
@@ -73,8 +73,7 @@
const Metadata::Array& getMetadata() const;
virtual bool supportsIterator (StageIteratorType) const { return false; }
- virtual bool supportsSequentialIterator() const { return false; }
- virtual bool supportsRandomIterator() const { return false; }
+
virtual SequentialIterator* createSequentialIterator() const { return NULL; }
virtual RandomIterator* createRandomIterator() const { return NULL; }
virtual BlockIterator* createBlockIterator() const { return NULL; }
diff -r 70a0560cdc38 -r a99eccbfb49e include/libpc/drivers/faux/Reader.hpp
--- a/include/libpc/drivers/faux/Reader.hpp Mon Mar 28 11:13:35 2011 -0500
+++ b/include/libpc/drivers/faux/Reader.hpp Mon Mar 28 11:31:58 2011 -0500
@@ -89,8 +89,6 @@
return false;
}
- bool supportsSequentialIterator() const { return true; }
- bool supportsRandomIterator() const { return true; }
libpc::SequentialIterator* createSequentialIterator() const;
libpc::RandomIterator* createRandomIterator() const;
diff -r 70a0560cdc38 -r a99eccbfb49e include/libpc/drivers/las/Reader.hpp
--- a/include/libpc/drivers/las/Reader.hpp Mon Mar 28 11:13:35 2011 -0500
+++ b/include/libpc/drivers/las/Reader.hpp Mon Mar 28 11:31:58 2011 -0500
@@ -67,8 +67,6 @@
return false;
}
- bool supportsSequentialIterator() const { return true; }
- bool supportsRandomIterator() const { return true; }
libpc::SequentialIterator* createSequentialIterator() const;
libpc::RandomIterator* createRandomIterator() const;
diff -r 70a0560cdc38 -r a99eccbfb49e include/libpc/drivers/liblas/Reader.hpp
--- a/include/libpc/drivers/liblas/Reader.hpp Mon Mar 28 11:13:35 2011 -0500
+++ b/include/libpc/drivers/liblas/Reader.hpp Mon Mar 28 11:31:58 2011 -0500
@@ -78,8 +78,6 @@
return false;
}
- bool supportsSequentialIterator() const { return true; }
- bool supportsRandomIterator() const { return true; }
libpc::SequentialIterator* createSequentialIterator() const;
libpc::RandomIterator* createRandomIterator() const;
diff -r 70a0560cdc38 -r a99eccbfb49e include/libpc/drivers/oci/Reader.hpp
--- a/include/libpc/drivers/oci/Reader.hpp Mon Mar 28 11:13:35 2011 -0500
+++ b/include/libpc/drivers/oci/Reader.hpp Mon Mar 28 11:31:58 2011 -0500
@@ -63,8 +63,6 @@
bool supportsIterator (StageIteratorType t)
{
if (t == StageIterator_Sequential ) return true;
- if (t == StageIterator_Random ) return true;
- if (t == StageIterator_Block ) return true;
return false;
}
diff -r 70a0560cdc38 -r a99eccbfb49e include/libpc/filters/CacheFilter.hpp
--- a/include/libpc/filters/CacheFilter.hpp Mon Mar 28 11:13:35 2011 -0500
+++ b/include/libpc/filters/CacheFilter.hpp Mon Mar 28 11:31:58 2011 -0500
@@ -97,8 +97,6 @@
return false;
}
- bool supportsSequentialIterator() const { return true; }
- bool supportsRandomIterator() const { return true; }
libpc::SequentialIterator* createSequentialIterator() const;
libpc::RandomIterator* createRandomIterator() const;
diff -r 70a0560cdc38 -r a99eccbfb49e include/libpc/filters/Chipper.hpp
--- a/include/libpc/filters/Chipper.hpp Mon Mar 28 11:13:35 2011 -0500
+++ b/include/libpc/filters/Chipper.hpp Mon Mar 28 11:31:58 2011 -0500
@@ -173,8 +173,6 @@
return false;
}
- bool supportsSequentialIterator() const { return true; }
- bool supportsRandomIterator() const { return false; }
libpc::SequentialIterator* createSequentialIterator() const;
libpc::RandomIterator* createRandomIterator() const;
diff -r 70a0560cdc38 -r a99eccbfb49e include/libpc/filters/ColorFilter.hpp
--- a/include/libpc/filters/ColorFilter.hpp Mon Mar 28 11:13:35 2011 -0500
+++ b/include/libpc/filters/ColorFilter.hpp Mon Mar 28 11:31:58 2011 -0500
@@ -69,8 +69,6 @@
return false;
}
- bool supportsSequentialIterator() const { return true; }
- bool supportsRandomIterator() const { return false; }
libpc::SequentialIterator* createSequentialIterator() const;
libpc::RandomIterator* createRandomIterator() const { return NULL; }
diff -r 70a0560cdc38 -r a99eccbfb49e include/libpc/filters/CropFilter.hpp
--- a/include/libpc/filters/CropFilter.hpp Mon Mar 28 11:13:35 2011 -0500
+++ b/include/libpc/filters/CropFilter.hpp Mon Mar 28 11:31:58 2011 -0500
@@ -65,9 +65,6 @@
return false;
}
-
- bool supportsSequentialIterator() const { return true; }
- bool supportsRandomIterator() const { return false; }
libpc::SequentialIterator* createSequentialIterator() const;
libpc::RandomIterator* createRandomIterator() const { return NULL; }
diff -r 70a0560cdc38 -r a99eccbfb49e include/libpc/filters/DecimationFilter.hpp
--- a/include/libpc/filters/DecimationFilter.hpp Mon Mar 28 11:13:35 2011 -0500
+++ b/include/libpc/filters/DecimationFilter.hpp Mon Mar 28 11:31:58 2011 -0500
@@ -64,8 +64,6 @@
return false;
}
- bool supportsSequentialIterator() const { return true; }
- bool supportsRandomIterator() const { return false; }
libpc::SequentialIterator* createSequentialIterator() const;
libpc::RandomIterator* createRandomIterator() const { return NULL; }
diff -r 70a0560cdc38 -r a99eccbfb49e include/libpc/filters/MosaicFilter.hpp
--- a/include/libpc/filters/MosaicFilter.hpp Mon Mar 28 11:13:35 2011 -0500
+++ b/include/libpc/filters/MosaicFilter.hpp Mon Mar 28 11:31:58 2011 -0500
@@ -62,12 +62,11 @@
bool supportsIterator (StageIteratorType t)
{
if (t == StageIterator_Sequential ) return true;
+ if (t == StageIterator_Random) return false; // BUG: could be true
return false;
}
- bool supportsSequentialIterator() const { return true; }
- bool supportsRandomIterator() const { return false; } // BUG: could be true
libpc::SequentialIterator* createSequentialIterator() const;
libpc::RandomIterator* createRandomIterator() const { return NULL; }
diff -r 70a0560cdc38 -r a99eccbfb49e src/filters/Chipper.cpp
--- a/src/filters/Chipper.cpp Mon Mar 28 11:13:35 2011 -0500
+++ b/src/filters/Chipper.cpp Mon Mar 28 11:31:58 2011 -0500
@@ -101,7 +101,7 @@
if (size < 0)
throw libpc_error("m_right - m_left + 1 was less than 0 in Block::GetBuffer()!");
- if (!stage.supportsRandomIterator())
+ if (!stage.supportsIterator(StageIterator_Random))
throw libpc_error("Chipper GetBuffer is unable to read data source randomly!");
boost::scoped_ptr<RandomIterator> iter(stage.createRandomIterator());
More information about the Liblas-commits
mailing list