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
8f0669c3
Commit
8f0669c3
authored
Mar 15, 2018
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
videoio: apply CV_OVERRIDE/CV_FINAL
parent
a91953b1
Hide whitespace changes
Inline
Side-by-side
Showing
26 changed files
with
139 additions
and
141 deletions
+139
-141
cap_aravis.cpp
modules/videoio/src/cap_aravis.cpp
+5
-5
cap_cmu.cpp
modules/videoio/src/cap_cmu.cpp
+4
-4
cap_dc1394.cpp
modules/videoio/src/cap_dc1394.cpp
+5
-5
cap_dc1394_v2.cpp
modules/videoio/src/cap_dc1394_v2.cpp
+5
-5
cap_dshow.hpp
modules/videoio/src/cap_dshow.hpp
+5
-7
cap_ffmpeg.cpp
modules/videoio/src/cap_ffmpeg.cpp
+7
-7
cap_giganetix.cpp
modules/videoio/src/cap_giganetix.cpp
+5
-5
cap_gphoto2.cpp
modules/videoio/src/cap_gphoto2.cpp
+9
-9
cap_gstreamer.cpp
modules/videoio/src/cap_gstreamer.cpp
+7
-7
cap_images.cpp
modules/videoio/src/cap_images.cpp
+8
-8
cap_intelperc.hpp
modules/videoio/src/cap_intelperc.hpp
+6
-6
cap_libv4l.cpp
modules/videoio/src/cap_libv4l.cpp
+4
-4
cap_mfx_reader.hpp
modules/videoio/src/cap_mfx_reader.hpp
+6
-6
cap_mjpeg_decoder.cpp
modules/videoio/src/cap_mjpeg_decoder.cpp
+7
-7
cap_mjpeg_encoder.cpp
modules/videoio/src/cap_mjpeg_encoder.cpp
+5
-5
cap_msmf.cpp
modules/videoio/src/cap_msmf.cpp
+5
-5
cap_openni.cpp
modules/videoio/src/cap_openni.cpp
+4
-4
cap_openni2.cpp
modules/videoio/src/cap_openni2.cpp
+4
-4
cap_pvapi.cpp
modules/videoio/src/cap_pvapi.cpp
+5
-5
cap_qt.cpp
modules/videoio/src/cap_qt.cpp
+5
-5
cap_unicap.cpp
modules/videoio/src/cap_unicap.cpp
+5
-5
cap_v4l.cpp
modules/videoio/src/cap_v4l.cpp
+5
-5
cap_vfw.cpp
modules/videoio/src/cap_vfw.cpp
+5
-5
cap_ximea.cpp
modules/videoio/src/cap_ximea.cpp
+5
-5
cap_xine.cpp
modules/videoio/src/cap_xine.cpp
+4
-4
test_ffmpeg.cpp
modules/videoio/test/test_ffmpeg.cpp
+4
-4
No files found.
modules/videoio/src/cap_aravis.cpp
View file @
8f0669c3
...
@@ -103,11 +103,11 @@ public:
...
@@ -103,11 +103,11 @@ public:
virtual
bool
open
(
int
);
virtual
bool
open
(
int
);
virtual
void
close
();
virtual
void
close
();
virtual
double
getProperty
(
int
)
const
;
virtual
double
getProperty
(
int
)
const
CV_OVERRIDE
;
virtual
bool
setProperty
(
int
,
double
);
virtual
bool
setProperty
(
int
,
double
)
CV_OVERRIDE
;
virtual
bool
grabFrame
();
virtual
bool
grabFrame
()
CV_OVERRIDE
;
virtual
IplImage
*
retrieveFrame
(
int
);
virtual
IplImage
*
retrieveFrame
(
int
)
CV_OVERRIDE
;
virtual
int
getCaptureDomain
()
virtual
int
getCaptureDomain
()
CV_OVERRIDE
{
{
return
cv
::
CAP_ARAVIS
;
return
cv
::
CAP_ARAVIS
;
}
}
...
...
modules/videoio/src/cap_cmu.cpp
View file @
8f0669c3
...
@@ -68,10 +68,10 @@ public:
...
@@ -68,10 +68,10 @@ public:
virtual
bool
open
(
int
cameraId
);
virtual
bool
open
(
int
cameraId
);
virtual
void
close
();
virtual
void
close
();
virtual
double
getProperty
(
int
)
const
;
virtual
double
getProperty
(
int
)
const
CV_OVERRIDE
;
virtual
bool
setProperty
(
int
,
double
);
virtual
bool
setProperty
(
int
,
double
)
CV_OVERRIDE
;
virtual
bool
grabFrame
();
virtual
bool
grabFrame
()
CV_OVERRIDE
;
virtual
IplImage
*
retrieveFrame
(
int
);
virtual
IplImage
*
retrieveFrame
(
int
)
CV_OVERRIDE
;
protected
:
protected
:
C1394Camera
*
camera
();
C1394Camera
*
camera
();
...
...
modules/videoio/src/cap_dc1394.cpp
View file @
8f0669c3
...
@@ -1049,11 +1049,11 @@ public:
...
@@ -1049,11 +1049,11 @@ public:
virtual
bool
open
(
int
index
);
virtual
bool
open
(
int
index
);
virtual
void
close
();
virtual
void
close
();
virtual
double
getProperty
(
int
)
const
;
virtual
double
getProperty
(
int
)
const
CV_OVERRIDE
;
virtual
bool
setProperty
(
int
,
double
);
virtual
bool
setProperty
(
int
,
double
)
CV_OVERRIDE
;
virtual
bool
grabFrame
();
virtual
bool
grabFrame
()
CV_OVERRIDE
;
virtual
IplImage
*
retrieveFrame
(
int
);
virtual
IplImage
*
retrieveFrame
(
int
)
CV_OVERRIDE
;
virtual
int
getCaptureDomain
()
{
return
CV_CAP_DC1394
;
}
// Return the type of the capture object: CV_CAP_VFW, etc...
virtual
int
getCaptureDomain
()
CV_OVERRIDE
{
return
CV_CAP_DC1394
;
}
// Return the type of the capture object: CV_CAP_VFW, etc...
protected
:
protected
:
CvCaptureCAM_DC1394
*
captureDC1394
;
CvCaptureCAM_DC1394
*
captureDC1394
;
...
...
modules/videoio/src/cap_dc1394_v2.cpp
View file @
8f0669c3
...
@@ -207,11 +207,11 @@ public:
...
@@ -207,11 +207,11 @@ public:
virtual
bool
open
(
int
index
);
virtual
bool
open
(
int
index
);
virtual
void
close
();
virtual
void
close
();
virtual
double
getProperty
(
int
)
const
;
virtual
double
getProperty
(
int
)
const
CV_OVERRIDE
;
virtual
bool
setProperty
(
int
,
double
);
virtual
bool
setProperty
(
int
,
double
)
CV_OVERRIDE
;
virtual
bool
grabFrame
();
virtual
bool
grabFrame
()
CV_OVERRIDE
;
virtual
IplImage
*
retrieveFrame
(
int
);
virtual
IplImage
*
retrieveFrame
(
int
)
CV_OVERRIDE
;
virtual
int
getCaptureDomain
()
{
return
CV_CAP_DC1394
;
}
// Return the type of the capture object: CV_CAP_VFW, etc...
virtual
int
getCaptureDomain
()
CV_OVERRIDE
{
return
CV_CAP_DC1394
;
}
// Return the type of the capture object: CV_CAP_VFW, etc...
protected
:
protected
:
...
...
modules/videoio/src/cap_dshow.hpp
View file @
8f0669c3
...
@@ -12,8 +12,6 @@
...
@@ -12,8 +12,6 @@
#ifndef _CAP_DSHOW_HPP_
#ifndef _CAP_DSHOW_HPP_
#define _CAP_DSHOW_HPP_
#define _CAP_DSHOW_HPP_
#include "precomp.hpp"
#ifdef HAVE_DSHOW
#ifdef HAVE_DSHOW
class
videoInput
;
class
videoInput
;
...
@@ -26,12 +24,12 @@ public:
...
@@ -26,12 +24,12 @@ public:
VideoCapture_DShow
(
int
index
);
VideoCapture_DShow
(
int
index
);
virtual
~
VideoCapture_DShow
();
virtual
~
VideoCapture_DShow
();
virtual
double
getProperty
(
int
propIdx
)
const
;
virtual
double
getProperty
(
int
propIdx
)
const
CV_OVERRIDE
;
virtual
bool
setProperty
(
int
propIdx
,
double
propVal
);
virtual
bool
setProperty
(
int
propIdx
,
double
propVal
)
CV_OVERRIDE
;
virtual
bool
grabFrame
();
virtual
bool
grabFrame
()
CV_OVERRIDE
;
virtual
bool
retrieveFrame
(
int
outputType
,
OutputArray
frame
);
virtual
bool
retrieveFrame
(
int
outputType
,
OutputArray
frame
)
CV_OVERRIDE
;
virtual
int
getCaptureDomain
();
virtual
int
getCaptureDomain
()
CV_OVERRIDE
;
virtual
bool
isOpened
()
const
;
virtual
bool
isOpened
()
const
;
protected
:
protected
:
void
open
(
int
index
);
void
open
(
int
index
);
...
...
modules/videoio/src/cap_ffmpeg.cpp
View file @
8f0669c3
...
@@ -196,26 +196,26 @@ private:
...
@@ -196,26 +196,26 @@ private:
};
};
class
CvCapture_FFMPEG_proxy
:
class
CvCapture_FFMPEG_proxy
CV_FINAL
:
public
CvCapture
public
CvCapture
{
{
public
:
public
:
CvCapture_FFMPEG_proxy
()
{
ffmpegCapture
=
0
;
}
CvCapture_FFMPEG_proxy
()
{
ffmpegCapture
=
0
;
}
virtual
~
CvCapture_FFMPEG_proxy
()
{
close
();
}
virtual
~
CvCapture_FFMPEG_proxy
()
{
close
();
}
virtual
double
getProperty
(
int
propId
)
const
virtual
double
getProperty
(
int
propId
)
const
CV_OVERRIDE
{
{
return
ffmpegCapture
?
icvGetCaptureProperty_FFMPEG_p
(
ffmpegCapture
,
propId
)
:
0
;
return
ffmpegCapture
?
icvGetCaptureProperty_FFMPEG_p
(
ffmpegCapture
,
propId
)
:
0
;
}
}
virtual
bool
setProperty
(
int
propId
,
double
value
)
virtual
bool
setProperty
(
int
propId
,
double
value
)
CV_OVERRIDE
{
{
return
ffmpegCapture
?
icvSetCaptureProperty_FFMPEG_p
(
ffmpegCapture
,
propId
,
value
)
!=
0
:
false
;
return
ffmpegCapture
?
icvSetCaptureProperty_FFMPEG_p
(
ffmpegCapture
,
propId
,
value
)
!=
0
:
false
;
}
}
virtual
bool
grabFrame
()
virtual
bool
grabFrame
()
CV_OVERRIDE
{
{
return
ffmpegCapture
?
icvGrabFrame_FFMPEG_p
(
ffmpegCapture
)
!=
0
:
false
;
return
ffmpegCapture
?
icvGrabFrame_FFMPEG_p
(
ffmpegCapture
)
!=
0
:
false
;
}
}
virtual
IplImage
*
retrieveFrame
(
int
)
virtual
IplImage
*
retrieveFrame
(
int
)
CV_OVERRIDE
{
{
unsigned
char
*
data
=
0
;
unsigned
char
*
data
=
0
;
int
step
=
0
,
width
=
0
,
height
=
0
,
cn
=
0
;
int
step
=
0
,
width
=
0
,
height
=
0
,
cn
=
0
;
...
@@ -260,14 +260,14 @@ CvCapture* cvCreateFileCapture_FFMPEG_proxy(const char * filename)
...
@@ -260,14 +260,14 @@ CvCapture* cvCreateFileCapture_FFMPEG_proxy(const char * filename)
return
0
;
return
0
;
}
}
class
CvVideoWriter_FFMPEG_proxy
:
class
CvVideoWriter_FFMPEG_proxy
CV_FINAL
:
public
CvVideoWriter
public
CvVideoWriter
{
{
public
:
public
:
CvVideoWriter_FFMPEG_proxy
()
{
ffmpegWriter
=
0
;
}
CvVideoWriter_FFMPEG_proxy
()
{
ffmpegWriter
=
0
;
}
virtual
~
CvVideoWriter_FFMPEG_proxy
()
{
close
();
}
virtual
~
CvVideoWriter_FFMPEG_proxy
()
{
close
();
}
virtual
bool
writeFrame
(
const
IplImage
*
image
)
virtual
bool
writeFrame
(
const
IplImage
*
image
)
CV_OVERRIDE
{
{
if
(
!
ffmpegWriter
)
if
(
!
ffmpegWriter
)
return
false
;
return
false
;
...
...
modules/videoio/src/cap_giganetix.cpp
View file @
8f0669c3
...
@@ -294,11 +294,11 @@ class CvCaptureCAM_Giganetix : public CvCapture
...
@@ -294,11 +294,11 @@ class CvCaptureCAM_Giganetix : public CvCapture
virtual
bool
open
(
int
index
);
virtual
bool
open
(
int
index
);
virtual
void
close
();
virtual
void
close
();
virtual
double
getProperty
(
int
)
const
;
virtual
double
getProperty
(
int
)
const
CV_OVERRIDE
;
virtual
bool
setProperty
(
int
,
double
);
virtual
bool
setProperty
(
int
,
double
)
CV_OVERRIDE
;
virtual
bool
grabFrame
();
virtual
bool
grabFrame
()
CV_OVERRIDE
;
virtual
IplImage
*
retrieveFrame
(
int
);
virtual
IplImage
*
retrieveFrame
(
int
)
CV_OVERRIDE
;
virtual
int
getCaptureDomain
()
virtual
int
getCaptureDomain
()
CV_OVERRIDE
{
{
return
CV_CAP_GIGANETIX
;
return
CV_CAP_GIGANETIX
;
}
}
...
...
modules/videoio/src/cap_gphoto2.cpp
View file @
8f0669c3
...
@@ -65,7 +65,7 @@ public:
...
@@ -65,7 +65,7 @@ public:
result
=
gPhoto2Result
;
result
=
gPhoto2Result
;
method
=
methodStr
;
method
=
methodStr
;
}
}
virtual
const
char
*
what
()
const
throw
()
virtual
const
char
*
what
()
const
throw
()
CV_OVERRIDE
{
{
return
gp_result_as_string
(
result
);
return
gp_result_as_string
(
result
);
}
}
...
@@ -137,14 +137,14 @@ public:
...
@@ -137,14 +137,14 @@ public:
DigitalCameraCapture
();
DigitalCameraCapture
();
DigitalCameraCapture
(
int
index
);
DigitalCameraCapture
(
int
index
);
DigitalCameraCapture
(
const
String
&
deviceName
);
DigitalCameraCapture
(
const
String
&
deviceName
);
virtual
~
DigitalCameraCapture
();
virtual
~
DigitalCameraCapture
()
CV_OVERRIDE
;
virtual
bool
isOpened
()
const
;
virtual
bool
isOpened
()
const
CV_OVERRIDE
;
virtual
double
getProperty
(
int
)
const
;
virtual
double
getProperty
(
int
)
const
CV_OVERRIDE
;
virtual
bool
setProperty
(
int
,
double
);
virtual
bool
setProperty
(
int
,
double
)
CV_OVERRIDE
;
virtual
bool
grabFrame
();
virtual
bool
grabFrame
()
CV_OVERRIDE
;
virtual
bool
retrieveFrame
(
int
,
OutputArray
);
virtual
bool
retrieveFrame
(
int
,
OutputArray
)
CV_OVERRIDE
;
virtual
int
getCaptureDomain
()
virtual
int
getCaptureDomain
()
CV_OVERRIDE
{
{
return
CV_CAP_GPHOTO2
;
return
CV_CAP_GPHOTO2
;
}
// Return the type of the capture object: CV_CAP_VFW, etc...
}
// Return the type of the capture object: CV_CAP_VFW, etc...
...
...
modules/videoio/src/cap_gstreamer.cpp
View file @
8f0669c3
...
@@ -130,7 +130,7 @@ private:
...
@@ -130,7 +130,7 @@ private:
* \brief The CvCapture_GStreamer class
* \brief The CvCapture_GStreamer class
* Use GStreamer to capture video
* Use GStreamer to capture video
*/
*/
class
CvCapture_GStreamer
:
public
CvCapture
class
CvCapture_GStreamer
CV_FINAL
:
public
CvCapture
{
{
public
:
public
:
CvCapture_GStreamer
()
{
init
();
}
CvCapture_GStreamer
()
{
init
();
}
...
@@ -139,10 +139,10 @@ public:
...
@@ -139,10 +139,10 @@ public:
virtual
bool
open
(
int
type
,
const
char
*
filename
);
virtual
bool
open
(
int
type
,
const
char
*
filename
);
virtual
void
close
();
virtual
void
close
();
virtual
double
getProperty
(
int
)
const
;
virtual
double
getProperty
(
int
)
const
CV_OVERRIDE
;
virtual
bool
setProperty
(
int
,
double
);
virtual
bool
setProperty
(
int
,
double
)
CV_OVERRIDE
;
virtual
bool
grabFrame
();
virtual
bool
grabFrame
()
CV_OVERRIDE
;
virtual
IplImage
*
retrieveFrame
(
int
);
virtual
IplImage
*
retrieveFrame
(
int
)
CV_OVERRIDE
;
protected
:
protected
:
void
init
();
void
init
();
...
@@ -1262,12 +1262,12 @@ class CvVideoWriter_GStreamer : public CvVideoWriter
...
@@ -1262,12 +1262,12 @@ class CvVideoWriter_GStreamer : public CvVideoWriter
{
{
public
:
public
:
CvVideoWriter_GStreamer
()
{
init
();
}
CvVideoWriter_GStreamer
()
{
init
();
}
virtual
~
CvVideoWriter_GStreamer
()
{
close
();
}
virtual
~
CvVideoWriter_GStreamer
()
CV_OVERRIDE
{
close
();
}
virtual
bool
open
(
const
char
*
filename
,
int
fourcc
,
virtual
bool
open
(
const
char
*
filename
,
int
fourcc
,
double
fps
,
CvSize
frameSize
,
bool
isColor
);
double
fps
,
CvSize
frameSize
,
bool
isColor
);
virtual
void
close
();
virtual
void
close
();
virtual
bool
writeFrame
(
const
IplImage
*
image
);
virtual
bool
writeFrame
(
const
IplImage
*
image
)
CV_OVERRIDE
;
protected
:
protected
:
void
init
();
void
init
();
const
char
*
filenameToMimetype
(
const
char
*
filename
);
const
char
*
filenameToMimetype
(
const
char
*
filename
);
...
...
modules/videoio/src/cap_images.cpp
View file @
8f0669c3
...
@@ -74,17 +74,17 @@ public:
...
@@ -74,17 +74,17 @@ public:
grabbedInOpen
=
false
;
grabbedInOpen
=
false
;
}
}
virtual
~
CvCapture_Images
()
virtual
~
CvCapture_Images
()
CV_OVERRIDE
{
{
close
();
close
();
}
}
virtual
bool
open
(
const
char
*
_filename
);
virtual
bool
open
(
const
char
*
_filename
);
virtual
void
close
();
virtual
void
close
();
virtual
double
getProperty
(
int
)
const
;
virtual
double
getProperty
(
int
)
const
CV_OVERRIDE
;
virtual
bool
setProperty
(
int
,
double
);
virtual
bool
setProperty
(
int
,
double
)
CV_OVERRIDE
;
virtual
bool
grabFrame
();
virtual
bool
grabFrame
()
CV_OVERRIDE
;
virtual
IplImage
*
retrieveFrame
(
int
);
virtual
IplImage
*
retrieveFrame
(
int
)
CV_OVERRIDE
;
protected
:
protected
:
char
*
filename
;
// actually a printf-pattern
char
*
filename
;
// actually a printf-pattern
...
@@ -321,7 +321,7 @@ CvCapture* cvCreateFileCapture_Images(const char * filename)
...
@@ -321,7 +321,7 @@ CvCapture* cvCreateFileCapture_Images(const char * filename)
// image sequence writer
// image sequence writer
//
//
//
//
class
CvVideoWriter_Images
:
public
CvVideoWriter
class
CvVideoWriter_Images
CV_FINAL
:
public
CvVideoWriter
{
{
public
:
public
:
CvVideoWriter_Images
()
CvVideoWriter_Images
()
...
@@ -333,8 +333,8 @@ public:
...
@@ -333,8 +333,8 @@ public:
virtual
bool
open
(
const
char
*
_filename
);
virtual
bool
open
(
const
char
*
_filename
);
virtual
void
close
();
virtual
void
close
();
virtual
bool
setProperty
(
int
,
double
);
virtual
bool
setProperty
(
int
,
double
);
// FIXIT doesn't work: IVideoWriter interface only!
virtual
bool
writeFrame
(
const
IplImage
*
);
virtual
bool
writeFrame
(
const
IplImage
*
)
CV_OVERRIDE
;
protected
:
protected
:
char
*
filename
;
char
*
filename
;
...
...
modules/videoio/src/cap_intelperc.hpp
View file @
8f0669c3
...
@@ -94,13 +94,13 @@ public:
...
@@ -94,13 +94,13 @@ public:
VideoCapture_IntelPerC
();
VideoCapture_IntelPerC
();
virtual
~
VideoCapture_IntelPerC
();
virtual
~
VideoCapture_IntelPerC
();
virtual
double
getProperty
(
int
propIdx
)
const
;
virtual
double
getProperty
(
int
propIdx
)
const
CV_OVERRIDE
;
virtual
bool
setProperty
(
int
propIdx
,
double
propVal
);
virtual
bool
setProperty
(
int
propIdx
,
double
propVal
)
CV_OVERRIDE
;
virtual
bool
grabFrame
();
virtual
bool
grabFrame
()
CV_OVERRIDE
;
virtual
bool
retrieveFrame
(
int
outputType
,
OutputArray
frame
);
virtual
bool
retrieveFrame
(
int
outputType
,
OutputArray
frame
)
CV_OVERRIDE
;
virtual
int
getCaptureDomain
();
virtual
int
getCaptureDomain
()
CV_OVERRIDE
;
virtual
bool
isOpened
()
const
;
virtual
bool
isOpened
()
const
CV_OVERRIDE
;
protected
:
protected
:
bool
m_contextOpened
;
bool
m_contextOpened
;
...
...
modules/videoio/src/cap_libv4l.cpp
View file @
8f0669c3
...
@@ -1924,10 +1924,10 @@ public:
...
@@ -1924,10 +1924,10 @@ public:
virtual
bool
open
(
const
char
*
deviceName
);
virtual
bool
open
(
const
char
*
deviceName
);
virtual
void
close
();
virtual
void
close
();
virtual
double
getProperty
(
int
)
const
;
virtual
double
getProperty
(
int
)
const
CV_OVERRIDE
;
virtual
bool
setProperty
(
int
,
double
);
virtual
bool
setProperty
(
int
,
double
)
CV_OVERRIDE
;
virtual
bool
grabFrame
();
virtual
bool
grabFrame
()
CV_OVERRIDE
;
virtual
IplImage
*
retrieveFrame
(
int
);
virtual
IplImage
*
retrieveFrame
(
int
)
CV_OVERRIDE
;
protected
:
protected
:
CvCaptureCAM_V4L
*
captureV4L
;
CvCaptureCAM_V4L
*
captureV4L
;
...
...
modules/videoio/src/cap_mfx_reader.hpp
View file @
8f0669c3
...
@@ -20,12 +20,12 @@ class VideoCapture_IntelMFX : public cv::IVideoCapture
...
@@ -20,12 +20,12 @@ class VideoCapture_IntelMFX : public cv::IVideoCapture
public
:
public
:
VideoCapture_IntelMFX
(
const
cv
::
String
&
filename
);
VideoCapture_IntelMFX
(
const
cv
::
String
&
filename
);
virtual
~
VideoCapture_IntelMFX
();
virtual
~
VideoCapture_IntelMFX
();
virtual
double
getProperty
(
int
)
const
;
virtual
double
getProperty
(
int
)
const
CV_OVERRIDE
;
virtual
bool
setProperty
(
int
,
double
);
virtual
bool
setProperty
(
int
,
double
)
CV_OVERRIDE
;
virtual
bool
grabFrame
();
virtual
bool
grabFrame
()
CV_OVERRIDE
;
virtual
bool
retrieveFrame
(
int
,
cv
::
OutputArray
out
);
virtual
bool
retrieveFrame
(
int
,
cv
::
OutputArray
out
)
CV_OVERRIDE
;
virtual
bool
isOpened
()
const
;
virtual
bool
isOpened
()
const
CV_OVERRIDE
;
virtual
int
getCaptureDomain
();
virtual
int
getCaptureDomain
()
CV_OVERRIDE
;
private
:
private
:
MFXVideoSession
*
session
;
MFXVideoSession
*
session
;
Plugin
*
plugin
;
Plugin
*
plugin
;
...
...
modules/videoio/src/cap_mjpeg_decoder.cpp
View file @
8f0669c3
...
@@ -48,13 +48,13 @@ namespace cv
...
@@ -48,13 +48,13 @@ namespace cv
class
MotionJpegCapture
:
public
IVideoCapture
class
MotionJpegCapture
:
public
IVideoCapture
{
{
public
:
public
:
virtual
~
MotionJpegCapture
();
virtual
~
MotionJpegCapture
()
CV_OVERRIDE
;
virtual
double
getProperty
(
int
)
const
;
virtual
double
getProperty
(
int
)
const
CV_OVERRIDE
;
virtual
bool
setProperty
(
int
,
double
);
virtual
bool
setProperty
(
int
,
double
)
CV_OVERRIDE
;
virtual
bool
grabFrame
();
virtual
bool
grabFrame
()
CV_OVERRIDE
;
virtual
bool
retrieveFrame
(
int
,
OutputArray
);
virtual
bool
retrieveFrame
(
int
,
OutputArray
)
CV_OVERRIDE
;
virtual
bool
isOpened
()
const
;
virtual
bool
isOpened
()
const
CV_OVERRIDE
;
virtual
int
getCaptureDomain
()
{
return
CAP_ANY
;
}
// Return the type of the capture object: CAP_VFW, etc...
virtual
int
getCaptureDomain
()
CV_OVERRIDE
{
return
CAP_ANY
;
}
// Return the type of the capture object: CAP_VFW, etc...
MotionJpegCapture
(
const
String
&
);
MotionJpegCapture
(
const
String
&
);
bool
open
(
const
String
&
);
bool
open
(
const
String
&
);
...
...
modules/videoio/src/cap_mjpeg_encoder.cpp
View file @
8f0669c3
...
@@ -438,9 +438,9 @@ public:
...
@@ -438,9 +438,9 @@ public:
return
true
;
return
true
;
}
}
bool
isOpened
()
const
{
return
container
.
isOpenedStream
();
}
bool
isOpened
()
const
CV_OVERRIDE
{
return
container
.
isOpenedStream
();
}
void
write
(
InputArray
_img
)
void
write
(
InputArray
_img
)
CV_OVERRIDE
{
{
Mat
img
=
_img
.
getMat
();
Mat
img
=
_img
.
getMat
();
size_t
chunkPointer
=
container
.
getStreamPos
();
size_t
chunkPointer
=
container
.
getStreamPos
();
...
@@ -493,7 +493,7 @@ public:
...
@@ -493,7 +493,7 @@ public:
}
}
}
}
double
getProperty
(
int
propId
)
const
double
getProperty
(
int
propId
)
const
CV_OVERRIDE
{
{
if
(
propId
==
VIDEOWRITER_PROP_QUALITY
)
if
(
propId
==
VIDEOWRITER_PROP_QUALITY
)
return
quality
;
return
quality
;
...
@@ -507,7 +507,7 @@ public:
...
@@ -507,7 +507,7 @@ public:
return
0.
;
return
0.
;
}
}
bool
setProperty
(
int
propId
,
double
value
)
bool
setProperty
(
int
propId
,
double
value
)
CV_OVERRIDE
{
{
if
(
propId
==
VIDEOWRITER_PROP_QUALITY
)
if
(
propId
==
VIDEOWRITER_PROP_QUALITY
)
{
{
...
@@ -1186,7 +1186,7 @@ public:
...
@@ -1186,7 +1186,7 @@ public:
m_buffer_list
.
allocate_buffers
(
stripes_count
,
(
height
*
width
*
2
)
/
stripes_count
);
m_buffer_list
.
allocate_buffers
(
stripes_count
,
(
height
*
width
*
2
)
/
stripes_count
);
}
}
void
operator
()(
const
cv
::
Range
&
range
)
const
void
operator
()(
const
cv
::
Range
&
range
)
const
CV_OVERRIDE
{
{
const
int
CAT_TAB_SIZE
=
4096
;
const
int
CAT_TAB_SIZE
=
4096
;
unsigned
code
=
0
;
unsigned
code
=
0
;
...
...
modules/videoio/src/cap_msmf.cpp
View file @
8f0669c3
...
@@ -3440,11 +3440,11 @@ public:
...
@@ -3440,11 +3440,11 @@ public:
virtual
~
CvCaptureCAM_MSMF
();
virtual
~
CvCaptureCAM_MSMF
();
virtual
bool
open
(
int
index
);
virtual
bool
open
(
int
index
);
virtual
void
close
();
virtual
void
close
();
virtual
double
getProperty
(
int
)
const
;
virtual
double
getProperty
(
int
)
const
CV_OVERRIDE
;
virtual
bool
setProperty
(
int
,
double
);
virtual
bool
setProperty
(
int
,
double
)
CV_OVERRIDE
;
virtual
bool
grabFrame
();
virtual
bool
grabFrame
()
CV_OVERRIDE
;
virtual
IplImage
*
retrieveFrame
(
int
);
virtual
IplImage
*
retrieveFrame
(
int
)
CV_OVERRIDE
;
virtual
int
getCaptureDomain
()
{
return
CV_CAP_MSMF
;
}
// Return the type of the capture object: CV_CAP_VFW, etc...
virtual
int
getCaptureDomain
()
CV_OVERRIDE
{
return
CV_CAP_MSMF
;
}
// Return the type of the capture object: CV_CAP_VFW, etc...
protected
:
protected
:
void
init
();
void
init
();
int
index
,
width
,
height
,
fourcc
;
int
index
,
width
,
height
,
fourcc
;
...
...
modules/videoio/src/cap_openni.cpp
View file @
8f0669c3
...
@@ -442,10 +442,10 @@ public:
...
@@ -442,10 +442,10 @@ public:
CvCapture_OpenNI
(
const
char
*
filename
);
CvCapture_OpenNI
(
const
char
*
filename
);
virtual
~
CvCapture_OpenNI
();
virtual
~
CvCapture_OpenNI
();
virtual
double
getProperty
(
int
propIdx
)
const
;
virtual
double
getProperty
(
int
propIdx
)
const
CV_OVERRIDE
;
virtual
bool
setProperty
(
int
probIdx
,
double
propVal
);
virtual
bool
setProperty
(
int
probIdx
,
double
propVal
)
CV_OVERRIDE
;
virtual
bool
grabFrame
();
virtual
bool
grabFrame
()
CV_OVERRIDE
;
virtual
IplImage
*
retrieveFrame
(
int
outputType
);
virtual
IplImage
*
retrieveFrame
(
int
outputType
)
CV_OVERRIDE
;
bool
isOpened
()
const
;
bool
isOpened
()
const
;
...
...
modules/videoio/src/cap_openni2.cpp
View file @
8f0669c3
...
@@ -90,10 +90,10 @@ public:
...
@@ -90,10 +90,10 @@ public:
CvCapture_OpenNI2
(
const
char
*
filename
);
CvCapture_OpenNI2
(
const
char
*
filename
);
virtual
~
CvCapture_OpenNI2
();
virtual
~
CvCapture_OpenNI2
();
virtual
double
getProperty
(
int
propIdx
)
const
;
virtual
double
getProperty
(
int
propIdx
)
const
CV_OVERRIDE
;
virtual
bool
setProperty
(
int
probIdx
,
double
propVal
);
virtual
bool
setProperty
(
int
probIdx
,
double
propVal
)
CV_OVERRIDE
;
virtual
bool
grabFrame
();
virtual
bool
grabFrame
()
CV_OVERRIDE
;
virtual
IplImage
*
retrieveFrame
(
int
outputType
);
virtual
IplImage
*
retrieveFrame
(
int
outputType
)
CV_OVERRIDE
;
bool
isOpened
()
const
;
bool
isOpened
()
const
;
...
...
modules/videoio/src/cap_pvapi.cpp
View file @
8f0669c3
...
@@ -81,11 +81,11 @@ public:
...
@@ -81,11 +81,11 @@ public:
virtual
bool
open
(
int
index
);
virtual
bool
open
(
int
index
);
virtual
void
close
();
virtual
void
close
();
virtual
double
getProperty
(
int
)
const
;
virtual
double
getProperty
(
int
)
const
CV_OVERRIDE
;
virtual
bool
setProperty
(
int
,
double
);
virtual
bool
setProperty
(
int
,
double
)
CV_OVERRIDE
;
virtual
bool
grabFrame
();
virtual
bool
grabFrame
()
CV_OVERRIDE
;
virtual
IplImage
*
retrieveFrame
(
int
);
virtual
IplImage
*
retrieveFrame
(
int
)
CV_OVERRIDE
;
virtual
int
getCaptureDomain
()
virtual
int
getCaptureDomain
()
CV_OVERRIDE
{
{
return
CV_CAP_PVAPI
;
return
CV_CAP_PVAPI
;
}
}
...
...
modules/videoio/src/cap_qt.cpp
View file @
8f0669c3
...
@@ -1441,11 +1441,11 @@ public:
...
@@ -1441,11 +1441,11 @@ public:
virtual
bool
open
(
const
char
*
filename
);
virtual
bool
open
(
const
char
*
filename
);
virtual
void
close
();
virtual
void
close
();
virtual
double
getProperty
(
int
)
const
;
virtual
double
getProperty
(
int
)
const
CV_OVERRIDE
;
virtual
bool
setProperty
(
int
,
double
);
virtual
bool
setProperty
(
int
,
double
)
CV_OVERRIDE
;
virtual
bool
grabFrame
();
virtual
bool
grabFrame
()
CV_OVERRIDE
;
virtual
IplImage
*
retrieveFrame
(
int
);
virtual
IplImage
*
retrieveFrame
(
int
)
CV_OVERRIDE
;
virtual
int
getCaptureDomain
()
{
return
CV_CAP_QT
;
}
// Return the type of the capture object: CV_CAP_VFW, etc...
virtual
int
getCaptureDomain
()
CV_OVERRIDE
{
return
CV_CAP_QT
;
}
// Return the type of the capture object: CV_CAP_VFW, etc...
protected
:
protected
:
CvCapture_QT_Movie
*
captureQT
;
CvCapture_QT_Movie
*
captureQT
;
...
...
modules/videoio/src/cap_unicap.cpp
View file @
8f0669c3
...
@@ -62,11 +62,11 @@ struct CvCapture_Unicap : public CvCapture
...
@@ -62,11 +62,11 @@ struct CvCapture_Unicap : public CvCapture
virtual
bool
open
(
int
index
);
virtual
bool
open
(
int
index
);
virtual
void
close
();
virtual
void
close
();
virtual
double
getProperty
(
int
)
const
;
virtual
double
getProperty
(
int
)
const
CV_OVERRIDE
;
virtual
bool
setProperty
(
int
,
double
);
virtual
bool
setProperty
(
int
,
double
)
CV_OVERRIDE
;
virtual
bool
grabFrame
();
virtual
bool
grabFrame
()
CV_OVERRIDE
;
virtual
IplImage
*
retrieveFrame
(
int
);
virtual
IplImage
*
retrieveFrame
(
int
)
CV_OVERRIDE
;
virtual
int
getCaptureDomain
()
{
return
CV_CAP_UNICAP
;
}
// Return the type of the capture object: CV_CAP_VFW, etc...
virtual
int
getCaptureDomain
()
CV_OVERRIDE
{
return
CV_CAP_UNICAP
;
}
// Return the type of the capture object: CV_CAP_VFW, etc...
bool
shutdownDevice
();
bool
shutdownDevice
();
bool
initDevice
();
bool
initDevice
();
...
...
modules/videoio/src/cap_v4l.cpp
View file @
8f0669c3
...
@@ -265,7 +265,7 @@ struct buffer
...
@@ -265,7 +265,7 @@ struct buffer
static
unsigned
int
n_buffers
=
0
;
static
unsigned
int
n_buffers
=
0
;
struct
CvCaptureCAM_V4L
:
public
CvCapture
struct
CvCaptureCAM_V4L
CV_FINAL
:
public
CvCapture
{
{
int
deviceHandle
;
int
deviceHandle
;
int
bufferIndex
;
int
bufferIndex
;
...
@@ -301,10 +301,10 @@ struct CvCaptureCAM_V4L : public CvCapture
...
@@ -301,10 +301,10 @@ struct CvCaptureCAM_V4L : public CvCapture
bool
open
(
int
_index
);
bool
open
(
int
_index
);
bool
open
(
const
char
*
deviceName
);
bool
open
(
const
char
*
deviceName
);
virtual
double
getProperty
(
int
)
const
;
virtual
double
getProperty
(
int
)
const
CV_OVERRIDE
;
virtual
bool
setProperty
(
int
,
double
);
virtual
bool
setProperty
(
int
,
double
)
CV_OVERRIDE
;
virtual
bool
grabFrame
();
virtual
bool
grabFrame
()
CV_OVERRIDE
;
virtual
IplImage
*
retrieveFrame
(
int
);
virtual
IplImage
*
retrieveFrame
(
int
)
CV_OVERRIDE
;
Range
getRange
(
int
property_id
)
const
{
Range
getRange
(
int
property_id
)
const
{
switch
(
property_id
)
{
switch
(
property_id
)
{
...
...
modules/videoio/src/cap_vfw.cpp
View file @
8f0669c3
...
@@ -99,11 +99,11 @@ public:
...
@@ -99,11 +99,11 @@ public:
virtual
bool
open
(
const
char
*
filename
);
virtual
bool
open
(
const
char
*
filename
);
virtual
void
close
();
virtual
void
close
();
virtual
double
getProperty
(
int
)
const
;
virtual
double
getProperty
(
int
)
const
CV_OVERRIDE
;
virtual
bool
setProperty
(
int
,
double
);
virtual
bool
setProperty
(
int
,
double
)
CV_OVERRIDE
;
virtual
bool
grabFrame
();
virtual
bool
grabFrame
()
CV_OVERRIDE
;
virtual
IplImage
*
retrieveFrame
(
int
);
virtual
IplImage
*
retrieveFrame
(
int
)
CV_OVERRIDE
;
virtual
int
getCaptureDomain
()
{
return
CV_CAP_VFW
;
}
// Return the type of the capture object: CV_CAP_VFW, etc...
virtual
int
getCaptureDomain
()
CV_OVERRIDE
{
return
CV_CAP_VFW
;
}
// Return the type of the capture object: CV_CAP_VFW, etc...
protected
:
protected
:
void
init
();
void
init
();
...
...
modules/videoio/src/cap_ximea.cpp
View file @
8f0669c3
...
@@ -20,11 +20,11 @@ public:
...
@@ -20,11 +20,11 @@ public:
virtual
bool
open
(
int
index
);
virtual
bool
open
(
int
index
);
bool
open
(
const
char
*
deviceName
);
bool
open
(
const
char
*
deviceName
);
virtual
void
close
();
virtual
void
close
();
virtual
double
getProperty
(
int
)
const
;
virtual
double
getProperty
(
int
)
const
CV_OVERRIDE
;
virtual
bool
setProperty
(
int
,
double
);
virtual
bool
setProperty
(
int
,
double
)
CV_OVERRIDE
;
virtual
bool
grabFrame
();
virtual
bool
grabFrame
()
CV_OVERRIDE
;
virtual
IplImage
*
retrieveFrame
(
int
);
virtual
IplImage
*
retrieveFrame
(
int
)
CV_OVERRIDE
;
virtual
int
getCaptureDomain
()
{
return
CV_CAP_XIAPI
;
}
// Return the type of the capture object: CV_CAP_VFW, etc...
virtual
int
getCaptureDomain
()
CV_OVERRIDE
{
return
CV_CAP_XIAPI
;
}
// Return the type of the capture object: CV_CAP_VFW, etc...
private
:
private
:
bool
_open
();
bool
_open
();
...
...
modules/videoio/src/cap_xine.cpp
View file @
8f0669c3
...
@@ -786,10 +786,10 @@ public:
...
@@ -786,10 +786,10 @@ public:
virtual
bool
open
(
const
char
*
filename
);
virtual
bool
open
(
const
char
*
filename
);
virtual
void
close
();
virtual
void
close
();
virtual
double
getProperty
(
int
)
const
;
virtual
double
getProperty
(
int
)
const
CV_OVERRIDE
;
virtual
bool
setProperty
(
int
,
double
);
virtual
bool
setProperty
(
int
,
double
)
CV_OVERRIDE
;
virtual
bool
grabFrame
();
virtual
bool
grabFrame
()
CV_OVERRIDE
;
virtual
IplImage
*
retrieveFrame
(
int
);
virtual
IplImage
*
retrieveFrame
(
int
)
CV_OVERRIDE
;
protected
:
protected
:
CvCaptureAVI_XINE
*
captureXINE
;
CvCaptureAVI_XINE
*
captureXINE
;
...
...
modules/videoio/test/test_ffmpeg.cpp
View file @
8f0669c3
...
@@ -232,7 +232,7 @@ public:
...
@@ -232,7 +232,7 @@ public:
{
{
}
}
virtual
void
operator
()
(
const
Range
&
range
)
const
virtual
void
operator
()
(
const
Range
&
range
)
const
CV_OVERRIDE
{
{
for
(
int
i
=
range
.
start
;
i
!=
range
.
end
;
++
i
)
for
(
int
i
=
range
.
start
;
i
!=
range
.
end
;
++
i
)
{
{
...
@@ -278,7 +278,7 @@ public:
...
@@ -278,7 +278,7 @@ public:
circle
(
frame
,
Center
,
i
+
2
,
ObjectColor
,
2
,
CV_AA
);
circle
(
frame
,
Center
,
i
+
2
,
ObjectColor
,
2
,
CV_AA
);
}
}
virtual
void
operator
()
(
const
Range
&
range
)
const
virtual
void
operator
()
(
const
Range
&
range
)
const
CV_OVERRIDE
{
{
for
(
int
j
=
range
.
start
;
j
<
range
.
end
;
++
j
)
for
(
int
j
=
range
.
start
;
j
<
range
.
end
;
++
j
)
{
{
...
@@ -320,7 +320,7 @@ public:
...
@@ -320,7 +320,7 @@ public:
{
{
}
}
virtual
void
operator
()
(
const
Range
&
range
)
const
virtual
void
operator
()
(
const
Range
&
range
)
const
CV_OVERRIDE
{
{
for
(
int
i
=
range
.
start
;
i
!=
range
.
end
;
++
i
)
for
(
int
i
=
range
.
start
;
i
!=
range
.
end
;
++
i
)
{
{
...
@@ -342,7 +342,7 @@ public:
...
@@ -342,7 +342,7 @@ public:
{
{
}
}
virtual
void
operator
()
(
const
Range
&
range
)
const
virtual
void
operator
()
(
const
Range
&
range
)
const
CV_OVERRIDE
{
{
for
(
int
j
=
range
.
start
;
j
<
range
.
end
;
++
j
)
for
(
int
j
=
range
.
start
;
j
<
range
.
end
;
++
j
)
{
{
...
...
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