Changeset 31 for VarIntSerializer/UVarIntSerializer.pas

Timestamp:

Jun 24, 2010, 4:18:03 PM (14 years ago)

Author:

george

Message:

• Opravy a rozšíření funkčností některých tříd

File:

• VarIntSerializer/UVarIntSerializer.pas (modified) (5 diffs)

VarIntSerializer/UVarIntSerializer.pas

@@ -11 +11 @@
 
 uses
-  Classes, DateUtils, UMemoryStreamEx, Math, Dialogs, SysUtils;
+  Classes, DateUtils, UMemoryStreamEx, Math, Dialogs, SysUtils, USubStream;
 
 const
@@ -42 +42 @@
 
     // Misc methods
-    function TestMask(Mask, BitIndex: Integer): Boolean;
+    function TestMask(Mask: QWord; BitIndex: Byte): Boolean;
     procedure ReadItemByMaskIndex(Index: Integer; Data: TVarIntSerializer);
+    procedure ReadItemRefByMaskIndex(Index: Integer; Data: TSubStream);
     procedure BlockEnclose;
     procedure BlockUnclose;
@@ -310 +311 @@
 end;
 
-function TVarIntSerializer.TestMask(Mask, BitIndex: Integer): Boolean;
+function TVarIntSerializer.TestMask(Mask: QWord; BitIndex: Byte): Boolean;
 begin
   Result := ((Mask shr BitIndex) and 1) = 1;
@@ -322 +323 @@
 begin
   Position := 0;
+  Data.Size := 0;
   Mask := ReadVarUInt;
   I := 0;
@@ -330 +332 @@
   if TestMask(Mask, Index) then
     ReadStream(TStream(Data), GetVarSize);
+  Data.Position := 0;
+end;
+
+procedure TVarIntSerializer.ReadItemRefByMaskIndex(Index:Integer;Data:TSubStream
+  );
+var
+  Mask: Integer;
+  I: Integer;
+begin
+  Position := 0;
+  Data.Size := 0;
+  Mask := ReadVarUInt;
+  I := 0;
+  while (Position < Size) and (I < Index) do begin
+    if TestMask(Mask, I) then Position := Position + GetVarSize;
+    Inc(I);
+  end;
+  if TestMask(Mask, Index) then begin
+    if TStream(Self) is TSubStream then begin
+      // Recalculate substream
+      Data.Source := TSubStream(Self).Source;
+      Data.SourcePosition := TSubStream(Self).SourcePosition + Position;
+    end else begin
+      Data.Source := Self;
+      Data.SourcePosition := Position;
+    end;
+    Data.Size := GetVarSize;
+  end;
+  Data.Position := 0;
 end;