Updating to match latest OSS Swift compiler.

framework/Source/FramebufferCache.swift

@@ -25,7 +25,7 @@ public class FramebufferCache {
     public func requestFramebufferWithProperties(orientation:ImageOrientation, size:GLSize, textureOnly:Bool = false, minFilter:Int32 = GL_LINEAR, magFilter:Int32 = GL_LINEAR, wrapS:Int32 = GL_CLAMP_TO_EDGE, wrapT:Int32 = GL_CLAMP_TO_EDGE, internalFormat:Int32 = GL_RGBA, format:Int32 = GL_BGRA, type:Int32 = GL_UNSIGNED_BYTE, stencil:Bool = false) -> Framebuffer {
         let hash = hashForFramebufferWithProperties(orientation:orientation, size:size, textureOnly:textureOnly, minFilter:minFilter, magFilter:magFilter, wrapS:wrapS, wrapT:wrapT, internalFormat:internalFormat, format:format, type:type, stencil:stencil)
         let framebuffer:Framebuffer
-        if (framebufferCache[hash]?.count > 0) {
+        if ((framebufferCache[hash]?.count ?? -1) > 0) {
 //            print("Restoring previous framebuffer")
             framebuffer = framebufferCache[hash]!.removeLast()
             framebuffer.orientation = orientation

framework/Source/Mac/Camera.swift

@@ -79,14 +79,14 @@ public class Camera: NSObject, ImageSource, AVCaptureVideoDataOutputSampleBuffer
 
             if (supportsFullYUVRange) {
                 yuvConversionShader = crashOnShaderCompileFailure("Camera"){try sharedImageProcessingContext.programForVertexShader(defaultVertexShaderForInputs(2), fragmentShader:YUVConversionFullRangeFragmentShader)}
-                videoOutput.videoSettings = [kCVPixelBufferPixelFormatTypeKey:NSNumber(value:Int32(kCVPixelFormatType_420YpCbCr8BiPlanarFullRange))]
+                videoOutput.videoSettings = [kCVPixelBufferPixelFormatTypeKey as AnyHashable:NSNumber(value:Int32(kCVPixelFormatType_420YpCbCr8BiPlanarFullRange))]
             } else {
                 yuvConversionShader = crashOnShaderCompileFailure("Camera"){try sharedImageProcessingContext.programForVertexShader(defaultVertexShaderForInputs(2), fragmentShader:YUVConversionVideoRangeFragmentShader)}
-                videoOutput.videoSettings = [kCVPixelBufferPixelFormatTypeKey:NSNumber(value:Int32(kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange))]
+                videoOutput.videoSettings = [kCVPixelBufferPixelFormatTypeKey as AnyHashable:NSNumber(value:Int32(kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange))]
             }
         } else {
             yuvConversionShader = nil
-            videoOutput.videoSettings = [kCVPixelBufferPixelFormatTypeKey:NSNumber(value:Int32(kCVPixelFormatType_32BGRA))]
+            videoOutput.videoSettings = [kCVPixelBufferPixelFormatTypeKey as AnyHashable:NSNumber(value:Int32(kCVPixelFormatType_32BGRA))]
         }
 
         if (captureSession.canAddOutput(videoOutput)) {

framework/Source/Mac/MovieOutput.swift

@@ -37,7 +37,7 @@ public class MovieOutput: ImageConsumer, AudioEncodingTarget {
 
         localSettings[AVVideoWidthKey] = localSettings[AVVideoWidthKey] ?? NSNumber(value:size.width)
         localSettings[AVVideoHeightKey] = localSettings[AVVideoHeightKey] ?? NSNumber(value:size.height)
-        localSettings[AVVideoCodecKey] =  localSettings[AVVideoCodecKey] ?? AVVideoCodecH264
+        localSettings[AVVideoCodecKey] =  localSettings[AVVideoCodecKey] ?? AVVideoCodecH264 as NSString
 
         assetWriterVideoInput = AVAssetWriterInput(mediaType:AVMediaTypeVideo, outputSettings:localSettings)
         assetWriterVideoInput.expectsMediaDataInRealTime = liveVideo

framework/Source/Mac/OpenGLContext.swift

@@ -77,7 +77,7 @@ public class OpenGLContext: SerialDispatch {
     lazy var extensionString:String = {
         return self.runOperationSynchronously{
             self.makeCurrentContext()
-            return String(cString:UnsafePointer<CChar>(glGetString(GLenum(GL_EXTENSIONS))))
+            return String(cString:unsafeBitCast(glGetString(GLenum(GL_EXTENSIONS)), to:UnsafePointer<CChar>.self))
         }
     }()
 }

framework/Source/Mac/PictureInput.swift

@@ -83,11 +83,11 @@ public class PictureInput: ImageSource {
 
             let imageContext = CGContext(data:imageData, width:Int(widthToUseForTexture), height:Int(heightToUseForTexture), bitsPerComponent:8, bytesPerRow:Int(widthToUseForTexture) * 4, space:genericRGBColorspace,  bitmapInfo:CGImageAlphaInfo.premultipliedFirst.rawValue | CGBitmapInfo.byteOrder32Little.rawValue)
             //        CGContextSetBlendMode(imageContext, kCGBlendModeCopy); // From Technical Q&A QA1708: http://developer.apple.com/library/ios/#qa/qa1708/_index.html
-            imageContext?.draw(in:CGRect(x:0.0, y:0.0, width:CGFloat(widthToUseForTexture), height:CGFloat(heightToUseForTexture)), image:image)
+            imageContext?.draw(image, in:CGRect(x:0.0, y:0.0, width:CGFloat(widthToUseForTexture), height:CGFloat(heightToUseForTexture)))
         } else {
             // Access the raw image bytes directly
             dataFromImageDataProvider = image.dataProvider?.data
-            imageData = UnsafeMutablePointer<GLubyte>(CFDataGetBytePtr(dataFromImageDataProvider))
+            imageData = UnsafeMutablePointer<GLubyte>(mutating:CFDataGetBytePtr(dataFromImageDataProvider)!)
         }
 
         sharedImageProcessingContext.makeCurrentContext()

framework/Source/Mac/PictureOutput.swift

@@ -111,21 +111,23 @@ public extension NSImage {
         }
     }
 
-    public func filterWithPipeline(_ pipeline:(input:PictureInput, output:PictureOutput) -> ()) -> NSImage {
+    public func filterWithPipeline(_ pipeline:(PictureInput, PictureOutput) -> ()) -> NSImage {
         let picture = PictureInput(image:self)
         var outputImage:NSImage?
         let pictureOutput = PictureOutput()
         pictureOutput.onlyCaptureNextFrame = true
         pictureOutput.imageAvailableCallback = {image in
             outputImage = image
         }
-        pipeline(input:picture, output:pictureOutput)
+        pipeline(picture, pictureOutput)
         picture.processImage(synchronously:true)
         return outputImage!
     }
 }
 
 // Why are these flipped in the callback definition?
-func dataProviderReleaseCallback(_ context:UnsafeMutablePointer<Void>?, data:UnsafePointer<Void>, size:Int) {
-    UnsafeMutablePointer<UInt8>(data).deallocate(capacity:size)
+func dataProviderReleaseCallback(_ context:UnsafeMutableRawPointer?, data:UnsafeRawPointer, size:Int) {
+//    UnsafeMutablePointer<UInt8>(data).deallocate(capacity:size)
+    // FIXME: Verify this is correct
+    data.deallocate(bytes:size, alignedTo:1)
 }

framework/Source/OpenGLContext_Shared.swift

@@ -85,6 +85,6 @@ extension OpenGLContext {
 
 @_semantics("sil.optimize.never") public func debugPrint(_ stringToPrint:String, file: StaticString = #file, line: UInt = #line, function: StaticString = #function) {
     #if DEBUG
-        print("\(stringToPrint) --> \((String(file) as NSString).lastPathComponent): \(function): \(line)")
+        print("\(stringToPrint) --> \((String(describing:file) as NSString).lastPathComponent): \(function): \(line)")
     #endif
 }

framework/Source/OperationGroup.swift

@@ -13,8 +13,8 @@ public class OperationGroup: ImageProcessingOperation {
         inputImageRelay.newFramebufferAvailable(framebuffer, fromSourceIndex:fromSourceIndex)
     }
 
-    public func configureGroup(_ configurationOperation:(input:ImageRelay, output:ImageRelay) -> ()) {
-        configurationOperation(input:inputImageRelay, output:outputImageRelay)
+    public func configureGroup(_ configurationOperation:(_ input:ImageRelay, _ output:ImageRelay) -> ()) {
+        configurationOperation(inputImageRelay, outputImageRelay)
     }
 
     public func transmitPreviousImage(to target:ImageConsumer, atIndex:UInt) {

framework/Source/Operations/MotionDetector.swift

@@ -1,6 +1,6 @@
 public class MotionDetector: OperationGroup {
     public var lowPassStrength:Float = 1.0 { didSet {lowPassFilter.strength = lowPassStrength}}
-    public var motionDetectedCallback:((position:Position, strength:Float) -> ())?
+    public var motionDetectedCallback:((Position, Float) -> ())?
 
     let lowPassFilter = LowPassFilter()
     let motionComparison = BasicOperation(fragmentShader:MotionComparisonFragmentShader, numberOfInputs:2)
@@ -10,7 +10,7 @@ public class MotionDetector: OperationGroup {
         super.init()
 
         averageColorExtractor.extractedColorCallback = {[weak self] color in
-            self?.motionDetectedCallback?(position:Position(color.redComponent / color.alphaComponent, color.greenComponent / color.alphaComponent), strength:color.alphaComponent)
+            self?.motionDetectedCallback?(Position(color.redComponent / color.alphaComponent, color.greenComponent / color.alphaComponent), color.alphaComponent)
         }
 
         self.configureGroup{input, output in

framework/Source/Pipeline.swift

@@ -17,8 +17,11 @@ public protocol ImageConsumer:AnyObject {
 public protocol ImageProcessingOperation: ImageConsumer, ImageSource {
 }
 
-infix operator --> { associativity left precedence 140 }
-
+infix operator --> : AdditionPrecedence
+//precedencegroup ProcessingOperationPrecedence {
+//    associativity: left
+////    higherThan: Multiplicative
+//}
 @discardableResult public func --><T:ImageConsumer>(source:ImageSource, destination:T) -> T {
     source.addTarget(destination)
     return destination

framework/Source/SerialDispatch.swift

@@ -35,10 +35,10 @@ public let lowProcessingQueuePriority:DispatchQueue.GlobalQueuePriority = {
     }
 }()
 
-func runAsynchronouslyOnMainQueue(_ mainThreadOperation:() -> ()) {
+func runAsynchronouslyOnMainQueue(_ mainThreadOperation:@escaping () -> ()) {
 // FIXME: Xcode 8 beta 2
-    if (Thread.isMainThread) {
-//    if (Thread.isMainThread()) {
+//    if (Thread.isMainThread) {
+    if (Thread.isMainThread()) {
         mainThreadOperation()
     } else {
         DispatchQueue.main.async(execute:mainThreadOperation)
@@ -47,8 +47,8 @@ func runAsynchronouslyOnMainQueue(_ mainThreadOperation:() -> ()) {
 
 func runOnMainQueue(_ mainThreadOperation:() -> ()) {
 // FIXME: Xcode 8 beta 2
-    if (Thread.isMainThread) {
-//    if (Thread.isMainThread()) {
+//    if (Thread.isMainThread) {
+    if (Thread.isMainThread()) {
         mainThreadOperation()
     } else {
         DispatchQueue.main.sync(execute:mainThreadOperation)
@@ -73,7 +73,7 @@ public protocol SerialDispatch {
 }
 
 public extension SerialDispatch {
-    public func runOperationAsynchronously(_ operation:() -> ()) {
+    public func runOperationAsynchronously(_ operation:@escaping () -> ()) {
         self.serialDispatchQueue.async {
             self.makeCurrentContext()
             operation()

framework/Source/ShaderProgram.swift

@@ -256,7 +256,7 @@ public func shaderFromFile(_ file:URL) throws -> String {
     // Note: this is a hack until Foundation's String initializers are fully functional
     //        let fragmentShaderString = String(contentsOfURL:fragmentShaderFile, encoding:NSASCIIStringEncoding)
 // FIXME: Xcode 8 beta 2
-    guard (FileManager.default.fileExists(atPath: file.path)) else { throw ShaderCompileError(compileLog:"Shader file \(file) missing")}
+    guard (FileManager.default().fileExists(atPath: file.path)) else { throw ShaderCompileError(compileLog:"Shader file \(file) missing")}
 //    guard (FileManager.default().fileExists(atPath: file.path!)) else { throw ShaderCompileError(compileLog:"Shader file \(file) missing")}
 
     let fragmentShaderString = try NSString(contentsOfFile:file.path, encoding:String.Encoding.ascii.rawValue)