Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
5af747c6
O
Opencv
项目概览
Greenplum
/
Opencv
大约 1 年 前同步成功
通知
7
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
Opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
5af747c6
编写于
11月 26, 2019
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #16001 from alalek:backport_15995
上级
17dfae77
af997529
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
9 addition
and
9 deletion
+9
-9
doc/js_tutorials/js_gui/js_trackbar/js_trackbar.markdown
doc/js_tutorials/js_gui/js_trackbar/js_trackbar.markdown
+1
-1
doc/py_tutorials/py_gui/py_trackbar/py_trackbar.markdown
doc/py_tutorials/py_gui/py_trackbar/py_trackbar.markdown
+1
-1
doc/py_tutorials/py_ml/py_knn/py_knn_opencv/py_knn_opencv.markdown
...torials/py_ml/py_knn/py_knn_opencv/py_knn_opencv.markdown
+1
-1
doc/tutorials/imgproc/random_generator_and_text/random_generator_and_text.markdown
...dom_generator_and_text/random_generator_and_text.markdown
+3
-3
modules/core/include/opencv2/core/hal/msa_macros.h
modules/core/include/opencv2/core/hal/msa_macros.h
+2
-2
modules/imgproc/test/test_watershed.cpp
modules/imgproc/test/test_watershed.cpp
+1
-1
未找到文件。
doc/js_tutorials/js_gui/js_trackbar/js_trackbar.markdown
浏览文件 @
5af747c6
...
...
@@ -36,7 +36,7 @@ let x = document.getElementById('myRange');
@endcode
As a trackbar, the range element need a trackbar name, the default value, minimum value, maximum value,
step and the callback function which is executed everytime trackbar value changes. The callback function
step and the callback function which is executed every
time trackbar value changes. The callback function
always has a default argument, which is the trackbar position. Additionally, a text element to display the
trackbar value is fine. In our case, we can create the trackbar as below:
@code{.html}
...
...
doc/py_tutorials/py_gui/py_trackbar/py_trackbar.markdown
浏览文件 @
5af747c6
...
...
@@ -16,7 +16,7 @@ correspondingly window color changes. By default, initial color will be set to B
For cv.getTrackbarPos() function, first argument is the trackbar name, second one is the window
name to which it is attached, third argument is the default value, fourth one is the maximum value
and fifth one is the callback function which is executed everytime trackbar value changes. The
and fifth one is the callback function which is executed every
time trackbar value changes. The
callback function always has a default argument which is the trackbar position. In our case,
function does nothing, so we simply pass.
...
...
doc/py_tutorials/py_ml/py_knn/py_knn_opencv/py_knn_opencv.markdown
浏览文件 @
5af747c6
...
...
@@ -54,7 +54,7 @@ print( accuracy )
@endcode
So our basic OCR app is ready. This particular example gave me an accuracy of 91%. One option
improve accuracy is to add more data for training, especially the wrong ones. So instead of finding
this training data everytime I start application, I better save it, so that next time, I directly
this training data every
time I start application, I better save it, so that next time, I directly
read this data from a file and start classification. You can do it with the help of some Numpy
functions like np.savetxt, np.savez, np.load etc. Please check their docs for more details.
@code{.py}
...
...
doc/tutorials/imgproc/random_generator_and_text/random_generator_and_text.markdown
浏览文件 @
5af747c6
...
...
@@ -210,12 +210,12 @@ Explanation
@code{.cpp}
image2 = image - Scalar::all(i)
@endcode
So, **image2** is the sub
s
traction of **image** and **Scalar::all(i)**. In fact, what happens
here is that every pixel of **image2** will be the result of sub
s
tracting every pixel of
So, **image2** is the subtraction of **image** and **Scalar::all(i)**. In fact, what happens
here is that every pixel of **image2** will be the result of subtracting every pixel of
**image** minus the value of **i** (remember that for each pixel we are considering three values
such as R, G and B, so each of them will be affected)
Also remember that the sub
s
traction operation *always* performs internally a **saturate**
Also remember that the subtraction operation *always* performs internally a **saturate**
operation, which means that the result obtained will always be inside the allowed range (no
negative and between 0 and 255 for our example).
...
...
modules/core/include/opencv2/core/hal/msa_macros.h
浏览文件 @
5af747c6
...
...
@@ -502,7 +502,7 @@ typedef double v1f64 __attribute__ ((vector_size(8), aligned(8)));
(v4u32)__builtin_msa_pckev_w((v4i32)__builtin_msa_sat_u_d((v2u64)__e, 31), (v4i32)__builtin_msa_sat_u_d((v2u64)__d, 31)); \
})
/* Minimum values between corresponding elements in the two vectors are written to t
eh
returned vector. */
/* Minimum values between corresponding elements in the two vectors are written to t
he
returned vector. */
#define msa_minq_s8(__a, __b) (__builtin_msa_min_s_b(__a, __b))
#define msa_minq_s16(__a, __b) (__builtin_msa_min_s_h(__a, __b))
#define msa_minq_s32(__a, __b) (__builtin_msa_min_s_w(__a, __b))
...
...
@@ -514,7 +514,7 @@ typedef double v1f64 __attribute__ ((vector_size(8), aligned(8)));
#define msa_minq_f32(__a, __b) (__builtin_msa_fmin_w(__a, __b))
#define msa_minq_f64(__a, __b) (__builtin_msa_fmin_d(__a, __b))
/* Maximum values between corresponding elements in the two vectors are written to t
eh
returned vector. */
/* Maximum values between corresponding elements in the two vectors are written to t
he
returned vector. */
#define msa_maxq_s8(__a, __b) (__builtin_msa_max_s_b(__a, __b))
#define msa_maxq_s16(__a, __b) (__builtin_msa_max_s_h(__a, __b))
#define msa_maxq_s32(__a, __b) (__builtin_msa_max_s_w(__a, __b))
...
...
modules/imgproc/test/test_watershed.cpp
浏览文件 @
5af747c6
...
...
@@ -82,7 +82,7 @@ void CV_WatershedTest::run( int /* start_from */)
Point
*
p
=
(
Point
*
)
cvGetSeqElem
(
cnts
,
0
);
//expected image was added with 1 in order to save to png
//so now we sub
s
tract 1 to get real color
//so now we subtract 1 to get real color
if
(
!
exp
.
empty
())
colors
.
push_back
(
exp
.
ptr
(
p
->
y
)[
p
->
x
]
-
1
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录