[[ Bug 23038 ]] Fix creation of color profiles on macOS

runrevmark · runrevmark · commit d6a9244d270a · 2021-07-20T12:29:24.000+01:00
This patch fixes an issue with the creation of color profiles from
embedded ICC information. Previously the NoCopy CFDataRef constructor
was being used to wrap the raw bytes to be passed to the relevant
CGColorSpaceRef constructor. However, the data wrapped in this way
could be released at any time, and in versions of macOS since
Mojave it appears that the OS defers copying the data thus causing
strange effects when the color profile is eventually applied. The
problem has been fixed by using the normal CFDataRef constructor
which copies the provided bytes.
diff --git a/docs/notes/bugfix-23038.md b/docs/notes/bugfix-23038.md
@@ -0,0 +1 @@
+# Fix some images rendering as black in recent macOS versions
diff --git a/engine/src/mac-color.mm b/engine/src/mac-color.mm
@@ -72,7 +72,7 @@ void MCPlatformCreateColorTransform(const MCColorSpaceInfo& p_info, MCPlatformCo
 		CFDataRef t_data;
 		t_data = nil;
 		
-		t_success = nil != (t_data = CFDataCreateWithBytesNoCopy(kCFAllocatorDefault, (UInt8*)p_info.embedded.data, p_info.embedded.data_size, kCFAllocatorNull));
+		t_success = nil != (t_data = CFDataCreate(kCFAllocatorDefault, (UInt8*)p_info.embedded.data, p_info.embedded.data_size));
 		
 		if (t_success)
 			t_success = nil != (t_colorspace = CGColorSpaceCreateWithICCProfile(t_data));

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Fix some images rendering as black in recent macOS versions`