From 46f7b90ce6cd5b3f03c965ce8a208a0aeefcdb08 Mon Sep 17 00:00:00 2001 From: Mirco Miranda Date: Mon, 16 Sep 2024 17:16:28 +0200 Subject: [PATCH] Fixed read of BGR32 and RGB555 formats --- src/imageformats/jxr.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/imageformats/jxr.cpp b/src/imageformats/jxr.cpp index bb6c626..fe023dd 100644 --- a/src/imageformats/jxr.cpp +++ b/src/imageformats/jxr.cpp @@ -175,8 +175,8 @@ public: // 32-bit if (IsEqualGUID(jxrfmt, GUID_PKPixelFormat32bppBGR)) { - *conversionFormat = GUID_PKPixelFormat32bppRGB; - return QImage::Format_RGBX8888; // Format_RGB32 (?) + *conversionFormat = GUID_PKPixelFormat24bppRGB; + return QImage::Format_RGB888; }; if (IsEqualGUID(jxrfmt, GUID_PKPixelFormat32bppBGRA)) { *conversionFormat = GUID_PKPixelFormat32bppRGBA; @@ -643,7 +643,7 @@ private: << std::pair(QImage::Format_Mono, GUID_PKPixelFormatBlackWhite) << std::pair(QImage::Format_Grayscale8, GUID_PKPixelFormat8bppGray) << std::pair(QImage::Format_Grayscale16, GUID_PKPixelFormat16bppGray) - << std::pair(QImage::Format_RGB555, GUID_PKPixelFormat16bppRGB565) + << std::pair(QImage::Format_RGB555, GUID_PKPixelFormat16bppRGB555) << std::pair(QImage::Format_RGB16, GUID_PKPixelFormat16bppRGB565) << std::pair(QImage::Format_BGR888, GUID_PKPixelFormat24bppBGR) << std::pair(QImage::Format_RGB888, GUID_PKPixelFormat24bppRGB)