Pull in PR #233 by https://github.com/qbnu

README.md

@@ -15,7 +15,7 @@ JPEGView is a lean, fast and highly configurable image viewer/editor with a mini
 JPEGView has built-in support the following formats:
 
 * Popular: JPEG, GIF
-* Lossless: BMP, PNG, TIFF
+* Lossless: BMP, PNG, TIFF, PSD
 * Web: WEBP, JXL, HEIF/HEIC, AVIF
 * Legacy: TGA, WDP, HDP, JXR
 * Camera RAW formats:

src/JPEGView.Setup/Product.wxs

@@ -421,6 +421,7 @@
 						<RegistryValue Root="HKLM" Key="SOFTWARE\Classes\Applications\JPEGView.exe\SupportedTypes" Name=".heic" Value="" Type="string" />
 						<RegistryValue Root="HKLM" Key="SOFTWARE\Classes\Applications\JPEGView.exe\SupportedTypes" Name=".tga" Value="" Type="string" />
 						<RegistryValue Root="HKLM" Key="SOFTWARE\Classes\Applications\JPEGView.exe\SupportedTypes" Name=".qoi" Value="" Type="string" />
+						<RegistryValue Root="HKLM" Key="SOFTWARE\Classes\Applications\JPEGView.exe\SupportedTypes" Name=".psd" Value="" Type="string" />
 						<!-- csFileEndingsRAW -->
 						<RegistryValue Root="HKLM" Key="SOFTWARE\Classes\Applications\JPEGView.exe\SupportedTypes" Name=".pef" Value="" Type="string" />
 						<RegistryValue Root="HKLM" Key="SOFTWARE\Classes\Applications\JPEGView.exe\SupportedTypes" Name=".dng" Value="" Type="string" />

src/JPEGView/EXIFDisplayCtl.cpp

