Changeset 307

Timestamp:

Jan 3, 2012, 10:36:55 AM (12 years ago)

Author:

chronos

Message:

• Modified: Assign methods of TStreamHelper, TVarBlockSerializer and TVarBlockIndexed.

Location:

CoolStreaming

Files:

• UStreamHelper.pas (modified) (2 diffs)
• UVarBlockSerializer.pas (modified) (8 diffs)

CoolStreaming/UStreamHelper.pas

@@ -23 +23 @@
     procedure SetItem(Index: Integer; const AValue: Byte);
   public
+    procedure Assign(Source: TStreamHelper);
     procedure WriteByte(Data: Byte);
     procedure WriteWord(Data: Word);
@@ -281 +282 @@
 end;
 
+procedure TStreamHelper.Assign(Source: TStreamHelper);
+var
+  OldPosition: Integer;
+begin
+  OldPosition := Source.Position;
+  Clear;
+  WriteStream(Source, Source.Size);
+  Source.Position := OldPosition;
+  Position := OldPosition;
+end;
+
 procedure TStreamHelper.WriteAnsiString(Data: string);
 var

CoolStreaming/UVarBlockSerializer.pas

@@ -56 +56 @@
     procedure BlockEnclose;
     procedure BlockUnclose;
+    procedure Assign(Source: TVarBlockSerializer);
     constructor Create;
     destructor Destroy; override;
-    procedure Assign(Source: TVarBlockSerializer);
     property Stream: TStream read FStream write SetStream;
   end;
@@ -70 +70 @@
     Enclose: Boolean;
     procedure CheckItem(Index: Integer);
+    procedure Assign(Source: TVarBlockIndexed);
 
     // Base
@@ -101 +102 @@
     constructor Create;
     destructor Destroy; override;
-    procedure Assign(Source: TVarBlockIndexed);
   end;
 
@@ -568 +568 @@
 end;
 
+procedure TVarBlockSerializer.Assign(Source: TVarBlockSerializer);
+var
+  OldPos: Integer;
+begin
+  OwnsStream := Source.OwnsStream;
+  FStream.Size := 0;
+  OldPos := Source.FStream.Position;
+  FStream.CopyFrom(Source.FStream, Source.FStream.Size);
+  Source.FStream.Position := OldPos;
+  FStream.Position := OldPos;
+end;
+
 constructor TVarBlockSerializer.Create;
 begin
@@ -582 +594 @@
   end;
   inherited Destroy;
-end;
-
-procedure TVarBlockSerializer.Assign(Source: TVarBlockSerializer);
-var
-  Helper: TStreamHelper;
-  LastPos: Integer;
-begin
-  OwnsStream := Source.OwnsStream;
-  FStream.Size := 0;
-  try
-    Helper := TStreamHelper.Create(Source.FStream);
-    LastPos := Source.FStream.Position;
-    Source.FStream.Position := 0;
-    Helper.ReadStream(FStream, Source.FStream.Size);
-    Source.FStream.Position := LastPos;
-  finally
-    Helper.Free;
-  end;
-  FStream.Position := Source.FStream.Position;
 end;
 
@@ -617 +610 @@
 end;
 
+procedure TVarBlockIndexed.Assign(Source: TVarBlockIndexed);
+var
+  I: Integer;
+begin
+  Enclose := Source.Enclose;
+  Items.Count := 0;
+  Items.Count := Source.Items.Count;
+  for I := 0 to Items.Count - 1 do begin
+    Items[I] := TVarBlockSerializer.Create;
+    TVarBlockSerializer(Items[I]).Assign(TVarBlockSerializer(Source.Items[I]));
+  end;
+end;
+
 procedure TVarBlockIndexed.WriteVarUInt(Index:Integer;Value:QWord);
 begin
@@ -798 +804 @@
   if (Index >= 0) and (Index < Items.Count) then
     Result := Assigned(Items[Index])
-    else Result := False;
+    else Result := False
 end;
 
@@ -885 +891 @@
 end;
 
-procedure TVarBlockIndexed.Assign(Source: TVarBlockIndexed);
-var
-  I: Integer;
-begin
-  Enclose := Source.Enclose;
-  Items.Count := Source.Items.Count;
-  for I := 0 to Items.Count - 1 do begin
-    CheckItem(I);
-    TVarBlockSerializer(Items[I]).Assign(TVarBlockSerializer(Source.Items[I]));
-  end;
-end;
-
 end.