Commit after merge

This commit is contained in:
Andrew Walz 2017-05-29 20:48:06 -06:00
parent be817db1a6
commit b90a09d590

View file

@ -238,13 +238,14 @@ open class SwiftyCamViewController: UIViewController {
override open func viewDidLoad() { override open func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
previewLayer = PreviewView(frame: CGRect(x: 0.0, y: 0.0, width: view.bounds.width, height: view.bounds.height)) view = PreviewView(frame: view.frame)
previewLayer = view as! PreviewView!
// Add Gesture Recognizers // Add Gesture Recognizers
addGestureRecognizersTo(view: previewLayer) addGestureRecognizersTo(view: view)
self.view.addSubview(previewLayer) //self.view.addSubview(previewLayer)
previewLayer.session = session previewLayer.session = session
// Test authorization status for Camera and Micophone // Test authorization status for Camera and Micophone
@ -279,10 +280,10 @@ open class SwiftyCamViewController: UIViewController {
/// ViewDidLayoutSubviews() Implementation /// ViewDidLayoutSubviews() Implementation
override open func viewDidLayoutSubviews() { /*override open func viewDidLayoutSubviews() {
previewLayer.frame = CGRect(x: 0.0, y: 0.0, width: view.bounds.width, height: view.bounds.height) previewLayer.frame = CGRect(x: 0.0, y: 0.0, width: view.bounds.width, height: view.bounds.height)
super.viewDidLayoutSubviews() super.viewDidLayoutSubviews()
} } */
// MARK: ViewDidAppear // MARK: ViewDidAppear