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: Wrong text decoding in internal differ tool (fixes #1816)

Browse source
This commit is contained in:
Alexander Koblov 2024-09-07 01:26:37 +03:00
commit 65b46ae819
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/ubinarydiffviewer.pas
View file

@ -70,7 +70,7 @@ type
implementation
uses
Math;
Math, LazUTF8;
const
cHexWidth = 16;
@ -87,6 +87,7 @@ var
I: Integer;
X, Y: Integer;
yIndex: Integer;
CharLen: Integer;
P1, P2: PAnsiChar;
CurrentPos, SecondPos: PtrInt;
Mine, Foreign, WordHex: String;
@ -144,12 +145,19 @@ begin
end;
Inc(X, SymbolWidth);
// Write ASCII part
WordHex:= Copy(Mine, cHexStartAscii + 1, cHexWidth);
for I:= 1 to Length(WordHex) do
WordHex:= Copy(Mine, cHexStartAscii + 1, MaxInt);
I:= 0;
P1:= PAnsiChar(WordHex);
P2:= P1 + Length(WordHex);
while (P1 < P2) do
begin
Canvas.Font.Color := SymbolColor[I - 1];
Canvas.TextOut(X, Y, WordHex[I]);
CharLen := UTF8CodepointSize(P1);
if (CharLen = 0) then Break;
Canvas.Font.Color := SymbolColor[I];
Canvas.TextOut(X, Y, Copy(P1, 1, CharLen));
Inc(X, SymbolWidth);
Inc(P1, CharLen);
Inc(I);
end;
Canvas.Font.Color := clWindowText;
end;