mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

FIX: Differ - binary mode

Browse source
This commit is contained in:
Alexander Koblov 2024-02-21 19:48:11 +03:00
commit b9079e7827
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/ubinarydiffviewer.pas
View file

@ -88,7 +88,7 @@ var
X, Y: Integer;
yIndex: Integer;
P1, P2: PAnsiChar;
CurrentPos: PtrInt;
CurrentPos, SecondPos: PtrInt;
Mine, Foreign, WordHex: String;
WordWidth, SymbolWidth: Integer;
MineLength, ForeignLength: Integer;
@ -106,19 +106,20 @@ begin
if Assigned(SecondViewer) then
begin
X := 0;
SecondPos := CurrentPos;
Y := yIndex * FTextHeight;
AddLineOffset(CurrentPos);
// Mine text
Mine := TransformHex(CurrentPos, FHighLimit);
MineLength:= Min(cHexWidth, (Length(Mine) - cHexStartHex) div cWordSize);
// Foreign text
if CurrentPos >= SecondViewer.FHighLimit then
if SecondPos >= SecondViewer.FHighLimit then
begin
Foreign := Mine;
ForeignLength := -1;
end
else begin
Foreign := SecondViewer.TransformHex(CurrentPos, SecondViewer.FHighLimit);
Foreign := SecondViewer.TransformHex(SecondPos, SecondViewer.FHighLimit);
ForeignLength:= (Length(Foreign) - cHexStartHex) div cWordSize;
end;
// Pointers to text