paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-14 19:49:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

* another patch for seeking in compressed streams by Danny Milosavljevic, resolves #12830

Browse Source 
git-svn-id: trunk@12705 -
This commit is contained in:
florian 2009-02-07 21:31:17 +00:00
parent 1f75d8734d
commit d6ba5ab341
3 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -7694,6 +7694,7 @@ tests/test/packages/hash/tmdtest.pp svneol=native#text/plain
tests/test/packages/webtbs/tw10045.pp svneol=native#text/plain tests/test/packages/webtbs/tw10045.pp svneol=native#text/plain
tests/test/packages/webtbs/tw11142.pp svneol=native#text/plain tests/test/packages/webtbs/tw11142.pp svneol=native#text/plain
tests/test/packages/webtbs/tw11570.pp svneol=native#text/plain tests/test/packages/webtbs/tw11570.pp svneol=native#text/plain
tests/test/packages/webtbs/tw12830.pp svneol=native#text/plain
tests/test/packages/webtbs/tw1808.pp svneol=native#text/plain tests/test/packages/webtbs/tw1808.pp svneol=native#text/plain
tests/test/packages/webtbs/tw3820.pp svneol=native#text/plain tests/test/packages/webtbs/tw3820.pp svneol=native#text/plain
tests/test/packages/win-base/tdispvar1.pp svneol=native#text/plain tests/test/packages/win-base/tdispvar1.pp svneol=native#text/plain

8
packages/paszlib/src/zstream.pp
View File

@ -70,6 +70,7 @@ type
raw_read,compressed_read:longint; raw_read,compressed_read:longint;
skipheader:boolean; skipheader:boolean;
procedure reset; procedure reset;
function GetPosition() : Int64; override;
public public
constructor create(Asource:Tstream;Askipheader:boolean=false); constructor create(Asource:Tstream;Askipheader:boolean=false);
destructor destroy;override; destructor destroy;override;
@ -321,6 +322,11 @@ begin
raise Edecompressionerror.create(zerror(err)); raise Edecompressionerror.create(zerror(err));
end; end;
function Tdecompressionstream.GetPosition() : Int64;
begin
GetPosition := raw_read;
end;
function Tdecompressionstream.seek(offset:longint;origin:word):longint; function Tdecompressionstream.seek(offset:longint;origin:word):longint;
var c:longint; var c:longint;
@ -330,7 +336,7 @@ begin
((origin=sofromcurrent) and (offset+raw_read>=0)) then ((origin=sofromcurrent) and (offset+raw_read>=0)) then
begin begin
if origin = sofromcurrent then if origin = sofromcurrent then
seek := compressed_read - offset seek := raw_read + offset
else else
seek := offset; seek := offset;

22
tests/test/packages/webtbs/tw12830.pp Normal file
View File

@ -0,0 +1,22 @@
{$ASSERTIONS ON}
uses zstream, sysutils, classes;
var
fEncoder : zstream.Tcompressionstream;
fDecoder : zstream.Tdecompressionstream;
fExpectedString : Shortstring;
fCompressedStream : TStream;
fBuffer : array[0..9] of Char;
begin
fCompressedStream := TMemoryStream.Create();
fExpectedString := 'test me test me I hope this is compressible test me compressible is test me';
fEncoder := zstream.Tcompressionstream.Create(clMax, fCompressedStream);
fEncoder.Write(fExpectedString[1], Length(fExpectedString));
FreeAndNil(fEncoder);
fCompressedStream.Position := 0;
fDecoder := zstream.Tdecompressionstream.Create(fCompressedStream);
fDecoder.Read(fBuffer, 10);
assert(fDecoder.Position = 10);
end.