paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-12 17:39:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed 1.0.10 compilation

Browse Source 
git-svn-id: trunk@5344 -
This commit is contained in:
mattias 2004-03-28 12:57:03 +00:00
parent 506f8a7c71
commit 22e70e05cb
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lcl/include/bitmap.inc
View File

@ -694,9 +694,9 @@ var
procedure DoWriteOriginal; procedure DoWriteOriginal;
begin begin
DoWriteStreamSize(Stream,FImage.SaveStream.Size); DoWriteStreamSize(Stream,longint(FImage.SaveStream.Size));
FImage.SaveStream.Position:=0; FImage.SaveStream.Position:=0;
Stream.CopyFrom(FImage.SaveStream,FImage.SaveStream.Size); Stream.CopyFrom(FImage.SaveStream,longint(FImage.SaveStream.Size));
end; end;
Procedure DoWriteSize(Header: TBitmapHeader); Procedure DoWriteSize(Header: TBitmapHeader);
@ -791,7 +791,7 @@ var
var var
Bits: PByte; Bits: PByte;
Header: TBitmapHeader; Header: TBitmapHeader;
StreamSize: longint; StreamSize: TStreamSeekType;
{$ENDIF} {$ENDIF}
begin begin
{$IFNDEF DisableFPImage} {$IFNDEF DisableFPImage}
@ -1173,6 +1173,9 @@ end;
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.81 2004/03/28 12:57:03 mattias
fixed 1.0.10 compilation
Revision 1.80 2004/03/28 12:49:22 mattias Revision 1.80 2004/03/28 12:49:22 mattias
implemented mask merge and extraction for raw images implemented mask merge and extraction for raw images

17
lcl/include/imglist.inc
View File

@ -800,7 +800,8 @@ procedure TCustomImageList.ReadData(AStream: TStream);
AddDirect(bmp, nil); AddDirect(bmp, nil);
end; end;
end; end;
{$IFNDEF DisableFPImage}
procedure CreateImagesFromRawImage(IntfImage: TLazIntfImage; procedure CreateImagesFromRawImage(IntfImage: TLazIntfImage;
NewCount: integer); NewCount: integer);
var var
@ -875,11 +876,14 @@ procedure TCustomImageList.ReadData(AStream: TStream);
MaskIntfImage.Free; MaskIntfImage.Free;
end; end;
end; end;
{$ENDIF}
var var
Signature: array[0..1] of Char; Signature: array[0..1] of Char;
StreamPos: TStreamSeekType; StreamPos: TStreamSeekType;
{$IFNDEF DisableFPImage}
HasMask: Boolean; HasMask: Boolean;
{$ENDIF}
NewCount: Integer; NewCount: Integer;
Size: integer; Size: integer;
begin begin
@ -905,11 +909,13 @@ begin
FHeight := AStream.ReadWord; FHeight := AStream.ReadWord;
//writeln('NewHeight=',FHeight); //writeln('NewHeight=',FHeight);
FBKColor := TColor(AStream.ReadDWord); FBKColor := TColor(AStream.ReadDWord);
{$IFNDEF DisableFPImage}
HasMask := (AStream.ReadWord and 1) = 1; HasMask := (AStream.ReadWord and 1) = 1;
AStream.ReadDWord; //Skip ? AStream.ReadDWord; //Skip ?
AStream.ReadDWord; //Skip ? AStream.ReadDWord; //Skip ?
ReadDelphiImageAndMask(HasMask,NewCount); ReadDelphiImageAndMask(HasMask,NewCount);
{$ENDIF}
end end
else begin else begin
// D2 has no signature, so restore original position // D2 has no signature, so restore original position
@ -917,7 +923,9 @@ begin
AStream.ReadBuffer(Size, SizeOf(Size)); AStream.ReadBuffer(Size, SizeOf(Size));
AStream.ReadBuffer(NewCount, SizeOf(NewCount)); AStream.ReadBuffer(NewCount, SizeOf(NewCount));
ReadDelphiImageAndMask(HasMask,NewCount); {$IFNDEF DisableFPImage}
ReadDelphiImageAndMask(false,NewCount);
{$ENDIF}
end; end;
end; end;
@ -1174,6 +1182,9 @@ end;
{ {
$Log$ $Log$
Revision 1.33 2004/03/28 12:57:03 mattias
fixed 1.0.10 compilation
Revision 1.32 2004/03/28 12:49:22 mattias Revision 1.32 2004/03/28 12:49:22 mattias
implemented mask merge and extraction for raw images implemented mask merge and extraction for raw images