* 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 -
(cherry picked from commit c2454d5386)
This commit is contained in:
svenbarth 2020-11-02 16:42:32 +00:00 committed by marcoonthegit
parent d1c29e6cb9
commit 0de9940d01

View File

@ -1842,6 +1842,7 @@ 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
@ -1871,6 +1872,7 @@ end;
end;
end
else
*)
begin
Dest[OutputUnicode]:=WideChar(IBYTE);
inc(OutputUnicode);
@ -1985,6 +1987,7 @@ 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
@ -2002,6 +2005,7 @@ end;
end;
end
else
*)
begin
inc(OutputUnicode);
PreChar:=IBYTE;