RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

cocoa-cb: fix a warning with swift 4.1 and slight cleanup 

the icc profile data is mutated to an UnsafeMutablePointer and could
possibly changed. therefore the size of it should be accessed before a
possible change.
This commit is contained in:
Akemi 2018-04-09 16:10:48 +02:00 committed by Jan Ekström
parent b2dc69e347
commit 41d559c4a9
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osdep/macOS_mpv_helper.swift
View File

@ -127,9 +127,13 @@ class MPVHelper: NSObject {
func setRenderICCProfile(_ profile: NSColorSpace) { func setRenderICCProfile(_ profile: NSColorSpace) {
if mpvRenderContext == nil { return } if mpvRenderContext == nil { return }
var iccData = profile.iccProfileData guard var iccData = profile.iccProfileData else {
iccData!.withUnsafeMutableBytes { (u8Ptr: UnsafeMutablePointer<UInt8>) in sendWarning("Invalid ICC profile data.")
let iccBstr = bstrdup(nil, bstr(start: u8Ptr, len: iccData!.count)) return
}
let iccSize = iccData.count
iccData.withUnsafeMutableBytes { (u8Ptr: UnsafeMutablePointer<UInt8>) in
let iccBstr = bstrdup(nil, bstr(start: u8Ptr, len: iccSize))
var icc = mpv_byte_array(data: iccBstr.start, size: iccBstr.len) var icc = mpv_byte_array(data: iccBstr.start, size: iccBstr.len)
let params = mpv_render_param(type: MPV_RENDER_PARAM_ICC_PROFILE, data: &icc) let params = mpv_render_param(type: MPV_RENDER_PARAM_ICC_PROFILE, data: &icc)
mpv_render_context_set_parameter(mpvRenderContext, params) mpv_render_context_set_parameter(mpvRenderContext, params)