From 4ff3d56bcfd2b2ea84f0e19fc089756c3c41bc02 Mon Sep 17 00:00:00 2001 From: cylien Date: Mon, 16 Mar 2026 19:26:53 +0800 Subject: [PATCH] feat: fix incorrect rendering of JPEG Lossless images with RGB photometric interpretation Ensure compatibility when displaying images where Photometric Interpretation (0028,0004) is RGB but PixelData in JPEG Lossless is encoded as YBR, which previously caused incorrect rendering --- bluelight/scripts/dicomloader.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bluelight/scripts/dicomloader.js b/bluelight/scripts/dicomloader.js index adb95ba..c82cb82 100644 --- a/bluelight/scripts/dicomloader.js +++ b/bluelight/scripts/dicomloader.js @@ -198,7 +198,11 @@ function getPixelDataFromDataSet(imageObj, dataSet, frameIndex = 0) { } } function YBR(imageObj, dataSet, pixelData) { - if ((imageObj.isYCbCr || dataSet.string('x00280004') === 'YBR_FULL_422' || dataSet.string('x00280004') === 'YBR_FULL') && imageObj.color) { + var photometric = dataSet.string('x00280004'); + // PhotometricInterpretation=RGB 時，即使 JPEG 解碼器標記了 isYCbCr，也不應再做轉換 + // 因為 JPEG codec 解碼時已將 YCbCr 轉回 RGB，isYCbCr 此時為誤判 + if ((imageObj.isYCbCr && photometric !== 'RGB') || photometric === 'YBR_FULL_422' || photometric === 'YBR_FULL') { + if (!imageObj.color) return pixelData; for (var i = 0; i < pixelData.length; i += 3) { var R = pixelData[i] + 1.402 * (pixelData[i + 2] - 128); var G = pixelData[i] - 0.344136 * (pixelData[i + 1] - 128) - 0.714136 * (pixelData[i + 2] - 128);