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

LCL: fix range error when reading an ImageList made with Delphi. Issue #19454

Browse Source 
git-svn-id: trunk@31019 -
This commit is contained in:
juha 2011-06-03 00:28:50 +00:00
parent 74a398b683
commit a4437fdf73
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lcl/graphtype.pp
View File

@ -1284,6 +1284,7 @@ procedure TRawImage.ExtractRect(const ARect: TRect; out ADst: TRawImage);
SrcLineStarts, DstLineStarts: TRawImageLineStarts;
SrcStartPos, SrcEndPos, DstStartPos: TRawImagePosition;
Shift0, Shift1: Byte;
DstW1: Word;
SrcPos: PByte;
DstPos: PByte;
ByteCount: PtrUInt;
@ -1351,7 +1352,8 @@ procedure TRawImage.ExtractRect(const ARect: TRect; out ADst: TRawImage);
// dst[byte|bit]: 12 11 10 07 06 05 04 03 :
for x := 0 to ByteCount - 1 do
begin
DstPos^ := (SrcPos[0] shr Shift0) or (SrcPos[1] shl Shift1);
DstW1 := SrcPos[0] shl Shift0;
DstPos^ := Byte(DstW1 or (SrcPos[1] shr Shift1));
inc(SrcPos);
inc(DstPos);
end;
@ -1362,7 +1364,8 @@ procedure TRawImage.ExtractRect(const ARect: TRect; out ADst: TRawImage);
// dst[byte|bit]: 04 03 02 01 00 17 16 15 :
for x := 0 to ByteCount - 1 do
begin
DstPos^ := (SrcPos[0] shl Shift0) or (SrcPos[1] shr Shift1);
DstW1 := SrcPos[0] shl Shift0;
DstPos^ := Byte(DstW1 or (SrcPos[1] shr Shift1));
inc(SrcPos);
inc(DstPos);
end;