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

LCL: ImgList - reverted r59880 and r59888 #5e3ff3cf84 because of crashes on non win32 widgetsets. issue #34708

Browse Source 
git-svn-id: trunk@59889 -
This commit is contained in:
zeljko 2018-12-21 16:56:47 +00:00
parent 5e3ff3cf84
commit 2de386c531
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lcl/include/imglist.inc
View File

@ -326,13 +326,14 @@ begin
if n <> 0
then Inc(ACount, FImageList.FAllocBy - n);
SetLength(FData, ACount * FWidth * FHeight);
FAllocCount := ACount;
SetLength(FData, ACount * FWidth * FHeight * SizeOf(FData[0]));
Inc(FAllocCount, ACount);
end;
procedure TCustomImageListResolution.CheckIndex(AIndex: Integer;
AForInsert: Boolean);
// avoid exceptionframe generation
// aviod exceptionframe generation
procedure Error;
begin
raise EInvalidOperation.Create(SInvalidIndex);
@ -1459,7 +1460,7 @@ begin
ToR.AllocData(ToR.FCount);
if ToR.FCount>0 then
begin
DataSize := ToR.FWidth * ToR.FHeight; {issue #34708 * SizeOf(FData[0])};
DataSize := ToR.FWidth * ToR.FHeight * SizeOf(FData[0]);
System.Move(FromR.FData[0], ToR.FData[0], ToR.FCount * DataSize);
end;
end;