potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-21 19:33:03 +04:00
Code Packages Releases Wiki Activity

Merge pull request #7518 from ArkadiuszRaj:aravis-buffer-status

Browse Source 
Aravis several updates

* Fix adressing camera with id=0

* Aravis buffer property control & status added

* Modify of autoexposure algorith, ream frame ID from aravis + new properites

* Change of macro name

* VideoCapture now returns no frame on camera disconnecion

* Allow aravis-0.4 usage, proper camera object release.
This commit is contained in:
Arek
2016-10-22 18:07:55 +02:00
committed by Alexander Alekhin
parent 44e5d26312
commit e77bc24b96
3 changed files with 93 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/OpenCVFindLibsVideo.cmake
+2 -2
View File
@@ -129,9 +129,9 @@ ocv_clear_vars(HAVE_ARAVIS_API)
if(WITH_ARAVIS)
find_path(ARAVIS_INCLUDE_PATH "arv.h"
PATHS /usr/local /var /opt /usr ENV ProgramFiles ENV ProgramW6432
PATH_SUFFIXES include "aravis-0.6"
PATH_SUFFIXES include "aravis-0.6" "aravis-0.4"
DOC "The path to Aravis SDK headers")
find_library(ARAVIS_LIBRARIES "aravis-0.6")
find_library(ARAVIS_LIBRARIES NAMES "aravis-0.6" "aravis-0.4" )
if(ARAVIS_LIBRARIES AND ARAVIS_INCLUDE_PATH)
set(HAVE_ARAVIS_API TRUE)
endif()