* fix for Mantis #38023: the code to convert LF to CRLF when converting to UTF-8 is disabled anyway, so disable unnecessary, duplicate if-branches as well

git-svn-id: trunk@47284 -
This commit is contained in:
svenbarth 2020-11-02 16:42:32 +00:00
parent 6ed331d6e7
commit c2454d5386

View File

@ -1833,9 +1833,9 @@ end;
if (IBYTE and $80) = 0 then
begin
//One character US-ASCII, convert it to unicode
(*
if IBYTE = 10 then
begin
(*
If (PreChar<>13) and FALSE then
begin
//Expand to crlf, conform UTF-8.
@ -1856,7 +1856,6 @@ end;
end;
end
else
*)
begin
Dest[OutputUnicode]:=WideChar(IBYTE);
inc(OutputUnicode);
@ -1864,6 +1863,7 @@ end;
end;
end
else
*)
begin
Dest[OutputUnicode]:=WideChar(IBYTE);
inc(OutputUnicode);
@ -1978,9 +1978,9 @@ end;
if (IBYTE and $80) = 0 then
begin
//One character US-ASCII, convert it to unicode
(*
if IBYTE = 10 then
begin
(*
if (PreChar<>13) and FALSE then
begin
//Expand to crlf, conform UTF-8.
@ -1990,13 +1990,13 @@ end;
PreChar:=10;
end
else
*)
begin
inc(OutputUnicode);
PreChar:=IBYTE;
end;
end
else
*)
begin
inc(OutputUnicode);
PreChar:=IBYTE;