Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
cc086b94
Commit
cc086b94
authored
May 15, 2015
by
Vadim Pisarevsky
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3979 from ruslo:fix.cxx11
parents
35884a7e
f148eaac
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
10 deletions
+10
-10
cap_avfoundation.mm
modules/videoio/src/cap_avfoundation.mm
+10
-10
No files found.
modules/videoio/src/cap_avfoundation.mm
View file @
cc086b94
...
...
@@ -540,11 +540,11 @@ bool CvCaptureCAM::setProperty(int property_id, double value) {
return true;
case CV_CAP_PROP_IOS_DEVICE_FOCUS:
if ([mCaptureDevice isFocusModeSupported:(
int
)value]){
if ([mCaptureDevice isFocusModeSupported:(
AVCaptureFocusMode
)value]){
NSError* error = nil;
[mCaptureDevice lockForConfiguration:&error];
if (error) return false;
[mCaptureDevice setFocusMode:(
int
)value];
[mCaptureDevice setFocusMode:(
AVCaptureFocusMode
)value];
[mCaptureDevice unlockForConfiguration];
//NSLog(@"Focus set");
return true;
...
...
@@ -553,11 +553,11 @@ bool CvCaptureCAM::setProperty(int property_id, double value) {
}
case CV_CAP_PROP_IOS_DEVICE_EXPOSURE:
if ([mCaptureDevice isExposureModeSupported:(
int
)value]){
if ([mCaptureDevice isExposureModeSupported:(
AVCaptureExposureMode
)value]){
NSError* error = nil;
[mCaptureDevice lockForConfiguration:&error];
if (error) return false;
[mCaptureDevice setExposureMode:(
int
)value];
[mCaptureDevice setExposureMode:(
AVCaptureExposureMode
)value];
[mCaptureDevice unlockForConfiguration];
//NSLog(@"Exposure set");
return true;
...
...
@@ -566,11 +566,11 @@ bool CvCaptureCAM::setProperty(int property_id, double value) {
}
case CV_CAP_PROP_IOS_DEVICE_FLASH:
if ( [mCaptureDevice hasFlash] && [mCaptureDevice isFlashModeSupported:(
int
)value]){
if ( [mCaptureDevice hasFlash] && [mCaptureDevice isFlashModeSupported:(
AVCaptureFlashMode
)value]){
NSError* error = nil;
[mCaptureDevice lockForConfiguration:&error];
if (error) return false;
[mCaptureDevice setFlashMode:(
int
)value];
[mCaptureDevice setFlashMode:(
AVCaptureFlashMode
)value];
[mCaptureDevice unlockForConfiguration];
//NSLog(@"Flash mode set");
return true;
...
...
@@ -579,11 +579,11 @@ bool CvCaptureCAM::setProperty(int property_id, double value) {
}
case CV_CAP_PROP_IOS_DEVICE_WHITEBALANCE:
if ([mCaptureDevice isWhiteBalanceModeSupported:(
int
)value]){
if ([mCaptureDevice isWhiteBalanceModeSupported:(
AVCaptureWhiteBalanceMode
)value]){
NSError* error = nil;
[mCaptureDevice lockForConfiguration:&error];
if (error) return false;
[mCaptureDevice setWhiteBalanceMode:(
int
)value];
[mCaptureDevice setWhiteBalanceMode:(
AVCaptureWhiteBalanceMode
)value];
[mCaptureDevice unlockForConfiguration];
//NSLog(@"White balance set");
return true;
...
...
@@ -592,11 +592,11 @@ bool CvCaptureCAM::setProperty(int property_id, double value) {
}
case CV_CAP_PROP_IOS_DEVICE_TORCH:
if ([mCaptureDevice hasFlash] && [mCaptureDevice isTorchModeSupported:(
int
)value]){
if ([mCaptureDevice hasFlash] && [mCaptureDevice isTorchModeSupported:(
AVCaptureTorchMode
)value]){
NSError* error = nil;
[mCaptureDevice lockForConfiguration:&error];
if (error) return false;
[mCaptureDevice setTorchMode:(
int
)value];
[mCaptureDevice setTorchMode:(
AVCaptureTorchMode
)value];
[mCaptureDevice unlockForConfiguration];
//NSLog(@"Torch mode set");
return true;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment