generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged the recent fixes from 2.4 branch

Browse Source
This commit is contained in:
Andrey Kamaev
2012-07-04 08:04:31 +00:00
parent 4128d5782f
commit 51f6127e0a
50 changed files with 56780 additions and 45112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/java/generator/src/java/android+AsyncServiceHelper.java
View File

@@ -56,7 +56,7 @@ class AsyncServiceHelper
private LoaderCallbackInterface mUserAppCallback = Callback;
public String getPackageName()
{
return "OpenCV Manager Service";
return "OpenCV Manager";
}
public void install() {
Log.d(TAG, "Trying to install OpenCV Manager via Google Play");

9
modules/java/generator/src/java/android+OpenCVLoader.java
View File

@@ -8,14 +8,9 @@ import android.content.Context;
public class OpenCVLoader
{
/**
* OpenCV Library version 2.4.0
* OpenCV Library version 2.4.2
*/
public static final String OPEN_CV_VERSION_2_4_0 = "2.4.0";
/**
* OpenCV Library version 2.4.0
*/
public static final String OPEN_CV_VERSION_2_4_2 = "2.4.2";
public static final String OPENCV_VERSION_2_4_2 = "2.4.2";
/**
* Load and initialize OpenCV library from current application package. Roughly it is analog of system.loadLibrary("opencv_java")