From 105e662221cc90d5002e06c97febf50c5c601336 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Thu, 2 Jan 2020 13:21:58 +0100
Subject: macOS: Handle missing color space information in IOSurface
 backingstore

Fixes: QTBUG-80972
Change-Id: Iab3f1a9cf03251340e5f32bcc73103428e93282d
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
---
 src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'src/plugins/platforms')

diff --git a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm
index 285e316d4a..fc187e0f51 100644
--- a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm
+++ b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm
@@ -89,9 +89,16 @@ QIOSurfaceGraphicsBuffer::~QIOSurfaceGraphicsBuffer()
 
 void QIOSurfaceGraphicsBuffer::setColorSpace(QCFType<CGColorSpaceRef> colorSpace)
 {
-    Q_ASSERT(colorSpace);
-    IOSurfaceSetValue(m_surface, CFSTR("IOSurfaceColorSpace"),
-        QCFType<CFPropertyListRef>(CGColorSpaceCopyPropertyList(colorSpace)));
+    static const auto kIOSurfaceColorSpace = CFSTR("IOSurfaceColorSpace");
+
+    qCDebug(lcQpaIOSurface) << "Tagging" << this << "with color space" << colorSpace;
+
+    if (colorSpace) {
+        IOSurfaceSetValue(m_surface, kIOSurfaceColorSpace,
+            QCFType<CFPropertyListRef>(CGColorSpaceCopyPropertyList(colorSpace)));
+    } else {
+        IOSurfaceRemoveValue(m_surface, kIOSurfaceColorSpace);
+    }
 }
 
 const uchar *QIOSurfaceGraphicsBuffer::data() const
-- 
cgit v1.2.3