From b06304e164ba47351fa292662c1e6383c081b5ca Mon Sep 17 00:00:00 2001 From: Gabriel de Dietrich Date: Wed, 3 Jul 2013 17:33:54 +0200 Subject: Cocoa: Remove references to CMProfileRef and related APIs Deprecated since 10.6. Change-Id: If1398c6cce0f199f9546d17695d47803f4a6fcba Reviewed-by: Shawn Rutledge Reviewed-by: Richard Moe Gustavsen --- src/plugins/platforms/cocoa/qpaintengine_mac.mm | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'src/plugins/platforms/cocoa/qpaintengine_mac.mm') diff --git a/src/plugins/platforms/cocoa/qpaintengine_mac.mm b/src/plugins/platforms/cocoa/qpaintengine_mac.mm index 301beb11c1..dc3757ce3c 100644 --- a/src/plugins/platforms/cocoa/qpaintengine_mac.mm +++ b/src/plugins/platforms/cocoa/qpaintengine_mac.mm @@ -362,7 +362,6 @@ CGColorSpaceRef QCoreGraphicsPaintEngine::macDisplayColorSpace(const QWidget *wi CGColorSpaceRef colorSpace; CGDirectDisplayID displayID; - CMProfileRef displayProfile = 0; if (widget == 0) { displayID = CGMainDisplayID(); } else { @@ -376,18 +375,11 @@ CGColorSpaceRef QCoreGraphicsPaintEngine::macDisplayColorSpace(const QWidget *wi if ((colorSpace = m_displayColorSpaceHash.value(displayID))) return colorSpace; - CMError err = CMGetProfileByAVID((CMDisplayIDType)displayID, &displayProfile); - if (err == noErr) { - colorSpace = CGColorSpaceCreateWithPlatformColorSpace(displayProfile); - } else if (widget) { - return macDisplayColorSpace(0); // fall back on main display - } - + colorSpace = CGDisplayCopyColorSpace(displayID); if (colorSpace == 0) colorSpace = CGColorSpaceCreateDeviceRGB(); m_displayColorSpaceHash.insert(displayID, colorSpace); - CMCloseProfile(displayProfile); if (!m_postRoutineRegistered) { m_postRoutineRegistered = true; qAddPostRoutine(QCoreGraphicsPaintEngine::cleanUpMacColorSpaces); -- cgit v1.2.3