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
d7597a86
Commit
d7597a86
authored
Jun 25, 2017
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
videoio: do not mix `CV_CAP` and `CAP_` APIs enum values
parent
460e9bf0
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
2 deletions
+4
-2
gen_dict.json
modules/videoio/misc/gen_dict.json
+2
-0
cap.cpp
modules/videoio/src/cap.cpp
+0
-0
cap_aravis.cpp
modules/videoio/src/cap_aravis.cpp
+1
-1
precomp.hpp
modules/videoio/src/precomp.hpp
+1
-1
No files found.
modules/videoio/misc/gen_dict.json
View file @
d7597a86
{
"const_ignore_list"
:
[
"CV_CAP_OPENNI"
,
"CV_CAP_OPENNI2"
,
"CV_CAP_PROP_OPENNI_"
,
"CV_CAP_INTELPERC"
,
"CV_CAP_PROP_INTELPERC_"
,
...
...
@@ -20,6 +21,7 @@
"CV_CAP_UNICAP"
,
"CV_CAP_DSHOW"
,
"CV_CAP_PVAPI"
,
"CV_CAP_ARAVIS"
,
"CV_CAP_PROP_DC1394_OFF"
,
"CV_CAP_PROP_DC1394_MODE_MANUAL"
,
"CV_CAP_PROP_DC1394_MODE_AUTO"
,
...
...
modules/videoio/src/cap.cpp
View file @
d7597a86
This diff is collapsed.
Click to expand it.
modules/videoio/src/cap_aravis.cpp
View file @
d7597a86
...
...
@@ -109,7 +109,7 @@ public:
virtual
IplImage
*
retrieveFrame
(
int
);
virtual
int
getCaptureDomain
()
{
return
CV_
CAP_ARAVIS
;
return
cv
::
CAP_ARAVIS
;
}
protected
:
...
...
modules/videoio/src/precomp.hpp
View file @
d7597a86
...
...
@@ -90,7 +90,7 @@ struct CvCapture
virtual
bool
setProperty
(
int
,
double
)
{
return
0
;
}
virtual
bool
grabFrame
()
{
return
true
;
}
virtual
IplImage
*
retrieveFrame
(
int
)
{
return
0
;
}
virtual
int
getCaptureDomain
()
{
return
CV_CAP_ANY
;
}
// Return the type of the capture object: CV_
CAP_VFW, etc...
virtual
int
getCaptureDomain
()
{
return
cv
::
CAP_ANY
;
}
// Return the type of the capture object:
CAP_VFW, etc...
};
/*************************** CvVideoWriter structure ****************************/
...
...
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