Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
4af3ca4e
Commit
4af3ca4e
authored
Aug 03, 2017
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
OpenCV version++
OpenCV 3.3.0
parent
953160dd
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
6 deletions
+6
-6
version.hpp
modules/core/include/opencv2/core/version.hpp
+1
-1
build_sdk.py
platforms/android/build_sdk.py
+1
-1
AndroidManifest.xml
platforms/android/service/engine/AndroidManifest.xml
+2
-2
OpenCVEngineService.java
...ice/engine/src/org/opencv/engine/OpenCVEngineService.java
+1
-1
readme.txt
platforms/android/service/readme.txt
+1
-1
No files found.
modules/core/include/opencv2/core/version.hpp
View file @
4af3ca4e
...
...
@@ -53,7 +53,7 @@
#define CV_VERSION_MAJOR 3
#define CV_VERSION_MINOR 3
#define CV_VERSION_REVISION 0
#define CV_VERSION_STATUS "
-rc
"
#define CV_VERSION_STATUS ""
#define CVAUX_STR_EXP(__A) #__A
#define CVAUX_STR(__A) CVAUX_STR_EXP(__A)
...
...
platforms/android/build_sdk.py
View file @
4af3ca4e
...
...
@@ -171,7 +171,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.
2
.0"
,
os
.
path
.
join
(
self
.
libdest
,
"lib"
))]:
for
ver
,
d
in
self
.
extra_packs
+
[(
"3.
3
.0"
,
os
.
path
.
join
(
self
.
libdest
,
"lib"
))]:
r
=
ET
.
Element
(
"library"
,
attrib
=
{
"version"
:
ver
})
log
.
info
(
"Adding libraries from
%
s"
,
d
)
...
...
platforms/android/service/engine/AndroidManifest.xml
View file @
4af3ca4e
<?xml version="1.0" encoding="utf-8"?>
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
package=
"org.opencv.engine"
android:versionCode=
"3
2
0@ANDROID_PLATFORM_ID@"
android:versionName=
"3.
2
0"
>
android:versionCode=
"3
3
0@ANDROID_PLATFORM_ID@"
android:versionName=
"3.
3
0"
>
<uses-sdk
android:minSdkVersion=
"@ANDROID_NATIVE_API_LEVEL@"
android:targetSdkVersion=
"22"
/>
<uses-feature
android:name=
"android.hardware.touchscreen"
android:required=
"false"
/>
...
...
platforms/android/service/engine/src/org/opencv/engine/OpenCVEngineService.java
View file @
4af3ca4e
...
...
@@ -134,7 +134,7 @@ public class OpenCVEngineService extends Service {
@Override
public
int
getEngineVersion
()
throws
RemoteException
{
int
version
=
3
2
00
;
int
version
=
3
3
00
;
try
{
version
=
getPackageManager
().
getPackageInfo
(
getPackageName
(),
0
).
versionCode
;
}
catch
(
NameNotFoundException
e
)
{
...
...
platforms/android/service/readme.txt
View file @
4af3ca4e
...
...
@@ -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.
2.0-dev_Manager_3.2
0_armeabi-v7a.apk
Example: OpenCV_3.
3.0-dev_Manager_3.3
0_armeabi-v7a.apk
Use the list of platforms below to determine proper OpenCV Manager package for your device:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment