Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
95006af1
O
Opencv
项目概览
Greenplum
/
Opencv
11 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
95006af1
编写于
11月 20, 2013
作者:
R
Roman Donchenko
提交者:
OpenCV Buildbot
11月 20, 2013
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1816 from SpecLad:no-more-epoch
上级
63b3db53
615d6c22
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
28 addition
and
42 deletion
+28
-42
cmake/OpenCVVersion.cmake
cmake/OpenCVVersion.cmake
+3
-7
cmake/templates/OpenCVConfig.cmake.in
cmake/templates/OpenCVConfig.cmake.in
+4
-2
doc/conf.py
doc/conf.py
+2
-6
modules/androidcamera/src/camera_activity.cpp
modules/androidcamera/src/camera_activity.cpp
+1
-1
modules/core/include/opencv2/core/version.hpp
modules/core/include/opencv2/core/version.hpp
+5
-10
modules/cudacodec/src/ffmpeg_video_source.cpp
modules/cudacodec/src/ffmpeg_video_source.cpp
+1
-1
modules/cudacodec/src/video_writer.cpp
modules/cudacodec/src/video_writer.cpp
+1
-1
modules/java/android_lib/AndroidManifest.xml
modules/java/android_lib/AndroidManifest.xml
+1
-1
modules/java/generator/gen_java.py
modules/java/generator/gen_java.py
+5
-8
platforms/android/libinfo/info.c
platforms/android/libinfo/info.c
+2
-2
platforms/android/package/AndroidManifest.xml
platforms/android/package/AndroidManifest.xml
+3
-3
未找到文件。
cmake/OpenCVVersion.cmake
浏览文件 @
95006af1
SET
(
OPENCV_VERSION_FILE
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/modules/core/include/opencv2/core/version.hpp"
)
file
(
STRINGS
"
${
OPENCV_VERSION_FILE
}
"
OPENCV_VERSION_PARTS REGEX
"#define CV_VERSION_[A-Z]+[ ]+"
)
string
(
REGEX REPLACE
".+CV_VERSION_EPOCH[ ]+([0-9]+).*"
"
\\
1"
OPENCV_VERSION_MAJOR
"
${
OPENCV_VERSION_PARTS
}
"
)
string
(
REGEX REPLACE
".+CV_VERSION_MAJOR[ ]+([0-9]+).*"
"
\\
1"
OPENCV_VERSION_MINOR
"
${
OPENCV_VERSION_PARTS
}
"
)
string
(
REGEX REPLACE
".+CV_VERSION_MINOR[ ]+([0-9]+).*"
"
\\
1"
OPENCV_VERSION_PATCH
"
${
OPENCV_VERSION_PARTS
}
"
)
string
(
REGEX REPLACE
".+CV_VERSION_REVISION[ ]+([0-9]+).*"
"
\\
1"
OPENCV_VERSION_TWEAK
"
${
OPENCV_VERSION_PARTS
}
"
)
string
(
REGEX REPLACE
".+CV_VERSION_MAJOR[ ]+([0-9]+).*"
"
\\
1"
OPENCV_VERSION_MAJOR
"
${
OPENCV_VERSION_PARTS
}
"
)
string
(
REGEX REPLACE
".+CV_VERSION_MINOR[ ]+([0-9]+).*"
"
\\
1"
OPENCV_VERSION_MINOR
"
${
OPENCV_VERSION_PARTS
}
"
)
string
(
REGEX REPLACE
".+CV_VERSION_REVISION[ ]+([0-9]+).*"
"
\\
1"
OPENCV_VERSION_PATCH
"
${
OPENCV_VERSION_PARTS
}
"
)
string
(
REGEX REPLACE
".+CV_VERSION_STATUS[ ]+
\"
([^
\"
]*)
\"
.*"
"
\\
1"
OPENCV_VERSION_STATUS
"
${
OPENCV_VERSION_PARTS
}
"
)
set
(
OPENCV_VERSION_PLAIN
"
${
OPENCV_VERSION_MAJOR
}
.
${
OPENCV_VERSION_MINOR
}
.
${
OPENCV_VERSION_PATCH
}
"
)
if
(
OPENCV_VERSION_TWEAK GREATER 0
)
set
(
OPENCV_VERSION_PLAIN
"
${
OPENCV_VERSION_PLAIN
}
.
${
OPENCV_VERSION_TWEAK
}
"
)
endif
()
set
(
OPENCV_VERSION
"
${
OPENCV_VERSION_PLAIN
}${
OPENCV_VERSION_STATUS
}
"
)
...
...
cmake/templates/OpenCVConfig.cmake.in
浏览文件 @
95006af1
...
...
@@ -25,7 +25,6 @@
# - OpenCV_VERSION_MAJOR : Major version part of OpenCV_VERSION: "@OPENCV_VERSION_MAJOR@"
# - OpenCV_VERSION_MINOR : Minor version part of OpenCV_VERSION: "@OPENCV_VERSION_MINOR@"
# - OpenCV_VERSION_PATCH : Patch version part of OpenCV_VERSION: "@OPENCV_VERSION_PATCH@"
# - OpenCV_VERSION_TWEAK : Tweak version part of OpenCV_VERSION: "@OPENCV_VERSION_TWEAK@"
# - OpenCV_VERSION_STATUS : Development status of this build: "@OPENCV_VERSION_STATUS@"
#
# Advanced variables:
...
...
@@ -36,6 +35,9 @@
# - OpenCV_USE_MANGLED_PATHS
# - OpenCV_HAVE_ANDROID_CAMERA
#
# Deprecated variables:
# - OpenCV_VERSION_TWEAK : Always "0"
#
# ===================================================================================
set(modules_file_suffix "")
...
...
@@ -109,7 +111,7 @@ SET(OpenCV_VERSION @OPENCV_VERSION_PLAIN@)
SET(OpenCV_VERSION_MAJOR @OPENCV_VERSION_MAJOR@)
SET(OpenCV_VERSION_MINOR @OPENCV_VERSION_MINOR@)
SET(OpenCV_VERSION_PATCH @OPENCV_VERSION_PATCH@)
SET(OpenCV_VERSION_TWEAK
@OPENCV_VERSION_TWEAK@
)
SET(OpenCV_VERSION_TWEAK
0
)
SET(OpenCV_VERSION_STATUS "@OPENCV_VERSION_STATUS@")
# ====================================================================
...
...
doc/conf.py
浏览文件 @
95006af1
...
...
@@ -61,19 +61,15 @@ copyright = u'2011-2013, opencv dev team'
# built documents.
version_file
=
open
(
"../modules/core/include/opencv2/core/version.hpp"
,
"rt"
).
read
()
version_epoch
=
re
.
search
(
"^W*#\W*define\W+CV_VERSION_EPOCH\W+(\d+)\W*$"
,
version_file
,
re
.
MULTILINE
).
group
(
1
)
version_major
=
re
.
search
(
"^W*#\W*define\W+CV_VERSION_MAJOR\W+(\d+)\W*$"
,
version_file
,
re
.
MULTILINE
).
group
(
1
)
version_minor
=
re
.
search
(
"^W*#\W*define\W+CV_VERSION_MINOR\W+(\d+)\W*$"
,
version_file
,
re
.
MULTILINE
).
group
(
1
)
version_patch
=
re
.
search
(
"^W*#\W*define\W+CV_VERSION_REVISION\W+(\d+)\W*$"
,
version_file
,
re
.
MULTILINE
).
group
(
1
)
version_status
=
re
.
search
(
"^W*#\W*define\W+CV_VERSION_STATUS\W+
\"
(.*?)
\"
\W*$"
,
version_file
,
re
.
MULTILINE
).
group
(
1
)
# The short X.Y version.
version
=
version_
epoch
+
'.'
+
version_maj
or
version
=
version_
major
+
'.'
+
version_min
or
# The full version, including alpha/beta/rc tags.
release
=
version_epoch
+
'.'
+
version_major
+
'.'
+
version_minor
if
version_patch
:
release
=
release
+
'.'
+
version_patch
release
+=
version_status
release
=
version_major
+
'.'
+
version_minor
+
'.'
+
version_patch
+
version_status
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
...
...
modules/androidcamera/src/camera_activity.cpp
浏览文件 @
95006af1
...
...
@@ -272,7 +272,7 @@ void CameraWrapperConnector::fillListWrapperLibs(const cv::String& folderPath, s
cv
::
String
CameraWrapperConnector
::
getDefaultPathLibFolder
()
{
#define BIN_PACKAGE_NAME(x) "org.opencv.lib_v" CVAUX_STR(CV_VERSION_
EPOCH) CVAUX_STR(CV_VERSION_MAJ
OR) "_" x
#define BIN_PACKAGE_NAME(x) "org.opencv.lib_v" CVAUX_STR(CV_VERSION_
MAJOR) CVAUX_STR(CV_VERSION_MIN
OR) "_" x
const
char
*
const
packageList
[]
=
{
BIN_PACKAGE_NAME
(
"armv7a"
),
OPENCV_ENGINE_PACKAGE
};
for
(
size_t
i
=
0
;
i
<
sizeof
(
packageList
)
/
sizeof
(
packageList
[
0
]);
i
++
)
{
...
...
modules/core/include/opencv2/core/version.hpp
浏览文件 @
95006af1
...
...
@@ -48,8 +48,7 @@
#ifndef __OPENCV_VERSION_HPP__
#define __OPENCV_VERSION_HPP__
#define CV_VERSION_EPOCH 3
#define CV_VERSION_MAJOR 0
#define CV_VERSION_MAJOR 3
#define CV_VERSION_MINOR 0
#define CV_VERSION_REVISION 0
#define CV_VERSION_STATUS "-dev"
...
...
@@ -60,15 +59,11 @@
#define CVAUX_STRW_EXP(__A) L#__A
#define CVAUX_STRW(__A) CVAUX_STRW_EXP(__A)
#if CV_VERSION_REVISION
# define CV_VERSION CVAUX_STR(CV_VERSION_EPOCH) "." CVAUX_STR(CV_VERSION_MAJOR) "." CVAUX_STR(CV_VERSION_MINOR) "." CVAUX_STR(CV_VERSION_REVISION) CV_VERSION_STATUS
#else
# define CV_VERSION CVAUX_STR(CV_VERSION_EPOCH) "." CVAUX_STR(CV_VERSION_MAJOR) "." CVAUX_STR(CV_VERSION_MINOR) CV_VERSION_STATUS
#endif
#define CV_VERSION CVAUX_STR(CV_VERSION_MAJOR) "." CVAUX_STR(CV_VERSION_MINOR) "." CVAUX_STR(CV_VERSION_REVISION) CV_VERSION_STATUS
/* old style version constants*/
#define CV_MAJOR_VERSION CV_VERSION_
EPOCH
#define CV_MINOR_VERSION CV_VERSION_M
AJ
OR
#define CV_SUBMINOR_VERSION CV_VERSION_
MINOR
#define CV_MAJOR_VERSION CV_VERSION_
MAJOR
#define CV_MINOR_VERSION CV_VERSION_M
IN
OR
#define CV_SUBMINOR_VERSION CV_VERSION_
REVISION
#endif
modules/cudacodec/src/ffmpeg_video_source.cpp
浏览文件 @
95006af1
...
...
@@ -63,7 +63,7 @@ namespace
{
#if defined WIN32 || defined _WIN32
const
char
*
module_name
=
"opencv_ffmpeg"
CVAUX_STR
(
CV_VERSION_
EPOCH
)
CVAUX_STR
(
CV_VERSION_MAJOR
)
CVAUX_STR
(
CV_VERSION_MINOR
)
CVAUX_STR
(
CV_VERSION_
MAJOR
)
CVAUX_STR
(
CV_VERSION_MINOR
)
CVAUX_STR
(
CV_VERSION_REVISION
)
#if (defined _MSC_VER && defined _M_X64) || (defined __GNUC__ && defined __x86_64__)
"_64"
#endif
...
...
modules/cudacodec/src/video_writer.cpp
浏览文件 @
95006af1
...
...
@@ -733,7 +733,7 @@ namespace
{
#if defined(WIN32) || defined(_WIN32)
const
char
*
module_name
=
"opencv_ffmpeg"
CVAUX_STR
(
CV_VERSION_
EPOCH
)
CVAUX_STR
(
CV_VERSION_MAJOR
)
CVAUX_STR
(
CV_VERSION_MINOR
)
CVAUX_STR
(
CV_VERSION_
MAJOR
)
CVAUX_STR
(
CV_VERSION_MINOR
)
CVAUX_STR
(
CV_VERSION_REVISION
)
#if (defined _MSC_VER && defined _M_X64) || (defined __GNUC__ && defined __x86_64__)
"_64"
#endif
...
...
modules/java/android_lib/AndroidManifest.xml
浏览文件 @
95006af1
<?xml version="1.0" encoding="utf-8"?>
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
package=
"org.opencv"
android:versionCode=
"@OPENCV_VERSION_MAJOR@@OPENCV_VERSION_MINOR@@OPENCV_VERSION_PATCH@
@OPENCV_VERSION_TWEAK@
"
android:versionCode=
"@OPENCV_VERSION_MAJOR@@OPENCV_VERSION_MINOR@@OPENCV_VERSION_PATCH@
0
"
android:versionName=
"@OPENCV_VERSION@"
>
<uses-sdk
android:minSdkVersion=
"8"
/>
...
...
modules/java/generator/gen_java.py
浏览文件 @
95006af1
...
...
@@ -628,12 +628,11 @@ func_arg_fix = {
def
getLibVersion
(
version_hpp_path
):
version_file
=
open
(
version_hpp_path
,
"rt"
).
read
()
epoch
=
re
.
search
(
"^W*#\W*define\W+CV_VERSION_EPOCH\W+(\d+)\W*$"
,
version_file
,
re
.
MULTILINE
).
group
(
1
)
major
=
re
.
search
(
"^W*#\W*define\W+CV_VERSION_MAJOR\W+(\d+)\W*$"
,
version_file
,
re
.
MULTILINE
).
group
(
1
)
minor
=
re
.
search
(
"^W*#\W*define\W+CV_VERSION_MINOR\W+(\d+)\W*$"
,
version_file
,
re
.
MULTILINE
).
group
(
1
)
revision
=
re
.
search
(
"^W*#\W*define\W+CV_VERSION_REVISION\W+(\d+)\W*$"
,
version_file
,
re
.
MULTILINE
).
group
(
1
)
status
=
re
.
search
(
"^W*#\W*define\W+CV_VERSION_STATUS\W+
\"
(.*?)
\"
\W*$"
,
version_file
,
re
.
MULTILINE
).
group
(
1
)
return
(
epoch
,
major
,
minor
,
revision
,
status
)
return
(
major
,
minor
,
revision
,
status
)
class
ConstInfo
(
object
):
def
__init__
(
self
,
cname
,
name
,
val
,
addedManually
=
False
):
...
...
@@ -800,16 +799,15 @@ public class %(jc)s {
"""
%
{
'm'
:
self
.
module
,
'jc'
:
jname
}
)
if
class_name
==
'Core'
:
(
epoch
,
major
,
minor
,
revision
,
status
)
=
getLibVersion
(
(
major
,
minor
,
revision
,
status
)
=
getLibVersion
(
(
os
.
path
.
dirname
(
__file__
)
or
'.'
)
+
'/../../core/include/opencv2/core/version.hpp'
)
version_str
=
'.'
.
join
(
(
epoch
,
major
,
minor
,
revision
)
)
+
status
version_suffix
=
''
.
join
(
(
epoch
,
major
,
minor
)
)
version_str
=
'.'
.
join
(
(
major
,
minor
,
revision
)
)
+
status
version_suffix
=
''
.
join
(
(
major
,
minor
,
revision
)
)
self
.
classes
[
class_name
].
imports
.
add
(
"java.lang.String"
)
self
.
java_code
[
class_name
][
"j_code"
].
write
(
"""
// these constants are wrapped inside functions to prevent inlining
private static String getVersion() { return "%(v)s"; }
private static String getNativeLibraryName() { return "opencv_java%(vs)s"; }
private static int getVersionEpoch() { return %(ep)s; }
private static int getVersionMajor() { return %(ma)s; }
private static int getVersionMinor() { return %(mi)s; }
private static int getVersionRevision() { return %(re)s; }
...
...
@@ -817,12 +815,11 @@ public class %(jc)s {
public static final String VERSION = getVersion();
public static final String NATIVE_LIBRARY_NAME = getNativeLibraryName();
public static final int VERSION_EPOCH = getVersionEpoch();
public static final int VERSION_MAJOR = getVersionMajor();
public static final int VERSION_MINOR = getVersionMinor();
public static final int VERSION_REVISION = getVersionRevision();
public static final String VERSION_STATUS = getVersionStatus();
"""
%
{
'v'
:
version_str
,
'vs'
:
version_suffix
,
'
ep'
:
epoch
,
'
ma'
:
major
,
'mi'
:
minor
,
're'
:
revision
,
'st'
:
status
}
)
"""
%
{
'v'
:
version_str
,
'vs'
:
version_suffix
,
'ma'
:
major
,
'mi'
:
minor
,
're'
:
revision
,
'st'
:
status
}
)
def
add_class
(
self
,
decl
):
...
...
platforms/android/libinfo/info.c
浏览文件 @
95006af1
...
...
@@ -6,8 +6,8 @@ const char* GetRevision(void);
const
char
*
GetLibraryList
(
void
);
JNIEXPORT
jstring
JNICALL
Java_org_opencv_android_StaticHelper_getLibraryList
(
JNIEnv
*
,
jclass
);
#define PACKAGE_NAME "org.opencv.lib_v" CVAUX_STR(CV_VERSION_
EPOCH) CVAUX_STR(CV_VERSION_MAJ
OR) "_" ANDROID_PACKAGE_PLATFORM
#define PACKAGE_REVISION CVAUX_STR(CV_VERSION_
MINOR) "." CVAUX_STR(CV_VERSION_
REVISION) "." CVAUX_STR(ANDROID_PACKAGE_RELEASE)
#define PACKAGE_NAME "org.opencv.lib_v" CVAUX_STR(CV_VERSION_
MAJOR) CVAUX_STR(CV_VERSION_MIN
OR) "_" ANDROID_PACKAGE_PLATFORM
#define PACKAGE_REVISION CVAUX_STR(CV_VERSION_REVISION) "." CVAUX_STR(ANDROID_PACKAGE_RELEASE)
const
char
*
GetPackageName
(
void
)
{
...
...
platforms/android/package/AndroidManifest.xml
浏览文件 @
95006af1
<?xml version="1.0" encoding="utf-8"?>
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
package=
"org.opencv.lib_v@OPENCV_VERSION_MAJOR@@OPENCV_VERSION_MINOR@_@ANDROID_PACKAGE_PLATFORM@"
android:versionCode=
"@OPENCV_VERSION_PATCH@
@OPENCV_VERSION_TWEAK@
@ANDROID_PACKAGE_RELEASE@"
android:versionName=
"@OPENCV_VERSION_PATCH@.@
OPENCV_VERSION_TWEAK@.@
ANDROID_PACKAGE_RELEASE@"
>
android:versionCode=
"@OPENCV_VERSION_PATCH@
0
@ANDROID_PACKAGE_RELEASE@"
android:versionName=
"@OPENCV_VERSION_PATCH@.@ANDROID_PACKAGE_RELEASE@"
>
<uses-sdk
android:minSdkVersion=
"@ANDROID_SDK_VERSION@"
/>
<uses-feature
android:name=
"android.hardware.touchscreen"
android:required=
"false"
/>
...
...
@@ -12,4 +12,4 @@
android:label=
"@string/app_name"
>
</application>
</manifest>
\ No newline at end of file
</manifest>
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录