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
9a3dccab
Commit
9a3dccab
authored
Jul 29, 2015
by
Evgeny Talanin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Increase Android Manager version
parent
ac6ca660
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
5 deletions
+9
-5
android+OpenCVLoader.java
modules/java/generator/src/java/android+OpenCVLoader.java
+5
-0
AndroidManifest.xml
platforms/android/service/engine/AndroidManifest.xml
+3
-4
OpenCVEngine.cpp
...droid/service/engine/jni/BinderComponent/OpenCVEngine.cpp
+1
-1
No files found.
modules/java/generator/src/java/android+OpenCVLoader.java
View file @
9a3dccab
...
...
@@ -57,6 +57,11 @@ public class OpenCVLoader
*/
public
static
final
String
OPENCV_VERSION_2_4_11
=
"2.4.11"
;
/**
* OpenCV Library version 2.4.12.
*/
public
static
final
String
OPENCV_VERSION_2_4_12
=
"2.4.12"
;
/**
* Loads and initializes OpenCV library from current application package. Roughly, it's an analog of system.loadLibrary("opencv_java").
* @return Returns true is initialization of OpenCV was successful.
...
...
platforms/android/service/engine/AndroidManifest.xml
View file @
9a3dccab
<?xml version="1.0" encoding="utf-8"?>
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
package=
"org.opencv.engine"
android:versionCode=
"2
19
@ANDROID_PLATFORM_VERSION_CODE@"
android:versionName=
"2.2
0
"
>
android:versionCode=
"2
21
@ANDROID_PLATFORM_VERSION_CODE@"
android:versionName=
"2.2
1
"
>
<uses-sdk
android:minSdkVersion=
"@ANDROID_NATIVE_API_LEVEL@"
/>
<uses-feature
android:name=
"android.hardware.touchscreen"
android:required=
"false"
/>
...
...
@@ -27,4 +27,4 @@
</intent-filter>
</activity>
</application>
</manifest>
\ No newline at end of file
</manifest>
platforms/android/service/engine/jni/BinderComponent/OpenCVEngine.cpp
View file @
9a3dccab
...
...
@@ -15,7 +15,7 @@ using namespace android;
const
int
OpenCVEngine
::
Platform
=
DetectKnownPlatforms
();
const
int
OpenCVEngine
::
CpuID
=
GetCpuID
();
const
int
OpenCVEngine
::
KnownVersions
[]
=
{
2040000
,
2040100
,
2040200
,
2040300
,
2040301
,
2040302
,
2040400
,
2040500
,
2040600
,
2040700
,
2040701
,
2040800
,
2040900
,
2041000
,
2041100
};
const
int
OpenCVEngine
::
KnownVersions
[]
=
{
2040000
,
2040100
,
2040200
,
2040300
,
2040301
,
2040302
,
2040400
,
2040500
,
2040600
,
2040700
,
2040701
,
2040800
,
2040900
,
2041000
,
2041100
,
2041200
};
bool
OpenCVEngine
::
ValidateVersion
(
int
version
)
{
...
...
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