Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
自由之枫~
opencv
提交
f35ec8c9
O
opencv
项目概览
自由之枫~
/
opencv
与 Fork 源项目一致
Fork自
OpenCV / opencv
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
f35ec8c9
编写于
5月 13, 2022
作者:
O
OpenCV Pushbot
提交者:
GitHub
5月 13, 2022
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #21935 from Yulv-git:3.4-typos3
上级
1316491e
15ac54d5
变更
14
隐藏空白更改
内联
并排
Showing
14 changed file
with
17 addition
and
17 deletion
+17
-17
modules/core/include/opencv2/core/mat.hpp
modules/core/include/opencv2/core/mat.hpp
+1
-1
modules/cudafilters/include/opencv2/cudafilters.hpp
modules/cudafilters/include/opencv2/cudafilters.hpp
+1
-1
modules/cudafilters/src/cuda/median_filter.cu
modules/cudafilters/src/cuda/median_filter.cu
+1
-1
modules/dnn/src/darknet/darknet_io.cpp
modules/dnn/src/darknet/darknet_io.cpp
+1
-1
modules/dnn/src/onnx/opencv-onnx.proto
modules/dnn/src/onnx/opencv-onnx.proto
+1
-1
modules/imgproc/include/opencv2/imgproc.hpp
modules/imgproc/include/opencv2/imgproc.hpp
+1
-1
modules/imgproc/src/opencl/medianFilter.cl
modules/imgproc/src/opencl/medianFilter.cl
+1
-1
modules/imgproc/test/test_convhull.cpp
modules/imgproc/test/test_convhull.cpp
+1
-1
modules/ml/src/lr.cpp
modules/ml/src/lr.cpp
+1
-1
modules/videoio/src/cap_gstreamer.cpp
modules/videoio/src/cap_gstreamer.cpp
+1
-1
modules/videoio/src/cap_intelperc.cpp
modules/videoio/src/cap_intelperc.cpp
+4
-4
modules/videoio/src/cap_intelperc.hpp
modules/videoio/src/cap_intelperc.hpp
+1
-1
modules/videoio/src/cap_libv4l.cpp
modules/videoio/src/cap_libv4l.cpp
+1
-1
modules/videoio/test/test_video_io.cpp
modules/videoio/test/test_video_io.cpp
+1
-1
未找到文件。
modules/core/include/opencv2/core/mat.hpp
浏览文件 @
f35ec8c9
...
...
@@ -2290,7 +2290,7 @@ public:
const_iterator
begin
()
const
;
const_iterator
end
()
const
;
//! template methods for
for
operation over all matrix elements.
//! template methods for operation over all matrix elements.
// the operations take care of skipping gaps in the end of rows (if any)
template
<
typename
Functor
>
void
forEach
(
const
Functor
&
operation
);
template
<
typename
Functor
>
void
forEach
(
const
Functor
&
operation
)
const
;
...
...
modules/cudafilters/include/opencv2/cudafilters.hpp
浏览文件 @
f35ec8c9
...
...
@@ -318,7 +318,7 @@ CV_EXPORTS Ptr<Filter> createColumnSumFilter(int srcType, int dstType, int ksize
/** @brief Performs median filtering for each point of the source image.
@param srcType type of
of
source image. Only CV_8UC1 images are supported for now.
@param srcType type of source image. Only CV_8UC1 images are supported for now.
@param windowSize Size of the kernerl used for the filtering. Uses a (windowSize x windowSize) filter.
@param partition Specifies the parallel granularity of the workload. This parameter should be used GPU experts when optimizing performance.
...
...
modules/cudafilters/src/cuda/median_filter.cu
浏览文件 @
f35ec8c9
...
...
@@ -235,7 +235,7 @@ namespace cv { namespace cuda { namespace device
}
__syncthreads
();
// For all remaining rows in the median filter, add the values to the
the
histogram
// For all remaining rows in the median filter, add the values to the histogram
for
(
int
j
=
threadIdx
.
x
;
j
<
cols
;
j
+=
blockDim
.
x
){
for
(
int
i
=
initStartRow
;
i
<
initStopRow
;
i
++
){
int
pos
=::
min
(
i
,
rows
-
1
);
...
...
modules/dnn/src/darknet/darknet_io.cpp
浏览文件 @
f35ec8c9
...
...
@@ -791,7 +791,7 @@ namespace cv {
if
(
layers_vec
.
size
()
>
1
)
{
// layer ids in layers_vec - inputs of Slice layers
// after adding offset to layers_vec: layer ids - ouputs of Slice layers
// after adding offset to layers_vec: layer ids - ou
t
puts of Slice layers
for
(
size_t
k
=
0
;
k
<
layers_vec
.
size
();
++
k
)
layers_vec
[
k
]
+=
layers_vec
.
size
();
...
...
modules/dnn/src/onnx/opencv-onnx.proto
浏览文件 @
f35ec8c9
...
...
@@ -61,7 +61,7 @@ enum Version {
// The version field is always serialized and we will use it to store the
// version that the graph is generated from. This helps us set up version
// control.
// For the IR, we are using simple numbers starting with
with
0x00000001,
// For the IR, we are using simple numbers starting with 0x00000001,
// which was the version we published on Oct 10, 2017.
IR_VERSION_2017_10_10
=
0x0000000000000001
;
...
...
modules/imgproc/include/opencv2/imgproc.hpp
浏览文件 @
f35ec8c9
...
...
@@ -1537,7 +1537,7 @@ CV_EXPORTS_W void boxFilter( InputArray src, OutputArray dst, int ddepth,
For every pixel \f$ (x, y) \f$ in the source image, the function calculates the sum of squares of those neighboring
pixel values which overlap the filter placed over the pixel \f$ (x, y) \f$.
The unnormalized square box filter can be useful in computing local image statistics such as the
the
local
The unnormalized square box filter can be useful in computing local image statistics such as the local
variance and standard deviation around the neighborhood of a pixel.
@param src input image
...
...
modules/imgproc/src/opencl/medianFilter.cl
浏览文件 @
f35ec8c9
...
...
@@ -43,7 +43,7 @@
#
ifdef
USE_4OPT
//Utility
macros
for
for
1
,
2
,
4
channel
images:
//Utility
macros
for
1
,
2
,
4
channel
images:
//
-
LOAD4/STORE4
-
load/store
4-pixel
groups
from/to
global
memory
//
-
SHUFFLE4_3/SHUFFLE4_5
-
rearrange
scattered
border/central
pixels
into
regular
4-pixel
variables
...
...
modules/imgproc/test/test_convhull.cpp
浏览文件 @
f35ec8c9
...
...
@@ -1015,7 +1015,7 @@ int CV_MinCircleTest::validate_test_results( int test_case_idx )
if
(
point_count
>=
2
&&
(
j
<
2
||
(
j
==
2
&&
cvTsDist
(
v
[
0
],
v
[
1
])
<
(
radius
-
1
)
*
2
/
eps
))
)
{
ts
->
printf
(
cvtest
::
TS
::
LOG
,
"There should be at
at
least 3 points near the circle boundary or 2 points on the diameter
\n
"
);
"There should be at least 3 points near the circle boundary or 2 points on the diameter
\n
"
);
code
=
cvtest
::
TS
::
FAIL_BAD_ACCURACY
;
goto
_exit_
;
}
...
...
modules/ml/src/lr.cpp
浏览文件 @
f35ec8c9
...
...
@@ -126,7 +126,7 @@ bool LogisticRegressionImpl::train(const Ptr<TrainData>& trainData, int)
int
num_classes
=
(
int
)
this
->
forward_mapper
.
size
();
if
(
num_classes
<
2
)
{
CV_Error
(
CV_StsBadArg
,
"data should have atleast 2 classes"
);
CV_Error
(
CV_StsBadArg
,
"data should have at
least 2 classes"
);
}
// add a column of ones to the data (bias/intercept term)
...
...
modules/videoio/src/cap_gstreamer.cpp
浏览文件 @
f35ec8c9
...
...
@@ -334,7 +334,7 @@ GStreamerCapture::~GStreamerCapture()
/*!
* \brief CvCapture_GStreamer::grabFrame
* \return
* Grabs a sample from the pipeline, awaiting consumation by retr
ei
veFrame.
* Grabs a sample from the pipeline, awaiting consumation by retr
ie
veFrame.
* The pipeline is started if it was not running yet
*/
bool
GStreamerCapture
::
grabFrame
()
...
...
modules/videoio/src/cap_intelperc.cpp
浏览文件 @
f35ec8c9
...
...
@@ -507,21 +507,21 @@ bool IntelPerCStreamDepth::setProperty(int propIdx, double propVal)
}
bool
IntelPerCStreamDepth
::
retrieveDepthAsOutputArray
(
cv
::
OutputArray
image
)
{
return
retriveFrame
(
CV_16SC1
,
0
,
image
);
return
retri
e
veFrame
(
CV_16SC1
,
0
,
image
);
}
bool
IntelPerCStreamDepth
::
retrieveIRAsOutputArray
(
cv
::
OutputArray
image
)
{
return
retriveFrame
(
CV_16SC1
,
1
,
image
);
return
retri
e
veFrame
(
CV_16SC1
,
1
,
image
);
}
bool
IntelPerCStreamDepth
::
retrieveUVAsOutputArray
(
cv
::
OutputArray
image
)
{
return
retriveFrame
(
CV_32FC2
,
2
,
image
);
return
retri
e
veFrame
(
CV_32FC2
,
2
,
image
);
}
bool
IntelPerCStreamDepth
::
validProfile
(
const
PXCCapture
::
VideoStream
::
ProfileInfo
&
pinfo
)
{
return
(
PXCImage
::
COLOR_FORMAT_DEPTH
==
pinfo
.
imageInfo
.
format
);
}
bool
IntelPerCStreamDepth
::
retriveFrame
(
int
type
,
int
planeIdx
,
cv
::
OutputArray
frame
)
bool
IntelPerCStreamDepth
::
retri
e
veFrame
(
int
type
,
int
planeIdx
,
cv
::
OutputArray
frame
)
{
if
(
!
m_pxcImage
.
IsValid
())
return
false
;
...
...
modules/videoio/src/cap_intelperc.hpp
浏览文件 @
f35ec8c9
...
...
@@ -85,7 +85,7 @@ public:
protected:
virtual
bool
validProfile
(
const
PXCCapture
::
VideoStream
::
ProfileInfo
&
pinfo
);
protected:
bool
retriveFrame
(
int
type
,
int
planeIdx
,
OutputArray
frame
);
bool
retri
e
veFrame
(
int
type
,
int
planeIdx
,
OutputArray
frame
);
};
class
VideoCapture_IntelPerC
:
public
IVideoCapture
...
...
modules/videoio/src/cap_libv4l.cpp
浏览文件 @
f35ec8c9
...
...
@@ -1858,7 +1858,7 @@ static int icvSetPropertyCAM_V4L(CvCaptureCAM_V4L* capture, int property_id, dou
retval
=
icvSetControl
(
capture
,
property_id
,
value
);
}
/* return the
the
status */
/* return the status */
return
retval
;
}
...
...
modules/videoio/test/test_video_io.cpp
浏览文件 @
f35ec8c9
...
...
@@ -261,7 +261,7 @@ public:
if
(
cvtest
::
debugLevel
>
0
)
std
::
cout
<<
"i = "
<<
i
<<
": timestamp = "
<<
timestamp
<<
std
::
endl
;
const
double
frame_period
=
1000.
f
/
bunny_param
.
getFps
();
// NOTE: eps == frame_period, because videoCapture returns frame begining timestamp or frame end
// NOTE: eps == frame_period, because videoCapture returns frame begin
n
ing timestamp or frame end
// timestamp depending on codec and back-end. So the first frame has timestamp 0 or frame_period.
EXPECT_NEAR
(
timestamp
,
i
*
frame_period
,
frame_period
)
<<
"i="
<<
i
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录