[Liblas-commits] hg-main-tree: fix up block edge accounting

[liblas-commits at liblas.org]

details:   http://hg.libpc.orghg-main-tree/rev/d7d228219024
changeset: 533:d7d228219024
user:      Howard Butler <hobu.inc at gmail.com>
date:      Mon Apr 11 16:30:25 2011 -0500
description:
fix up block edge accounting

diffstat:

 src/drivers/oci/Iterator.cpp |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (23 lines):

diff -r ca57bdc623a2 -r d7d228219024 src/drivers/oci/Iterator.cpp
--- a/src/drivers/oci/Iterator.cpp	Mon Apr 11 15:12:24 2011 -0500
+++ b/src/drivers/oci/Iterator.cpp	Mon Apr 11 16:30:25 2011 -0500
@@ -205,9 +205,8 @@
     
     while (bDidRead)
     {
-
-        numPointsRead = numPointsRead + m_block->num_points;
-        if (numPointsRead > (data.getCapacity() - data.getNumPoints()))
+        boost::uint32_t numReadThisBlock = m_block->num_points;
+        if (numPointsRead + numReadThisBlock > (data.getCapacity() - data.getNumPoints()))
         {
             // We're done.  We still have more data, but the 
             // user is going to have to request another buffer.
@@ -219,6 +218,7 @@
             break;
         }
 
+        numPointsRead = numPointsRead + numReadThisBlock;
         boost::uint32_t nAmountRead = 0;