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

Merge branch '2.4'

Browse Source
This commit is contained in:
Andrey Kamaev
2013-02-12 20:30:17 +04:00
parent b44b920997 ca5e6f9522
commit 956aa68fb5
6 changed files with 226 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,6 +3,7 @@ package org.opencv.android;
import java.io.File;
import java.util.StringTokenizer;
import org.opencv.core.Core;
import org.opencv.engine.OpenCVEngineInterface;
import android.content.ComponentName;
@@ -85,7 +86,6 @@ class AsyncServiceHelper
{
mServiceInstallationProgress = true;
Log.d(TAG, "Package installation started");
}
else
{
@@ -299,6 +299,10 @@ class AsyncServiceHelper
if (initOpenCVLibs(path, libs))
{
Log.d(TAG, "First attempt to load libs is OK");
String eol = System.getProperty("line.separator");
for (String str : Core.getBuildInformation().split(eol))
Log.i(TAG, str);
status = LoaderCallbackInterface.SUCCESS;
}
else

7
modules/java/generator/src/java/android+StaticHelper.java
View File

@@ -1,7 +1,8 @@
package org.opencv.android;
import java.util.StringTokenizer;
import org.opencv.core.Core;
import java.util.StringTokenizer;
import android.util.Log;
class StaticHelper {
@@ -28,6 +29,10 @@ class StaticHelper {
if (initOpenCVLibs(libs))
{
Log.d(TAG, "First attempt to load libs is OK");
String eol = System.getProperty("line.separator");
for (String str : Core.getBuildInformation().split(eol))
Log.i(TAG, str);
result = true;
}
else