paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-08 15:27:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Graphics: Fix TPicture.LoadFromStream not detecting ico and cur graphics. Issue #41872.

Browse Source
This commit is contained in:
wp_xyz 2025-10-30 19:57:40 +01:00
parent 26fdc1786d
commit 3d86f3b9cf
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lcl/graphics.pp
View File

@ -1638,6 +1638,7 @@ type
function InternalReleaseBitmapHandle: HBITMAP; override; function InternalReleaseBitmapHandle: HBITMAP; override;
function InternalReleaseMaskHandle: HBITMAP; override; function InternalReleaseMaskHandle: HBITMAP; override;
function InternalReleasePalette: HPALETTE; override; function InternalReleasePalette: HPALETTE; override;
class function IsStreamFormatSupported(Stream: TStream): Boolean; override;
procedure ReadData(Stream: TStream); override; procedure ReadData(Stream: TStream); override;
procedure ReadStream(AStream: TMemoryStream; ASize: Longint); override; procedure ReadStream(AStream: TMemoryStream; ASize: Longint); override;
procedure SetMasked(AValue: Boolean); override; procedure SetMasked(AValue: Boolean); override;

11
lcl/include/icon.inc
View File

@ -665,6 +665,17 @@ begin
else Result := TIconImage(TSharedIcon(FSharedImage).FImages[FCurrent]).ReleasePalette; else Result := TIconImage(TSharedIcon(FSharedImage).FImages[FCurrent]).ReleasePalette;
end; end;
class function TCustomIcon.IsStreamFormatSupported(Stream: TStream): Boolean;
var
Signature: array[0..3] of Byte;
Position: UInt64;
begin
Position := Stream.Position;
Stream.Read(Signature, SizeOf(Signature));
Stream.Position := Position;
Result := (Cardinal(Signature) = GetStreamSignature);
end;
function TCustomIcon.LazarusResourceTypeValid(const ResourceType: string): boolean; function TCustomIcon.LazarusResourceTypeValid(const ResourceType: string): boolean;
var var
ResType: String; ResType: String;