Skip to content
This repository has been archived by the owner on Jan 12, 2019. It is now read-only.

Update CardIOVideoStream's previewLayer to CALayer #63

Merged
merged 1 commit into from
Apr 27, 2016
Merged

Update CardIOVideoStream's previewLayer to CALayer #63

merged 1 commit into from
Apr 27, 2016

Conversation

wisolith
Copy link
Contributor

Update CardIOVideoStream's previewLayer to CALayer to allow it to be a SimulatedCameraLayer.

Resolves the following compile error in Xcode 7.3:

/card.io-iOS-source/Classes/CardIOVideoStream.mm:189:19: error: assigning to
'AVCaptureVideoPreviewLayer *__strong' from incompatible type 'SimulatedCameraLayer * _Nonnull'

@bluk
Copy link
Contributor

bluk commented Apr 27, 2016

Thanks for the PR. I'll merge this in but will add another commit on top for:

#if SIMULATE_CAMERA
@property(nonatomic, strong, readwrite) CALayer *previewLayer;
#else
@property(nonatomic, strong, readwrite) AVCaptureVideoPreviewLayer *previewLayer;
#endif

There were some errors when compiling for release because the types mismatched when SIMULATE_CAMERA was not set.

@bluk bluk merged commit fabc925 into card-io:master Apr 27, 2016
bluk pushed a commit that referenced this pull request Apr 27, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants