projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
77b01de
)
videoio: fix compilation with Aravis enabled
author
lpea
<abun.lp@gmail.com>
Sun, 2 Aug 2020 12:26:48 +0000
(14:26 +0200)
committer
lpea
<abun.lp@gmail.com>
Sun, 2 Aug 2020 12:27:44 +0000
(14:27 +0200)
modules/videoio/src/cap_aravis.cpp
patch
|
blob
|
history
diff --git
a/modules/videoio/src/cap_aravis.cpp
b/modules/videoio/src/cap_aravis.cpp
index
2040c9c
..
1f0e21e
100644
(file)
--- a/
modules/videoio/src/cap_aravis.cpp
+++ b/
modules/videoio/src/cap_aravis.cpp
@@
-502,7
+502,7
@@
double CvCaptureCAM_Aravis::getProperty( int property_id ) const
}
break;
- case CAP_PROP_ARAVIS_AUTOTRIGGER:
+ case
cv::
CAP_PROP_ARAVIS_AUTOTRIGGER:
{
return allowAutoTrigger ? 1. : 0.;
}
@@
-591,7
+591,7
@@
bool CvCaptureCAM_Aravis::setProperty( int property_id, double value )
}
break;
- case CAP_PROP_ARAVIS_AUTOTRIGGER:
+ case
cv::
CAP_PROP_ARAVIS_AUTOTRIGGER:
{
allowAutoTrigger = (bool) value;
}