waveterm/xterm.js
0
0
Fork 0
mirror of https://github.com/wavetermdev/xterm.js.git synced 2026-08-05 13:43:48 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5139 from lusingander/image-addon-iip-jpeg

Browse Source 
Fix image addon not being able to render some jpeg images in IIP
This commit is contained in:
jerch
2024-08-28 16:28:30 +02:00
committed by GitHub
parent f186475ec9 b307adb081
commit 1b48cd04b8
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/addon-image/fixture/testimages/w3c_home_noexif.jpg
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

addons/addon-image/src/IIPMetrics.test.ts
+1
View File
@@ -25,6 +25,7 @@ const TEST_IMAGES: [string, IMetrics][] = [
['w3c_home_gray.png', { mime: 'image/png', width: 72, height: 48 }],
['w3c_home.jpg', { mime: 'image/jpeg', width: 72, height: 48 }],
['w3c_home.png', { mime: 'image/png', width: 72, height: 48 }],
['w3c_home_noexif.jpg', { mime: 'image/jpeg', width: 72, height: 48 }],
['spinfox.png', { mime: 'image/png', width: 148, height: 148 }],
['iphone_hdr_YES.jpg', { mime: 'image/jpeg', width: 3264, height: 2448 }],
['nikon-e950.jpg', { mime: 'image/jpeg', width: 800, height: 600 }],
addons/addon-image/src/IIPMetrics.ts
+2 -7
View File
@@ -32,13 +32,8 @@ export function imageType(d: Uint8Array): IMetrics {
height: d[20] << 24 | d[21] << 16 | d[22] << 8 | d[23]
};
}
// JPEG: FF D8 FF E0 xx xx JFIF or FF D8 FF E1 xx xx Exif 00 00
if ((d32[0] === 0xE0FFD8FF || d32[0] === 0xE1FFD8FF)
&& (
(d[6] === 0x4a && d[7] === 0x46 && d[8] === 0x49 && d[9] === 0x46)
|| (d[6] === 0x45 && d[7] === 0x78 && d[8] === 0x69 && d[9] === 0x66)
)
) {
// JPEG: FF D8 FF
if (d[0] === 0xFF && d[1] === 0xD8 && d[2] === 0xFF) {
const [width, height] = jpgSize(d);
return { mime: 'image/jpeg', width, height };
}