@@ -126,6 +126,8 @@ void CEXIFDisplayCtl::FillEXIFDataDisplay() {
 			}
 			if (pEXIFReader->GetAcquisitionTimePresent()) {
 				m_pEXIFDisplay->AddLine(CNLS::GetString(_T("Acquisition date:")), pEXIFReader->GetAcquisitionTime());
+			} else if (pEXIFReader->GetDateTimePresent()) {
+				m_pEXIFDisplay->AddLine(CNLS::GetString(_T("Date Time:")), pEXIFReader->GetDateTime());
 			} else {
 				const FILETIME* pFileTime = pFileList->CurrentModificationTime();
 				if (pFileTime != NULL) {
@@ -161,6 +163,9 @@ void CEXIFDisplayCtl::FillEXIFDataDisplay() {
 			if (pEXIFReader->GetISOSpeedPresent()) {
 				m_pEXIFDisplay->AddLine(CNLS::GetString(_T("ISO Speed:")), (int)pEXIFReader->GetISOSpeed());
 			}
+			if (pEXIFReader->GetSoftwarePresent()) {
+				m_pEXIFDisplay->AddLine(CNLS::GetString(_T("Software:")), pEXIFReader->GetSoftware());
+			}
 		}
 		else if (pRawMetaData != NULL) {
 			if (pRawMetaData->GetAcquisitionTime().wYear > 1985) {

src/JPEGView/EXIFReader.cpp

@@ -245,6 +245,7 @@ CEXIFReader::CEXIFReader(void* pApp1Block, EImageFormat eImageFormat)
 : m_exposureTime(0, 0) {
 
 	memset(&m_acqDate, 0, sizeof(SYSTEMTIME));
+	memset(&m_dateTime, 0, sizeof(SYSTEMTIME));
 	m_bFlashFired = false;
 	m_bFlashFlagPresent = false;
 	m_dFocalLength = m_dExposureBias = m_dFNumber = UNKNOWN_DOUBLE_VALUE;
@@ -327,6 +328,14 @@ CEXIFReader::CEXIFReader(void* pApp1Block, EImageFormat eImageFormat)
 		}
 	}
 
+	uint8* pTagSoftware = FindTag(pIFD0, pLastIFD0, 0x0131, bLittleEndian);
+	ReadStringTag(m_sSoftware, pTagSoftware, pTIFFHeader, bLittleEndian);
+
+	uint8* pTagModDate = FindTag(pIFD0, pLastIFD0, 0x0132, bLittleEndian);
+	CString sModDate;
+	ReadStringTag(sModDate, pTagModDate, pTIFFHeader, bLittleEndian);
+	ParseDateString(m_dateTime, sModDate);
+
 	uint8* pTagEXIFIFD = FindTag(pIFD0, pLastIFD0, 0x8769, bLittleEndian);
 	if (pTagEXIFIFD == NULL) {
 		return;

src/JPEGView/EXIFReader.h

@@ -57,10 +57,15 @@ class CEXIFReader {
 	LPCTSTR GetCameraModel() { return m_sModel; }
 	LPCTSTR GetUserComment() { return m_sUserComment; }
 	LPCTSTR GetImageDescription() { return m_sImageDescription; }
+	LPCTSTR GetSoftware() { return m_sSoftware; }
 	bool GetCameraModelPresent() { return !m_sModel.IsEmpty(); }
+	bool GetSoftwarePresent() { return !m_sSoftware.IsEmpty(); }
 	// Date-time the picture was taken
 	const SYSTEMTIME& GetAcquisitionTime() { return m_acqDate; }
 	bool GetAcquisitionTimePresent() { return m_acqDate.wYear > 1600; }
+	// Date-time the picture was saved/modified (used by editing software)
+	const SYSTEMTIME& GetDateTime() { return m_dateTime; }
+	bool GetDateTimePresent() { return m_dateTime.wYear > 1600; }
 	// Exposure time
 	const Rational& GetExposureTime() { return m_exposureTime; }
 	bool GetExposureTimePresent() { return m_exposureTime.Denominator != 0; }
@@ -114,7 +119,9 @@ class CEXIFReader {
 	CString m_sModel;
 	CString m_sUserComment;
 	CString m_sImageDescription;
+	CString m_sSoftware;
 	SYSTEMTIME m_acqDate;
+	SYSTEMTIME m_dateTime;
 	Rational m_exposureTime;
 	double m_dExposureBias;
 	bool m_bFlashFired;

src/JPEGView/FileExtensionsDlg.cpp

@@ -291,6 +291,7 @@ void CFileExtensionsDlg::FillFileExtensionsList() {
 	InsertExtension(_T("*.heif"), FormatHint(CNLS::GetString(_T("%s images")), _T("High Efficiency Image File")));
 	InsertExtension(_T("*.heic"), FormatHint(CNLS::GetString(_T("%s images")), _T("High Efficiency Image Container")));
 	InsertExtension(_T("*.qoi"), FormatHint(CNLS::GetString(_T("%s images")), _T("Quite OK Image")));
+	InsertExtension(_T("*.psd"), FormatHint(CNLS::GetString(_T("%s images")), _T("Photoshop Document")));
 	InsertExtensions(CSettingsProvider::This().FilesProcessedByWIC(), CNLS::GetString(_T("%s images (processed by Window Imaging Component - WIC)")));
 	InsertExtensions(CSettingsProvider::This().FileEndingsRAW(), CNLS::GetString(_T("%s camera raw images (embedded JPEGs only)")));
 }

src/JPEGView/FileList.cpp

@@ -125,9 +125,9 @@ void CFileDesc::SetModificationDate(const FILETIME& lastModDate) {
 
 // image file types supported internally (there are additional endings for RAW and WIC - these come from INI file)
 // NOTE: when adding more supported filetypes, update installer to add another extension for "SupportedTypes"
-static const int cnNumEndingsInternal = 14;
+static const int cnNumEndingsInternal = 16;
 static const TCHAR* csFileEndingsInternal[cnNumEndingsInternal] = {_T("jpg"), _T("jpeg"), _T("bmp"), _T("png"), 
-	_T("tif"), _T("tiff"), _T("gif"), _T("webp"), _T("jxl"), _T("avif"), _T("heif"), _T("heic"), _T("tga"), _T("qoi")};
+	_T("tif"), _T("tiff"), _T("gif"), _T("webp"), _T("jxl"), _T("avif"), _T("heif"), _T("heic"), _T("tga"), _T("qoi"), _T("psd"), _T("psb") };
 // supported camera RAW formats
 static const TCHAR* csFileEndingsRAW = _T("*.pef;*.dng;*.crw;*.nef;*.cr2;*.mrw;*.rw2;*.orf;*.x3f;*.arw;*.kdc;*.nrw;*.dcr;*.sr2;*.raf");
 

src/JPEGView/Helpers.cpp

@@ -773,6 +773,8 @@ EImageFormat GetImageFormat(LPCTSTR sFileName) {
 			return IF_TGA;
 		} else if (_tcsicmp(sEnding, _T("QOI")) == 0) {
 			return IF_QOI;
+		} else if (_tcsicmp(sEnding, _T("PSD")) == 0) {
+			return IF_PSD;
 		} else if (IsInFileEndingList(CSettingsProvider::This().FilesProcessedByWIC(), sEnding)) {
 			return IF_WIC;
 		} else if (IsInFileEndingList(CSettingsProvider::This().FileEndingsRAW(), sEnding)) {

src/JPEGView/Helpers.h

@@ -100,6 +100,34 @@ namespace Helpers {
 	// Converts the system time to a string
 	CString SystemTimeToString(const SYSTEMTIME &time);
 
+	// pixel is ARGB, backgroundColor is BGR. Returns ARGB
+	static inline uint32 AlphaBlendBackground(uint32 pixel, COLORREF backgroundColor)
+	{
+		uint32 alpha = pixel & 0xFF000000;
+		if (alpha == 0xFF000000)
+			return pixel;
+
+		uint8 bg_r = GetRValue(backgroundColor);
+		uint8 bg_g = GetGValue(backgroundColor);
+		uint8 bg_b = GetBValue(backgroundColor);
+
+		if (alpha == 0) {
+			return (bg_r << 16) + (bg_g << 8) + (bg_b);
+		} else {
+			uint8 r = (pixel >> 16) & 0xFF;
+			uint8 g = (pixel >>  8) & 0xFF;
+			uint8 b = (pixel      ) & 0xFF;
+			uint8 a = alpha >> 24;
+			uint8 one_minus_a = 255 - a;
+
+			return
+				0xFF000000 + 
+				(  (uint8)(((r * a + bg_r * one_minus_a) / 255.0) + 0.5) << 16) +
+				(  (uint8)(((g * a + bg_g * one_minus_a) / 255.0) + 0.5) <<  8) + 
+				(  (uint8)(((b * a + bg_b * one_minus_a) / 255.0) + 0.5)      );
+		}
+}
+
 	// Gets the image size to be used when fitting the image to screen, either using 'fit to screen'
 	// or 'fill with crop' method. If 'fill with crop' is used, the bLimitAR can be set to avoid
 	// filling when to less pixels remain visible

src/JPEGView/ICCProfileTransform.cpp

@@ -64,10 +64,19 @@ bool ICCProfileTransform::DoTransform(void* transform, const void* inputBuffer,
 		return false;
 	cmsUInt32Number inFormat = cmsGetTransformInputFormat(transform);
 	int nchannels;
-	if (inFormat == TYPE_BGRA_8 || inFormat == TYPE_RGBA_8) {
-		nchannels = 4;
-	} else {
-		nchannels = 3;
+	switch (inFormat) {
+		case TYPE_BGRA_8:
+		case TYPE_RGBA_8:
+		case TYPE_ALab_8:
+			nchannels = 4;
+			break;
+		case TYPE_BGR_8:
+		case TYPE_RGB_8:
+		case TYPE_Lab_8:
+			nchannels = 3;
+			break;
+		default:
+			return false;
 	}
 	if (stride == 0)
 		stride = width * nchannels;
@@ -81,6 +90,39 @@ void ICCProfileTransform::DeleteTransform(void* transform)
 		cmsDeleteTransform(transform);
 }
 
+void* ICCProfileTransform::CreateLabTransform(PixelFormat format) {
+	cmsHTRANSFORM transform = NULL;
+	cmsHPROFILE hLabProfile = NULL;
+	try {
+		hLabProfile = cmsCreateLab4Profile(cmsD50_xyY());
+		if (sRGBProfile == NULL) {
+			sRGBProfile = cmsCreate_sRGBProfile();
+		}
+	} catch (...) {}
+
+	if (hLabProfile == NULL || sRGBProfile == NULL)
+		return NULL; // Could not create profile
+
+	// Create transform from CIELAB D50 (Photoshop "Lab mode") to sRGB
+	cmsUInt32Number flags = cmsFLAGS_BLACKPOINTCOMPENSATION | cmsFLAGS_COPY_ALPHA;
+	cmsUInt32Number inFormat, outFormat;
+	switch (format) {
+		case FORMAT_Lab:
+			inFormat = TYPE_Lab_8;
+			outFormat = TYPE_BGR_8;
+			break;
+		case FORMAT_ALab:
+			inFormat = TYPE_ALab_8;
+			outFormat = TYPE_ABGR_8;
+			break;
+		default:
+			cmsCloseProfile(hLabProfile);
+			return NULL;
+	}
+	transform = cmsCreateTransform(hLabProfile, inFormat, sRGBProfile, outFormat, INTENT_RELATIVE_COLORIMETRIC, flags);
+	cmsCloseProfile(hLabProfile);
+	return transform;
+}
 
 #else
 
@@ -96,4 +138,8 @@ bool ICCProfileTransform::DoTransform(void* /* transform */, const void* /* inpu
 
 void ICCProfileTransform::DeleteTransform(void* /* transform */) { }
 
-#endif
+void* ICCProfileTransform::CreateLabTransform() {
+	return NULL;
+}
+
+#endif

src/JPEGView/ICCProfileTransform.h

@@ -8,6 +8,8 @@ class ICCProfileTransform
 		FORMAT_RGBA,
 		FORMAT_BGR,
 		FORMAT_RGB,
+		FORMAT_Lab,
+		FORMAT_ALab,
 	};
 
 	// Create a transform from given ICC Profile to standard sRGB color space.
@@ -30,6 +32,8 @@ class ICCProfileTransform
 	// Free memory associated with the given transform
 	static void DeleteTransform(void* transform);
 
+	static void* CreateLabTransform(PixelFormat format);
+
 private:
 	static void* sRGBProfile;
 };

src/JPEGView/ImageLoadThread.cpp

@@ -20,6 +20,7 @@
 #endif
 #include "WEBPWrapper.h"
 #include "QOIWrapper.h"
+#include "PSDWrapper.h"
 #include "MaxImageDef.h"
 
 
@@ -28,34 +29,6 @@ using namespace Gdiplus;
 // static initializers
 volatile int CImageLoadThread::m_curHandle = 0;
 
-// pixel is ARGB, backgroundColor is BGR. Returns ARGB
-static inline uint32 WebpAlphaBlendBackground(uint32 pixel, COLORREF backgroundColor)
-{
-	uint32 alpha = pixel & 0xFF000000;
-	if (alpha == 0xFF000000)
-		return pixel;
-
-	uint8 bg_r = GetRValue(backgroundColor);
-	uint8 bg_g = GetGValue(backgroundColor);
-	uint8 bg_b = GetBValue(backgroundColor);
-
-	if (alpha == 0) {
-		return (bg_r << 16) + (bg_g << 8) + (bg_b);
-	} else {
-		uint8 r = (pixel >> 16) & 0xFF;
-		uint8 g = (pixel >>  8) & 0xFF;
-		uint8 b = (pixel      ) & 0xFF;
-		uint8 a = alpha >> 24;
-		uint8 one_minus_a = 255 - a;
-
-		return
-			0xFF000000 + 
-			(  (uint8)(((r * a + bg_r * one_minus_a) / 255.0) + 0.5) << 16) +
-			(  (uint8)(((g * a + bg_g * one_minus_a) / 255.0) + 0.5) <<  8) + 
-			(  (uint8)(((b * a + bg_b * one_minus_a) / 255.0) + 0.5)      );
-	}
-}
-
 /////////////////////////////////////////////////////////////////////////////////////////////
 // static helpers
 /////////////////////////////////////////////////////////////////////////////////////////////
@@ -120,6 +93,8 @@ static EImageFormat GetImageFormat(LPCTSTR sFileName) {
 		}
 	} else if (header[0] == 'q' && header[1] == 'o' && header[2] == 'i' && header[3] == 'f') {
 		return IF_QOI;
+	} else if (header[0] == '8' && header[1] == 'B' && header[2] == 'P' && header[3] == 'S') {
+		return IF_PSD;
 	}
 
 	// default fallback if no matches based on magic bytes
@@ -392,6 +367,14 @@ void CImageLoadThread::ProcessRequest(CRequestBase& request) {
 			DeleteCachedAvifDecoder();
 			ProcessReadQOIRequest(&rq);
 			break;
+		case IF_PSD:
+			DeleteCachedGDIBitmap();
+			DeleteCachedWebpDecoder();
+			DeleteCachedPngDecoder();
+			DeleteCachedJxlDecoder();
+			DeleteCachedAvifDecoder();
+			ProcessReadPSDRequest(&rq);
+			break;
 		case IF_CameraRAW:
 			DeleteCachedGDIBitmap();
 			DeleteCachedWebpDecoder();
@@ -645,7 +628,7 @@ void CImageLoadThread::ProcessReadWEBPRequest(CRequest * request) {
 				// Multiply alpha value into each AABBGGRR pixel
 				uint32* pImage32 = (uint32*)pPixelData;
 				for (int i = 0; i < nWidth * nHeight; i++)
-					*pImage32++ = WebpAlphaBlendBackground(*pImage32, CSettingsProvider::This().ColorTransparency());
+					*pImage32++ = Helpers::AlphaBlendBackground(*pImage32, CSettingsProvider::This().ColorTransparency());
 
 				if (bHasAnimation) {
 					m_sLastWebpFileName = sFileName;
@@ -725,7 +708,7 @@ void CImageLoadThread::ProcessReadPNGRequest(CRequest* request) {
 				// Multiply alpha value into each AABBGGRR pixel
 				uint32* pImage32 = (uint32*)pPixelData;
 				for (int i = 0; i < nWidth * nHeight; i++)
-					*pImage32++ = WebpAlphaBlendBackground(*pImage32, CSettingsProvider::This().ColorTransparency());
+					*pImage32++ = Helpers::AlphaBlendBackground(*pImage32, CSettingsProvider::This().ColorTransparency());
 
 				request->Image = new CJPEGImage(nWidth, nHeight, pPixelData, pEXIFData, 4, 0, IF_PNG, bHasAnimation, request->FrameIndex, nFrameCount, nFrameTimeMs);
 				free(pEXIFData);
@@ -800,7 +783,7 @@ void CImageLoadThread::ProcessReadJXLRequest(CRequest* request) {
 				// Multiply alpha value into each AABBGGRR pixel
 				uint32* pImage32 = (uint32*)pPixelData;
 				for (int i = 0; i < nWidth * nHeight; i++)
-					*pImage32++ = WebpAlphaBlendBackground(*pImage32, CSettingsProvider::This().ColorTransparency());
+					*pImage32++ = Helpers::AlphaBlendBackground(*pImage32, CSettingsProvider::This().ColorTransparency());
 
 				request->Image = new CJPEGImage(nWidth, nHeight, pPixelData, pEXIFData, 4, 0, IF_JXL, bHasAnimation, request->FrameIndex, nFrameCount, nFrameTimeMs);
 				free(pEXIFData);
@@ -874,7 +857,7 @@ void CImageLoadThread::ProcessReadAVIFRequest(CRequest* request) {
 				// Multiply alpha value into each AABBGGRR pixel
 				uint32* pImage32 = (uint32*)pPixelData;
 				for (int i = 0; i < nWidth * nHeight; i++)
-					*pImage32++ = WebpAlphaBlendBackground(*pImage32, CSettingsProvider::This().ColorTransparency());
+					*pImage32++ = Helpers::AlphaBlendBackground(*pImage32, CSettingsProvider::This().ColorTransparency());
 
 				request->Image = new CJPEGImage(nWidth, nHeight, pPixelData, pEXIFData, 4, 0, IF_AVIF, bHasAnimation, request->FrameIndex, nFrameCount, nFrameTimeMs);
 				free(pEXIFData);
@@ -935,7 +918,7 @@ void CImageLoadThread::ProcessReadHEIFRequest(CRequest* request) {
 				// Multiply alpha value into each AABBGGRR pixel
 				uint32* pImage32 = (uint32*)pPixelData;
 				for (int i = 0; i < nWidth * nHeight; i++)
-					*pImage32++ = WebpAlphaBlendBackground(*pImage32, CSettingsProvider::This().ColorTransparency());
+					*pImage32++ = Helpers::AlphaBlendBackground(*pImage32, CSettingsProvider::This().ColorTransparency());
 
 				request->Image = new CJPEGImage(nWidth, nHeight, pPixelData, pEXIFData, nBPP, 0, IF_HEIF, false, request->FrameIndex, nFrameCount, nFrameTimeMs);
 				free(pEXIFData);
@@ -988,7 +971,7 @@ void CImageLoadThread::ProcessReadQOIRequest(CRequest* request) {
 					// Multiply alpha value into each AABBGGRR pixel
 					uint32* pImage32 = (uint32*)pPixelData;
 					for (int i = 0; i < nWidth * nHeight; i++)
-						*pImage32++ = WebpAlphaBlendBackground(*pImage32, CSettingsProvider::This().ColorTransparency());
+						*pImage32++ = Helpers::AlphaBlendBackground(*pImage32, CSettingsProvider::This().ColorTransparency());
 				}
 				request->Image = new CJPEGImage(nWidth, nHeight, pPixelData, NULL, nBPP, 0, IF_QOI, false, 0, 1, 0);
 			}
@@ -1002,6 +985,13 @@ void CImageLoadThread::ProcessReadQOIRequest(CRequest* request) {
 	delete[] pBuffer;
 }
 
+void CImageLoadThread::ProcessReadPSDRequest(CRequest* request) {
+	request->Image = PsdReader::ReadImage(request->FileName, request->OutOfMemory);
+	if (request->Image == NULL && !request->OutOfMemory) {
+		request->Image = PsdReader::ReadThumb(request->FileName, request->OutOfMemory);
+	}
+}
+
 void CImageLoadThread::ProcessReadRAWRequest(CRequest * request) {
 	bool bOutOfMemory = false;
 	try {

src/JPEGView/ImageLoadThread.h

@@ -116,6 +116,7 @@ class CImageLoadThread : public CWorkThread
 	void ProcessReadAVIFRequest(CRequest* request);
 	void ProcessReadHEIFRequest(CRequest * request);
 	void ProcessReadQOIRequest(CRequest * request);
+	void ProcessReadPSDRequest(CRequest * request);
 	void ProcessReadRAWRequest(CRequest * request);
 	void ProcessReadGDIPlusRequest(CRequest * request);
 	void ProcessReadWICRequest(CRequest* request);

src/JPEGView/ImageProcessingTypes.h

@@ -40,6 +40,7 @@ enum EImageFormat {
 	IF_HEIF,
 	IF_AVIF,
 	IF_QOI,
+	IF_PSD,
 	IF_WIC,
 	IF_CLIPBOARD,
 	IF_CameraRAW,