diff options
author | der richter <der.richter@gmx.de> | 2019-07-20 12:16:37 +0200 |
---|---|---|
committer | Jan Ekström <jeebjp@gmail.com> | 2019-07-21 18:13:07 +0300 |
commit | a8c2e2986838dccbcc4bd218b501f0bf86b36e2c (patch) | |
tree | 0f9ce3f16cc72c47dd70e9961e6c9b9f1cdabd43 /osdep/macOS_mpv_helper.swift | |
parent | 0602f082cb9775b4c9c8e256b1cb9de218a3b5fc (diff) | |
download | mpv-a8c2e2986838dccbcc4bd218b501f0bf86b36e2c.tar.bz2 mpv-a8c2e2986838dccbcc4bd218b501f0bf86b36e2c.tar.xz |
cocoa-cb: migrate to swift 5 with swift 4 fallback
this migrates our current swift code to version 5 and 4. building is
support from 10.12.6 and xcode 9.1 onwards.
dynamic linking is the new default, since Apple removed static libs
from their new toolchains and it's the recommended way.
additionally the found macOS SDK version is printed since it's an
important information for finding possible errors now.
Fixes #6470
Diffstat (limited to 'osdep/macOS_mpv_helper.swift')
-rw-r--r-- | osdep/macOS_mpv_helper.swift | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/osdep/macOS_mpv_helper.swift b/osdep/macOS_mpv_helper.swift index 35435835de..fdc458e834 100644 --- a/osdep/macOS_mpv_helper.swift +++ b/osdep/macOS_mpv_helper.swift @@ -177,9 +177,11 @@ class MPVHelper: NSObject { sendWarning("Invalid ICC profile data.") return } - let iccSize = iccData.count - iccData.withUnsafeMutableBytes { (u8Ptr: UnsafeMutablePointer<UInt8>) in - let iccBstr = bstrdup(nil, bstr(start: u8Ptr, len: iccSize)) + iccData.withUnsafeMutableBytes { (ptr: UnsafeMutableRawBufferPointer) in + guard let baseAddress = ptr.baseAddress, ptr.count > 0 else { return } + + let u8Ptr = baseAddress.assumingMemoryBound(to: UInt8.self) + let iccBstr = bstrdup(nil, bstr(start: u8Ptr, len: ptr.count)) var icc = mpv_byte_array(data: iccBstr.start, size: iccBstr.len) let params = mpv_render_param(type: MPV_RENDER_PARAM_ICC_PROFILE, data: &icc) mpv_render_context_set_parameter(mpvRenderContext, params) |