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 byte order when read JPEG image using libturbojpeg under macOS (issue #1290)

Browse source 
(cherry picked from commit 337c6ef4dc)
This commit is contained in:
Alexander Koblov 2023-09-29 22:37:47 +03:00
commit dbdb689e61
1 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/platform/uturbojpeg.pas
View file

@ -107,11 +107,25 @@ begin
TLazIntfImage(Img).DataDescription:= QueryDescription([riqfRGB, riqfAlpha], AWidth, AHeight);
case TLazIntfImage(Img).DataDescription.RedShift of
0: AFormat:= TJPF_RGBA;
8: AFormat:= TJPF_ARGB;
16: AFormat:= TJPF_BGRA;
24: AFormat:= TJPF_ABGR;
with TLazIntfImage(Img).DataDescription do
begin
if ByteOrder = riboLSBFirst then
begin
case RedShift of
0: AFormat:= TJPF_RGBA;
8: AFormat:= TJPF_ARGB;
16: AFormat:= TJPF_BGRA;
24: AFormat:= TJPF_ABGR;
end;
end
else begin
case RedShift of
0: AFormat:= TJPF_ABGR;
8: AFormat:= TJPF_BGRA;
16: AFormat:= TJPF_ARGB;
24: AFormat:= TJPF_RGBA;
end;
end;
end;
if tjDecompress2(jpegDecompressor, AStream.Memory, ASize, TLazIntfImage(Img).PixelData, AWidth, 0, AHeight, cint(AFormat), TJFLAG_ACCURATEDCT) < 0 then