Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
自由之枫~
opencv
提交
5f578425
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,发现更多精彩内容 >>
提交
5f578425
编写于
2月 11, 2019
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #13794 from alalek:backport_13786
上级
4e16ec28
5d9c6723
变更
14
隐藏空白更改
内联
并排
Showing
14 changed file
with
18 addition
and
18 deletion
+18
-18
apps/traincascade/old_ml.hpp
apps/traincascade/old_ml.hpp
+2
-2
doc/pattern_tools/gen_pattern.py
doc/pattern_tools/gen_pattern.py
+1
-1
doc/py_tutorials/py_feature2d/py_brief/py_brief.markdown
doc/py_tutorials/py_feature2d/py_brief/py_brief.markdown
+1
-1
modules/calib3d/src/rho.cpp
modules/calib3d/src/rho.cpp
+1
-1
modules/core/include/opencv2/core/cvstd.hpp
modules/core/include/opencv2/core/cvstd.hpp
+1
-1
modules/core/include/opencv2/core/hal/intrin_cpp.hpp
modules/core/include/opencv2/core/hal/intrin_cpp.hpp
+1
-1
modules/core/include/opencv2/core/hal/intrin_neon.hpp
modules/core/include/opencv2/core/hal/intrin_neon.hpp
+1
-1
modules/core/src/bindings_utils.cpp
modules/core/src/bindings_utils.cpp
+4
-4
modules/core/src/precomp.hpp
modules/core/src/precomp.hpp
+1
-1
modules/core/src/utils/datafile.cpp
modules/core/src/utils/datafile.cpp
+1
-1
modules/dnn/src/onnx/opencv-onnx.proto
modules/dnn/src/onnx/opencv-onnx.proto
+1
-1
modules/ml/include/opencv2/ml.hpp
modules/ml/include/opencv2/ml.hpp
+1
-1
modules/ml/src/svm.cpp
modules/ml/src/svm.cpp
+1
-1
modules/videoio/src/cap_dshow.cpp
modules/videoio/src/cap_dshow.cpp
+1
-1
未找到文件。
apps/traincascade/old_ml.hpp
浏览文件 @
5f578425
...
...
@@ -88,7 +88,7 @@ struct CvVectors
#if 0
/* A structure, representing the lattice range of statmodel parameters.
It is used for optimizing statmodel parameters by cross-validation method.
The lattice is logarithmic, so <step> must be greater th
e
n 1. */
The lattice is logarithmic, so <step> must be greater th
a
n 1. */
typedef struct CvParamLattice
{
double min_val;
...
...
@@ -158,7 +158,7 @@ protected:
/* The structure, representing the grid range of statmodel parameters.
It is used for optimizing statmodel accuracy by varying model parameters,
the accuracy estimate being computed by cross-validation.
The grid is logarithmic, so <step> must be greater th
e
n 1. */
The grid is logarithmic, so <step> must be greater th
a
n 1. */
class
CvMLData
;
...
...
doc/pattern_tools/gen_pattern.py
浏览文件 @
5f578425
...
...
@@ -12,7 +12,7 @@ python gen_pattern.py -o out.svg -r 11 -c 8 -T circles -s 20.0 -R 5.0 -u mm -w 2
-u, --units - mm, inches, px, m (default mm)
-w, --page_width - page width in units (default 216)
-h, --page_height - page height in units (default 279)
-a, --page_size - page size (default A4), super
c
edes -h -w arguments
-a, --page_size - page size (default A4), super
s
edes -h -w arguments
-H, --help - show help
"""
...
...
doc/py_tutorials/py_feature2d/py_brief/py_brief.markdown
浏览文件 @
5f578425
...
...
@@ -12,7 +12,7 @@ Theory
We know SIFT uses 128-dim vector for descriptors. Since it is using floating point numbers, it takes
basically 512 bytes. Similarly SURF also takes minimum of 256 bytes (for 64-dim). Creating such a
vector for thousands of features takes a lot of memory which are not feasible for resouce-constraint
vector for thousands of features takes a lot of memory which are not feasible for resou
r
ce-constraint
applications especially for embedded systems. Larger the memory, longer the time it takes for
matching.
...
...
modules/calib3d/src/rho.cpp
浏览文件 @
5f578425
...
...
@@ -2164,7 +2164,7 @@ inline void RHO_HEST_REFC::refine(void){
* order to compute a candidate homography (newH).
*
* The system above is solved by Cholesky decomposition of a
* sufficently-damped JtJ into a lower-triangular matrix (and its
* suffic
i
ently-damped JtJ into a lower-triangular matrix (and its
* transpose), whose inverse is then computed. This inverse (and its
* transpose) then multiply Jte in order to find dH.
*/
...
...
modules/core/include/opencv2/core/cvstd.hpp
浏览文件 @
5f578425
...
...
@@ -103,7 +103,7 @@ double memory deallocation.
CV_EXPORTS
void
fastFree
(
void
*
ptr
);
/*!
The STL-comp
il
ant memory Allocator based on cv::fastMalloc() and cv::fastFree()
The STL-comp
li
ant memory Allocator based on cv::fastMalloc() and cv::fastFree()
*/
template
<
typename
_Tp
>
class
Allocator
{
...
...
modules/core/include/opencv2/core/hal/intrin_cpp.hpp
浏览文件 @
5f578425
...
...
@@ -2266,7 +2266,7 @@ inline v_float32x4 v_matmuladd(const v_float32x4& v, const v_float32x4& m0,
v
.
s
[
0
]
*
m0
.
s
[
3
]
+
v
.
s
[
1
]
*
m1
.
s
[
3
]
+
v
.
s
[
2
]
*
m2
.
s
[
3
]
+
m3
.
s
[
3
]);
}
////// FP16 suport ///////
////// FP16 sup
p
ort ///////
inline
v_reg
<
float
,
V_TypeTraits
<
float
>::
nlanes128
>
v_load_expand
(
const
float16_t
*
ptr
)
...
...
modules/core/include/opencv2/core/hal/intrin_neon.hpp
浏览文件 @
5f578425
...
...
@@ -1635,7 +1635,7 @@ inline void v_lut_deinterleave(const double* tab, const v_int32x4& idxvec, v_flo
}
#endif
////// FP16 suport ///////
////// FP16 sup
p
ort ///////
#if CV_FP16
inline
v_float32x4
v_load_expand
(
const
float16_t
*
ptr
)
{
...
...
modules/core/src/bindings_utils.cpp
浏览文件 @
5f578425
...
...
@@ -33,7 +33,7 @@ String dumpInputArray(InputArray argument)
}
catch
(...)
{
ss
<<
" ERROR: exception occured, dump is non-complete"
;
// need to properly support different kinds
ss
<<
" ERROR: exception occur
r
ed, dump is non-complete"
;
// need to properly support different kinds
}
return
ss
.
str
();
}
...
...
@@ -70,7 +70,7 @@ CV_EXPORTS_W String dumpInputArrayOfArrays(InputArrayOfArrays argument)
}
catch
(...)
{
ss
<<
" ERROR: exception occured, dump is non-complete"
;
// need to properly support different kinds
ss
<<
" ERROR: exception occur
r
ed, dump is non-complete"
;
// need to properly support different kinds
}
return
ss
.
str
();
}
...
...
@@ -100,7 +100,7 @@ CV_EXPORTS_W String dumpInputOutputArray(InputOutputArray argument)
}
catch
(...)
{
ss
<<
" ERROR: exception occured, dump is non-complete"
;
// need to properly support different kinds
ss
<<
" ERROR: exception occur
r
ed, dump is non-complete"
;
// need to properly support different kinds
}
return
ss
.
str
();
}
...
...
@@ -137,7 +137,7 @@ CV_EXPORTS_W String dumpInputOutputArrayOfArrays(InputOutputArrayOfArrays argume
}
catch
(...)
{
ss
<<
" ERROR: exception occured, dump is non-complete"
;
// need to properly support different kinds
ss
<<
" ERROR: exception occur
r
ed, dump is non-complete"
;
// need to properly support different kinds
}
return
ss
.
str
();
}
...
...
modules/core/src/precomp.hpp
浏览文件 @
5f578425
...
...
@@ -250,7 +250,7 @@ BinaryFunc getCopyMaskFunc(size_t esz);
// There is some mess in code with vectors representation.
// Both vector-column / vector-rows are used with dims=2 (as Mat2D always).
// Reshape matrices if nec
c
essary (in case of vectors) and returns size with scaled width.
// Reshape matrices if necessary (in case of vectors) and returns size with scaled width.
Size
getContinuousSize2D
(
Mat
&
m1
,
int
widthScale
=
1
);
Size
getContinuousSize2D
(
Mat
&
m1
,
Mat
&
m2
,
int
widthScale
=
1
);
Size
getContinuousSize2D
(
Mat
&
m1
,
Mat
&
m2
,
Mat
&
m3
,
int
widthScale
=
1
);
...
...
modules/core/src/utils/datafile.cpp
浏览文件 @
5f578425
...
...
@@ -344,7 +344,7 @@ cv::String findDataFile(const cv::String& relative_path,
#if defined OPENCV_INSTALL_PREFIX && defined OPENCV_DATA_INSTALL_PATH
cv
::
String
install_dir
(
OPENCV_INSTALL_PREFIX
);
// use core/world module path and verify that library is running from installation directory
// It is nec
c
essary to avoid touching of unrelated common /usr/local path
// It is necessary to avoid touching of unrelated common /usr/local path
if
(
module_path
.
empty
())
// can't determine
module_path
=
install_dir
;
if
(
isSubDirectory
(
install_dir
,
module_path
)
||
isSubDirectory
(
utils
::
fs
::
canonical
(
install_dir
),
utils
::
fs
::
canonical
(
module_path
)))
...
...
modules/dnn/src/onnx/opencv-onnx.proto
浏览文件 @
5f578425
...
...
@@ -119,7 +119,7 @@ message AttributeProto {
// implementations needed to use has_field hueristics to determine
// which value field was in use. For IR_VERSION 0.0.2 or later, this
// field MUST be set and match the f|i|s|t|... field in use. This
// change was made to accomodate proto3 implementations.
// change was made to accom
m
odate proto3 implementations.
optional
AttributeType
type
=
20
;
// discriminator that indicates which field below is in use
// Exactly ONE of the following fields must be present for this version of the IR
...
...
modules/ml/include/opencv2/ml.hpp
浏览文件 @
5f578425
...
...
@@ -120,7 +120,7 @@ public:
\f[(minVal, minVal*step, minVal*{step}^2, \dots, minVal*{logStep}^n),\f]
where \f$n\f$ is the maximal index satisfying
\f[\texttt{minVal} * \texttt{logStep} ^n < \texttt{maxVal}\f]
The grid is logarithmic, so logStep must always be greater th
e
n 1. Default value is 1.
The grid is logarithmic, so logStep must always be greater th
a
n 1. Default value is 1.
*/
CV_PROP_RW
double
logStep
;
...
...
modules/ml/src/svm.cpp
浏览文件 @
5f578425
...
...
@@ -99,7 +99,7 @@ static void checkParamGrid(const ParamGrid& pg)
if
(
pg
.
minVal
<
DBL_EPSILON
)
CV_Error
(
CV_StsBadArg
,
"Lower bound of the grid must be positive"
);
if
(
pg
.
logStep
<
1.
+
FLT_EPSILON
)
CV_Error
(
CV_StsBadArg
,
"Grid step must greater th
e
n 1"
);
CV_Error
(
CV_StsBadArg
,
"Grid step must greater th
a
n 1"
);
}
// SVM training parameters
...
...
modules/videoio/src/cap_dshow.cpp
浏览文件 @
5f578425
...
...
@@ -2171,7 +2171,7 @@ void videoInput::setPhyCon(int id, int conn){
// ----------------------------------------------------------------------
// Check that we are not trying to setup a non-exist
a
nt device
// Check that we are not trying to setup a non-exist
e
nt device
// Then start the graph building!
// ----------------------------------------------------------------------
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录