Changeset 1586 for box/chris/merge/lib/common/ReadGatherStream.cpp

Timestamp:

28/04/2007 18:13:34 (5 years ago)

Author:

chris

Message:

Fix inability to handle streams over 2GB properly. (refs #3)

File:

• box/chris/merge/lib/common/ReadGatherStream.cpp (modified) (2 diffs)

box/chris/merge/lib/common/ReadGatherStream.cpp

@@ -60 +60 @@
 // Function
 //              Name:    ReadGatherStream::AddComponent(IOStream *)
-//              Purpose: Add a component to this stream, returning the index of this component
-//                               in the internal list. Use this with AddBlock()
+//              Purpose: Add a component to this stream, returning the index
+//                       of this component in the internal list. Use this
+//                       with AddBlock()
 //              Created: 10/12/03
 //
@@ -146 +147 @@
                 {
                         // Read!
-                        int s = mBlocks[mCurrentBlock].mLength - mPositionInCurrentBlock;
+                        pos_type s = mBlocks[mCurrentBlock].mLength - mPositionInCurrentBlock;
                         if(s > bytesToRead) s = bytesToRead;
                         
-                        int r = mComponents[mBlocks[mCurrentBlock].mComponent]->Read(buffer, s, Timeout);
+                        pos_type r = mComponents[mBlocks[mCurrentBlock].mComponent]->Read(buffer, s, Timeout);
                         
                         // update variables