Changeset 291 for CoolStreaming/UStreamHelper.pas

Timestamp:

Nov 4, 2011, 11:46:15 AM (13 years ago)

Author:

george

Message:

• Modified: Method of StreamHelper for reading string data with defined length.
• Modified: BitStream now use class TPositionMemory from package Common instead of TMemoryStream for storing data. TMemoryStream allocate too huge data (4 kB) even if only few bytes are used.

File:

• CoolStreaming/UStreamHelper.pas (modified) (4 diffs)

CoolStreaming/UStreamHelper.pas

@@ -39 +39 @@
     function ReadCardinal: Cardinal;
     function ReadInt64: Int64;
-    function ReadString: string;
+    function ReadString(Length: Integer): string;
     function ReadShortString: string;
     function ReadAnsiString: string;
@@ -73 +73 @@
 begin
   FStream.ReadBuffer(StringLength, SizeOf(StringLength));
-  SetLength(Result, StringLength);
-  if StringLength > 0 then begin
-    FStream.ReadBuffer(Result[1], StringLength);
-  end;
+  Result := ReadString(StringLength);
 end;
 
@@ -119 +116 @@
 end;
 
-function TStreamHelper.ReadString:string;
-begin
-  SetLength(Result, FStream.Size - FStream.Position);
-  if (FStream.Size - FStream.Position) > 0 then
-    FStream.Read(Result[1], FStream.Size - FStream.Position)
-    else Result := '';
+function TStreamHelper.ReadString(Length: Integer): string;
+begin
+  if Length > 0 then begin
+    SetLength(Result, Length);
+    FStream.Read(Result[1], Length);
+  end else Result := '';
 end;
 
@@ -132 +129 @@
 begin
   FStream.ReadBuffer(Count, 1);
-  SetLength(Result, Count);
-  FStream.ReadBuffer(Result[1], Count);
+  Result := ReadString(Count);
 end;