Tweak / optimization.

git-svn-id: trunk@64372 -
This commit is contained in:
juha 2021-01-10 19:07:46 +00:00
parent b7ec76d98e
commit a9aa51a93d
2 changed files with 10 additions and 8 deletions

View File

@ -1087,10 +1087,9 @@ begin
else begin else begin
MaxBytes:=PtrInt(PChar(s)+length(s)-StartBytePos); MaxBytes:=PtrInt(PChar(s)+length(s)-StartBytePos);
EndBytePos:=UTF8CodepointStart(StartBytePos,MaxBytes,CharCount); EndBytePos:=UTF8CodepointStart(StartBytePos,MaxBytes,CharCount);
if EndBytePos=nil then if EndBytePos<>nil then
Result:=copy(s,StartBytePos-PChar(s)+1,MaxBytes) MaxBytes:=EndBytePos-StartBytePos;
else Result:=copy(s,StartBytePos-PChar(s)+1,MaxBytes);
Result:=copy(s,StartBytePos-PChar(s)+1,EndBytePos-StartBytePos);
end; end;
end; end;

View File

@ -776,6 +776,7 @@ procedure TLazPackageGraphFileCache.Update;
var var
I, L: Integer; I, L: Integer;
xPck: TLazPackage; xPck: TLazPackage;
PkgFile: TPkgFile;
begin begin
SetLength(FPackageInfo, FGraph.Count); SetLength(FPackageInfo, FGraph.Count);
FFilesList.Clear; FFilesList.Clear;
@ -788,13 +789,15 @@ begin
for L := 0 to xPck.FileCount-1 do for L := 0 to xPck.FileCount-1 do
begin begin
FFilesList[xPck.Files[L].GetFullFilename]:=xPck.Files[L]; PkgFile := xPck.Files[L];
FFilesList[xPck.Files[L].Filename]:=xPck.Files[L]; FFilesList[PkgFile.GetFullFilename]:=PkgFile;
FFilesList[PkgFile.Filename]:=PkgFile;
end; end;
for L := 0 to xPck.RemovedFilesCount-1 do for L := 0 to xPck.RemovedFilesCount-1 do
begin begin
FRemovedFilesList[xPck.RemovedFiles[L].GetFullFilename]:=xPck.RemovedFiles[L]; PkgFile := xPck.RemovedFiles[L];
FRemovedFilesList[xPck.RemovedFiles[L].Filename]:=xPck.RemovedFiles[L]; FRemovedFilesList[PkgFile.GetFullFilename]:=PkgFile;
FRemovedFilesList[PkgFile.Filename]:=PkgFile;
end; end;
end; end;
end; end;