Changeset 1586

Timestamp:

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

Author:

chris

Message:

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

Location:

box/chris/merge/lib/common

Files:

• PartialReadStream.cpp (modified) (1 diff)
• PartialReadStream.h (modified) (2 diffs)
• ReadGatherStream.cpp (modified) (2 diffs)

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

@@ -17 +17 @@
 //
 // Function
-//              Name:    PartialReadStream::PartialReadStream(IOStream &, int)
-//              Purpose: Constructor, taking another stream and the number of bytes
-//                               to be read from it.
+//              Name:    PartialReadStream::PartialReadStream(IOStream &,
+//                       pos_type)
+//              Purpose: Constructor, taking another stream and the number of
+//                       bytes to be read from it.
 //              Created: 2003/08/26
 //
 // --------------------------------------------------------------------------
-PartialReadStream::PartialReadStream(IOStream &rSource, int BytesToRead)
+PartialReadStream::PartialReadStream(IOStream &rSource,
+        pos_type BytesToRead)
         : mrSource(rSource),
           mBytesLeft(BytesToRead)

box/chris/merge/lib/common/PartialReadStream.h

@@ -24 +24 @@
 {
 public:
-        PartialReadStream(IOStream &rSource, int BytesToRead);
+        PartialReadStream(IOStream &rSource, pos_type BytesToRead);
         ~PartialReadStream();
 private:
@@ -40 +40 @@
 private:
         IOStream &mrSource;
-        int mBytesLeft;
+        pos_type mBytesLeft;
 };
 

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