paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-12-05 22:29:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Fixed bug ID #19856 and bug ID #19857 (modified patch from Chad B)

Browse Source 
git-svn-id: trunk@18196 -
This commit is contained in:
michael 2011-08-13 18:59:33 +00:00
parent 1dfa1d5f26
commit 55ff531bd4
1 changed files with 2 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
packages/fcl-res/src/resdatastream.pp
View File

@ -33,12 +33,9 @@ type
procedure SetPosition(const Pos: Int64); override;
function GetSize: Int64; override;
procedure SetSize64(const NewSize: Int64); override;
procedure SetSize(NewSize: Longint); override;
procedure SetSize(const NewSize: Int64); override;
public
constructor Create(aStream : TStream; aResource : TAbstractResource; aSize : int64); virtual;
function Write(const Buffer; Count: Longint): Longint; override;
function Seek(Offset: Longint; Origin: Word): Longint; override;
function Seek(const Offset: Int64; Origin: TSeekOrigin): Int64; override;
end;
@ -74,8 +71,6 @@ type
procedure SetPosition(const Pos: Int64); override;
function GetSize: Int64; override;
procedure SetSize64(const NewSize: Int64); override;
procedure SetSize(NewSize: Longint); override;
procedure SetSize(const NewSize: Int64); override;
public
constructor Create(aStream : TStream; aResource : TAbstractResource; aSize : int64; aClass: TCachedStreamClass);
destructor Destroy; override;
@ -83,7 +78,6 @@ type
procedure SetCustomStream(aStream : TStream);
function Read(var Buffer; Count: Longint): Longint; override;
function Write(const Buffer; Count: Longint): Longint; override;
function Seek(Offset: Longint; Origin: Word): Longint; override;
function Seek(const Offset: Int64; Origin: TSeekOrigin): Int64; override;
property Cached : boolean read GetCached write SetCached;
end;
@ -112,16 +106,6 @@ begin
raise EInvalidOperation.Create('');
end;
procedure TCachedDataStream.SetSize(NewSize: Longint);
begin
SetSize64(NewSize);
end;
procedure TCachedDataStream.SetSize(const NewSize: Int64);
begin
SetSize64(NewSize);
end;
constructor TCachedDataStream.Create(aStream: TStream; aResource : TAbstractResource; aSize : int64);
begin
fStream:=aStream;
@ -134,12 +118,6 @@ begin
raise EInvalidOperation.Create('');
end;
function TCachedDataStream.Seek(Offset: Longint; Origin: Word
): Longint;
begin
Result:=Seek(Offset,TSeekOrigin(Origin));
end;
function TCachedDataStream.Seek(const Offset: Int64; Origin: TSeekOrigin
): Int64;
var newpos : int64;
@ -147,7 +125,7 @@ begin
case Origin of
soBeginning : newpos:=Offset;
soCurrent : newpos:=Position+Offset;
soEnd : newpos:=fSize-Offset;
soEnd : newpos:=fSize+Offset;
end;
SetPosition(newpos);
Result:=Position;
@ -232,16 +210,6 @@ begin
fStream.Size:=NewSize;
end;
procedure TResourceDataStream.SetSize(NewSize: Longint);
begin
SetSize64(NewSize);
end;
procedure TResourceDataStream.SetSize(const NewSize: Int64);
begin
SetSize64(NewSize);
end;
constructor TResourceDataStream.Create(aStream: TStream; aResource :
TAbstractResource; aSize : int64; aClass: TCachedStreamClass);
begin
@ -327,10 +295,6 @@ begin
Result:=fStream.Write(Buffer,Count);
end;
function TResourceDataStream.Seek(Offset: Longint; Origin: Word): Longint;
begin
Result:=Seek(Offset,TSeekOrigin(Origin));
end;
function TResourceDataStream.Seek(const Offset: Int64; Origin: TSeekOrigin
): Int64;
@ -339,7 +303,7 @@ begin
case Origin of
soBeginning : newpos:=Offset;
soCurrent : newpos:=Position+Offset;
soEnd : newpos:=Size-Offset;
soEnd : newpos:=Size+Offset;
end;
SetPosition(newpos);
Result:=Position;