Framework now builds correctly on Raspberry Pi under Swift 3, althoug…

…h the V4L camera is temporarily disabled.

framework/Source/Linux/OpenGLContext-RPi.swift

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

framework/Source/Linux/RPiRenderWindow.swift

@@ -20,7 +20,7 @@ public class RPiRenderWindow: ImageConsumer {
 	let windowWidth:UInt32
 	let windowHeight:UInt32
 
-	public init(width:UInt32, height:UInt32) {
+	public init(width:UInt32? = nil, height:UInt32? = nil) {
 		sharedImageProcessingContext.makeCurrentContext()
 	    display = eglGetDisplay(nil /* EGL_DEFAULT_DISPLAY */)
 	    // guard (display != EGL_NO_DISPLAY) else {throw renderingError(errorString:"Could not obtain display")}
@@ -36,7 +36,7 @@ public class RPiRenderWindow: ImageConsumer {
 	        EGL_NONE
 	    ]
 
-	    var config:EGLConfig = nil
+	    var config:EGLConfig? = nil
 	    var num_config:EGLint = 0
 	    //	guard (eglChooseConfig(display, attributes, &config, 1, &num_config) != EGL_FALSE) else {throw renderingError(errorString:"Could not get a framebuffer configuration")}
 	    eglChooseConfig(display, attributes, &config, 1, &num_config)
@@ -76,7 +76,7 @@ public class RPiRenderWindow: ImageConsumer {
 	    glClear(GLenum(GL_COLOR_BUFFER_BIT))
 	}
 
-    public func newFramebufferAvailable(framebuffer:Framebuffer, fromSourceIndex:UInt) {
+    public func newFramebufferAvailable(_ framebuffer:Framebuffer, fromSourceIndex:UInt) {
         glBindFramebuffer(GLenum(GL_FRAMEBUFFER), 0)
         glBindRenderbuffer(GLenum(GL_RENDERBUFFER), 0)
 
@@ -85,7 +85,7 @@ public class RPiRenderWindow: ImageConsumer {
         glClearColor(0.0, 0.0, 0.0, 0.0)
         glClear(GLenum(GL_COLOR_BUFFER_BIT))
 
-        renderQuadWithShader(self.displayShader, vertices:verticallyInvertedImageVertices, inputTextures:[framebuffer.texturePropertiesForTargetOrientation(.Portrait)])
+        renderQuadWithShader(self.displayShader, vertices:verticallyInvertedImageVertices, inputTextures:[framebuffer.texturePropertiesForTargetOrientation(.portrait)])
 		framebuffer.unlock()
 	    eglSwapBuffers(display, surface)
     }

framework/Source/Linux/V4LCamera.swift

@@ -3,6 +3,8 @@
 #else
     import COpenGL
 #endif
+
+/*
 import CVideo4Linux
 import Glibc
 import Foundation
@@ -120,3 +122,4 @@ public class V4LCamera:ImageSource {
         // Not needed for camera inputs
     }
 }
+*/

framework/Source/OpenGLRendering.swift

@@ -203,25 +203,11 @@ extension String {
     }
 
     func withGLChar(_ operation:(UnsafePointer<GLchar>) -> ()) {
-#if os(Linux)
-        // cStringUsingEncoding isn't yet defined in the Linux Foundation.
-        // This approach is roughly 35X slower than the cStringUsingEncoding one.
-        let bufferCString = UnsafeMutablePointer<UInt8>.allocate(capacity:self.characters.count+1)
-        for (index, characterValue) in self.utf8.enumerate() {
-            bufferCString[index] = characterValue
-        }
-        bufferCString[self.characters.count] = 0 // Have to add a null termination
-
-        operation(UnsafePointer<GLchar>(bufferCString))
-
-        bufferCString.deallocate(capacity:self.characters.count)
-#else
         if let value = self.cString(using:String.Encoding.utf8) {
             operation(UnsafePointer<GLchar>(value))
         } else {
             fatalError("Could not convert this string to UTF8: \(self)")
         }
-#endif
     }
 }
 

framework/Source/Pipeline.swift

@@ -93,22 +93,43 @@ class WeakImageConsumer {
 public class TargetContainer:Sequence {
     var targets = [WeakImageConsumer]()
     var count:Int { get {return targets.count}}
+#if !os(Linux)
     let dispatchQueue = DispatchQueue(label:"com.sunsetlakesoftware.GPUImage.targetContainerQueue", attributes: [])
-
+#endif
+
     public init() {
     }
 
     public func append(_ target:ImageConsumer, indexAtTarget:UInt) {
         // TODO: Don't allow the addition of a target more than once
+#if os(Linux)
+            self.targets.append(WeakImageConsumer(value:target, indexAtTarget:indexAtTarget))
+#else
         dispatchQueue.async{
             self.targets.append(WeakImageConsumer(value:target, indexAtTarget:indexAtTarget))
         }
+#endif
     }
 
     public func makeIterator() -> AnyIterator<(ImageConsumer, UInt)> {
         var index = 0
 
         return AnyIterator { () -> (ImageConsumer, UInt)? in
+#if os(Linux)
+                if (index >= self.targets.count) {
+                    return nil
+                }
+
+                while (self.targets[index].value == nil) {
+                    self.targets.remove(at:index)
+                    if (index >= self.targets.count) {
+                        return nil
+                    }
+                }
+
+                index += 1
+                return (self.targets[index - 1].value!, self.targets[index - 1].indexAtTarget)
+#else
             return self.dispatchQueue.sync{
                 if (index >= self.targets.count) {
                     return nil
@@ -123,14 +144,19 @@ public class TargetContainer:Sequence {
 
                 index += 1
                 return (self.targets[index - 1].value!, self.targets[index - 1].indexAtTarget)
-            }
+           }
+#endif
         }
     }
 
     public func removeAll() {
+#if os(Linux)
+            self.targets.removeAll()
+#else
         dispatchQueue.async{
             self.targets.removeAll()
         }
+#endif
     }
 }
 

framework/Source/ShaderProgram.swift

@@ -259,5 +259,5 @@ public func shaderFromFile(_ file:URL) throws -> String {
 
     let fragmentShaderString = try NSString(contentsOfFile:file.path, encoding:String.Encoding.ascii.rawValue)
 
-    return String(fragmentShaderString)
+    return String(describing:fragmentShaderString)
 }