FIX: Windows JPEG codec unexpected property type error

resolves: Oldes/Rebol-issues#2587
Oldes · Jan 29, 2024 · 307b24a · 307b24a
1 parent 1c73cfe
commit 307b24a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/src/os/win32/sys-codecs.cpp b/src/os/win32/sys-codecs.cpp
@@ -80,7 +80,7 @@ CODECS_API int DecodeImageFromFile(PCWSTR *uri, UINT frame, REBCDI *codi)
 				(LPCWSTR)uri
 				, NULL
 				, GENERIC_READ
-				, WICDecodeMetadataCacheOnLoad
+				, WICDecodeMetadataCacheOnDemand
 				, &pDecoder
 			);
 			ASSERT_HR("CreateDecoderFromFilename");
@@ -110,7 +110,7 @@ CODECS_API int DecodeImageFromFile(PCWSTR *uri, UINT frame, REBCDI *codi)
 			hr = pIWICFactory->CreateDecoderFromStream(
 				pStream
 				, NULL
-				, WICDecodeMetadataCacheOnLoad
+				, WICDecodeMetadataCacheOnDemand
 				, &pDecoder
 			);
 			ASSERT_HR("CreateDecoderFromStream");

diff --git a/src/tests/units/files/issue-2587.jpg b/src/tests/units/files/issue-2587.jpg
diff --git a/src/tests/units/image-test.r3 b/src/tests/units/image-test.r3
@@ -488,6 +488,15 @@ if value? 'blur [
 				#{0A00000A0A00000A0A00000A0A00000A} ;; premultiplied on macOS :/
 			] to binary! img2
 	]
+
+	if find codecs 'jpeg [
+		--test-- "loading JPEG file with an unexpected property type"
+		;@@ https://github.com/Oldes/Rebol-issues/issues/2587
+		--assert all [
+			img: image? try [load %units/files/issue-2587.jpg] ;; no error!
+			img/size = 105x150
+		]
+	]
 ===end-group===
 
 ===start-group=== "Image as a series"