[Liblas-commits] hg: 2 new changesets

[liblas-commits at liblas.org]

changeset 7e100d2725a8 in /home/www/liblas.org/hg
details: http://hg.liblas.org/main/hg?cmd=changeset;node=7e100d2725a8
summary: cleanup

changeset 2b2fa43686d7 in /home/www/liblas.org/hg
details: http://hg.liblas.org/main/hg?cmd=changeset;node=2b2fa43686d7
summary: merge local

diffstat:

 include/liblas/detail/utility.hpp |  7 -------
 python/scripts/oci2las.py         |  3 ---
 2 files changed, 0 insertions(+), 10 deletions(-)

diffs (58 lines):

diff -r c69ff73c7a79 -r 2b2fa43686d7 include/liblas/detail/utility.hpp
--- a/include/liblas/detail/utility.hpp	Mon Oct 19 15:38:07 2009 -0400
+++ b/include/liblas/detail/utility.hpp	Mon Oct 19 14:42:01 2009 -0500
@@ -371,8 +371,6 @@
 template <typename T>
 inline void read_n(T& dest, std::istream& src, std::streamsize const& num)
 {
-    assert(src);
-
     // TODO: Review and redesign errors handling logic if necessary
     if (!src)
         throw std::runtime_error("detail::liblas::read_n input stream is not readable");
@@ -388,8 +386,6 @@
 template <>
 inline void read_n<PointRecord>(PointRecord& dest, std::istream& src, std::streamsize const& num)
 {
-    assert(src);
-
     // TODO: Review and redesign errors handling logic if necessary
     if (!src)
         throw std::runtime_error("detail::liblas::read_n input stream is not readable");
@@ -412,8 +408,6 @@
 template <>
 inline void read_n<VLRHeader>(VLRHeader& dest, std::istream& src, std::streamsize const& num)
 {
-    assert(src);
-
     // TODO: Review and redesign errors handling logic if necessary
     if (!src)
         throw std::runtime_error("detail::liblas::read_n input stream is not readable");
@@ -430,7 +424,6 @@
 template <>
 inline void read_n<std::string>(std::string& dest, std::istream& src, std::streamsize const& num)
 {
-    assert(src);
     assert(dest.max_size() >= static_cast<std::string::size_type>(num));
 
     // TODO: Review and redesign errors handling logic if necessary
diff -r c69ff73c7a79 -r 2b2fa43686d7 python/scripts/oci2las.py
--- a/python/scripts/oci2las.py	Mon Oct 19 15:38:07 2009 -0400
+++ b/python/scripts/oci2las.py	Mon Oct 19 14:42:01 2009 -0500
@@ -129,7 +129,6 @@
 
         for i in xrange(num_points):
             rng = ptsize*i,ptsize*(i+1)
-            print num_points, len(blob)
             d = struct.unpack(format,blob[ptsize*i:ptsize*(i+1)])
             x, y, z, blk_id, pt_id = d
             p = point.Point()
@@ -220,8 +219,6 @@
             cur2.execute('SELECT NUM_POINTS, POINTS FROM %s'% cloud.BLK_TABLE)
         
             for num_points, blob in cur2:
-#                num_points, blob = block[0], block[1].read()
-#                print num_points, blob
                 b = blob.read()
                 points.append(self.get_points(num_points,b))