Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenCV
opencv
提交
94851139
O
opencv
项目概览
OpenCV
/
opencv
上一次同步 大约 1 年
通知
1005
Star
71102
Fork
55580
代码
文件
提交
分支
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,发现更多精彩内容 >>
提交
94851139
编写于
11月 16, 2020
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
pre: OpenCV 3.4.13 (version++)
上级
4f3130f5
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
12 addition
and
12 deletion
+12
-12
doc/tutorials/introduction/cross_referencing/tutorial_cross_referencing.markdown
...ion/cross_referencing/tutorial_cross_referencing.markdown
+2
-2
modules/core/include/opencv2/core/version.hpp
modules/core/include/opencv2/core/version.hpp
+2
-2
modules/dnn/include/opencv2/dnn/dnn.hpp
modules/dnn/include/opencv2/dnn/dnn.hpp
+2
-2
modules/python/package/setup.py
modules/python/package/setup.py
+1
-1
platforms/android/build_sdk.py
platforms/android/build_sdk.py
+1
-1
platforms/android/service/readme.txt
platforms/android/service/readme.txt
+1
-1
platforms/maven/opencv-it/pom.xml
platforms/maven/opencv-it/pom.xml
+1
-1
platforms/maven/opencv/pom.xml
platforms/maven/opencv/pom.xml
+1
-1
platforms/maven/pom.xml
platforms/maven/pom.xml
+1
-1
未找到文件。
doc/tutorials/introduction/cross_referencing/tutorial_cross_referencing.markdown
浏览文件 @
94851139
...
...
@@ -39,14 +39,14 @@ Open your Doxyfile using your favorite text editor and search for the key
`TAGFILES`
. Change it as follows:
@code
TAGFILES = ./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/3.4.1
2
TAGFILES = ./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/3.4.1
3
@endcode
If you had other definitions already, you can append the line using a
`
\`
:
@code
TAGFILES = ./docs/doxygen-tags/libstdc++.tag=https://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen
\
./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/3.4.1
2
./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/3.4.1
3
@endcode
Doxygen can now use the information from the tag file to link to the OpenCV
...
...
modules/core/include/opencv2/core/version.hpp
浏览文件 @
94851139
...
...
@@ -7,8 +7,8 @@
#define CV_VERSION_MAJOR 3
#define CV_VERSION_MINOR 4
#define CV_VERSION_REVISION 1
2
#define CV_VERSION_STATUS "-
dev
"
#define CV_VERSION_REVISION 1
3
#define CV_VERSION_STATUS "-
pre
"
#define CVAUX_STR_EXP(__A) #__A
#define CVAUX_STR(__A) CVAUX_STR_EXP(__A)
...
...
modules/dnn/include/opencv2/dnn/dnn.hpp
浏览文件 @
94851139
...
...
@@ -47,9 +47,9 @@
#include "opencv2/core/async.hpp"
#if !defined CV_DOXYGEN && !defined CV_STATIC_ANALYSIS && !defined CV_DNN_DONT_ADD_EXPERIMENTAL_NS
#define CV__DNN_EXPERIMENTAL_NS_BEGIN namespace experimental_dnn_34_v
19
{
#define CV__DNN_EXPERIMENTAL_NS_BEGIN namespace experimental_dnn_34_v
20
{
#define CV__DNN_EXPERIMENTAL_NS_END }
namespace
cv
{
namespace
dnn
{
namespace
experimental_dnn_34_v
19
{
}
using
namespace
experimental_dnn_34_v19
;
}}
namespace
cv
{
namespace
dnn
{
namespace
experimental_dnn_34_v
20
{
}
using
namespace
experimental_dnn_34_v20
;
}}
#else
#define CV__DNN_EXPERIMENTAL_NS_BEGIN
#define CV__DNN_EXPERIMENTAL_NS_END
...
...
modules/python/package/setup.py
浏览文件 @
94851139
...
...
@@ -9,7 +9,7 @@ def main():
os
.
chdir
(
SCRIPT_DIR
)
package_name
=
'opencv'
package_version
=
os
.
environ
.
get
(
'OPENCV_VERSION'
,
'3.4.1
2
'
)
# TODO
package_version
=
os
.
environ
.
get
(
'OPENCV_VERSION'
,
'3.4.1
3
'
)
# TODO
long_description
=
'Open Source Computer Vision Library Python bindings'
# TODO
...
...
platforms/android/build_sdk.py
浏览文件 @
94851139
...
...
@@ -269,7 +269,7 @@ class Builder:
# Add extra data
apkxmldest
=
check_dir
(
os
.
path
.
join
(
apkdest
,
"res"
,
"xml"
),
create
=
True
)
apklibdest
=
check_dir
(
os
.
path
.
join
(
apkdest
,
"libs"
,
abi
.
name
),
create
=
True
)
for
ver
,
d
in
self
.
extra_packs
+
[(
"3.4.1
2
"
,
os
.
path
.
join
(
self
.
libdest
,
"lib"
))]:
for
ver
,
d
in
self
.
extra_packs
+
[(
"3.4.1
3
"
,
os
.
path
.
join
(
self
.
libdest
,
"lib"
))]:
r
=
ET
.
Element
(
"library"
,
attrib
=
{
"version"
:
ver
})
log
.
info
(
"Adding libraries from %s"
,
d
)
...
...
platforms/android/service/readme.txt
浏览文件 @
94851139
...
...
@@ -12,7 +12,7 @@ manually using adb tool:
adb install <path-to-OpenCV-sdk>/apk/OpenCV_<version>_Manager_<app_version>_<platform>.apk
Example: OpenCV_3.4.1
2
-dev_Manager_3.49_armeabi-v7a.apk
Example: OpenCV_3.4.1
3
-dev_Manager_3.49_armeabi-v7a.apk
Use the list of platforms below to determine proper OpenCV Manager package for your device:
...
...
platforms/maven/opencv-it/pom.xml
浏览文件 @
94851139
...
...
@@ -4,7 +4,7 @@
<parent>
<groupId>
org.opencv
</groupId>
<artifactId>
opencv-parent
</artifactId>
<version>
3.4.1
2
</version>
<version>
3.4.1
3
</version>
</parent>
<groupId>
org.opencv
</groupId>
<artifactId>
opencv-it
</artifactId>
...
...
platforms/maven/opencv/pom.xml
浏览文件 @
94851139
...
...
@@ -4,7 +4,7 @@
<parent>
<groupId>
org.opencv
</groupId>
<artifactId>
opencv-parent
</artifactId>
<version>
3.4.1
2
</version>
<version>
3.4.1
3
</version>
</parent>
<groupId>
org.opencv
</groupId>
<artifactId>
opencv
</artifactId>
...
...
platforms/maven/pom.xml
浏览文件 @
94851139
...
...
@@ -3,7 +3,7 @@
<modelVersion>
4.0.0
</modelVersion>
<groupId>
org.opencv
</groupId>
<artifactId>
opencv-parent
</artifactId>
<version>
3.4.1
2
</version>
<version>
3.4.1
3
</version>
<packaging>
pom
</packaging>
<name>
OpenCV Parent POM
</name>
<licenses>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录