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
84db82a3
Commit
84db82a3
authored
Apr 24, 2018
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
build: fix warnings
parent
ef254877
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
14 deletions
+16
-14
intrin_cpp.hpp
modules/core/include/opencv2/core/hal/intrin_cpp.hpp
+1
-1
container_avi.private.hpp
...videoio/include/opencv2/videoio/container_avi.private.hpp
+2
-1
cap_gstreamer.cpp
modules/videoio/src/cap_gstreamer.cpp
+11
-11
test_video_io.cpp
modules/videoio/test/test_video_io.cpp
+1
-0
object_detection.cpp
samples/dnn/object_detection.cpp
+1
-1
No files found.
modules/core/include/opencv2/core/hal/intrin_cpp.hpp
View file @
84db82a3
...
...
@@ -1047,7 +1047,7 @@ template<typename _Tp, int n> inline bool v_check_any(const v_reg<_Tp, n>& a)
Return value will be built by combining values _a_ and _b_ using the following scheme:
result[i] = mask[i] ? a[i] : b[i];
@
N
ote: _mask_ element values are restricted to these values:
@
n
ote: _mask_ element values are restricted to these values:
- 0: select element from _b_
- 0xff/0xffff/etc: select element from _a_
(fully compatible with bitwise-based operator)
...
...
modules/videoio/include/opencv2/videoio/container_avi.private.hpp
View file @
84db82a3
...
...
@@ -106,7 +106,8 @@ protected:
bool
parseMovi
(
frame_list
&
in_frame_list
)
{
//not implemented
in_frame_list
.
empty
();
CV_UNUSED
(
in_frame_list
);
// FIXIT: in_frame_list.empty();
return
true
;
}
bool
parseStrl
(
char
stream_id
,
Codecs
codec_
);
...
...
modules/videoio/src/cap_gstreamer.cpp
View file @
84db82a3
...
...
@@ -158,7 +158,7 @@ inline static bool is_gst_element_exists(const std::string & name)
//==================================================================================================
class
GStreamerCapture
:
public
IVideoCapture
class
GStreamerCapture
CV_FINAL
:
public
IVideoCapture
{
private
:
GstElement
*
pipeline
;
...
...
@@ -184,12 +184,12 @@ private:
public
:
GStreamerCapture
();
~
GStreamerCapture
();
virtual
bool
grabFrame
();
virtual
bool
retrieveFrame
(
int
/*unused*/
,
OutputArray
dst
);
virtual
double
getProperty
(
int
propId
)
const
;
virtual
bool
setProperty
(
int
propId
,
double
value
);
virtual
bool
isOpened
()
const
;
virtual
int
getCaptureDomain
();
// Return the type of the capture object: CAP_VFW, etc...
virtual
bool
grabFrame
()
CV_OVERRIDE
;
virtual
bool
retrieveFrame
(
int
/*unused*/
,
OutputArray
dst
)
CV_OVERRIDE
;
virtual
double
getProperty
(
int
propId
)
const
CV_OVERRIDE
;
virtual
bool
setProperty
(
int
propId
,
double
value
)
CV_OVERRIDE
;
virtual
bool
isOpened
()
const
CV_OVERRIDE
;
virtual
int
getCaptureDomain
()
CV_OVERRIDE
;
// Return the type of the capture object: CAP_VFW, etc...
bool
open
(
int
id
);
bool
open
(
const
String
&
filename_
);
static
void
newPad
(
GstElement
*
/*elem*/
,
GstPad
*
pad
,
gpointer
data
);
...
...
@@ -630,7 +630,7 @@ bool GStreamerCapture::open(const String &filename_)
const
gchar
*
filename
=
filename_
.
c_str
();
bool
file
=
false
;
bool
stream
=
false
;
//
bool stream = false;
bool
manualpipeline
=
false
;
char
*
uri
=
NULL
;
GstElement
*
uridecodebin
=
NULL
;
...
...
@@ -655,7 +655,7 @@ bool GStreamerCapture::open(const String &filename_)
#else
uri
=
realpath
(
filename
,
NULL
);
#endif
stream
=
false
;
//
stream = false;
if
(
uri
)
{
uri
=
g_filename_to_uri
(
uri
,
NULL
,
NULL
);
...
...
@@ -680,13 +680,13 @@ bool GStreamerCapture::open(const String &filename_)
fprintf
(
stderr
,
"GStreamer: Error opening bin: %s
\n
"
,
err
->
message
);
return
false
;
}
stream
=
true
;
//
stream = true;
manualpipeline
=
true
;
}
}
else
{
stream
=
true
;
//
stream = true;
uri
=
g_strdup
(
filename
);
}
...
...
modules/videoio/test/test_video_io.cpp
View file @
84db82a3
...
...
@@ -83,6 +83,7 @@ struct VideoCaptureAPI
case
CAP_ARAVIS
:
return
"CAP_ARAVIS"
;
case
CAP_OPENCV_MJPEG
:
return
"CAP_OPENCV_MJPEG"
;
case
CAP_INTEL_MFX
:
return
"CAP_INTEL_MFX"
;
case
CAP_XINE
:
return
"CAP_XINE"
;
}
return
"unknown"
;
}
...
...
samples/dnn/object_detection.cpp
View file @
84db82a3
...
...
@@ -214,7 +214,7 @@ void postprocess(Mat& frame, const std::vector<Mat>& outs, Net& net)
}
}
std
::
vector
<
int
>
indices
;
NMSBoxes
(
boxes
,
confidences
,
confThreshold
,
0.4
,
indices
);
NMSBoxes
(
boxes
,
confidences
,
confThreshold
,
0.4
f
,
indices
);
for
(
size_t
i
=
0
;
i
<
indices
.
size
();
++
i
)
{
int
idx
=
indices
[
i
];
...
...
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