mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-18 14:13:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

next(android): java3 -> java4

Browse Source
This commit is contained in:
Alexander Alekhin 2018-04-03 16:41:48 +03:00
parent 250941bd47
commit c6aa97c9aa
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/OpenCVGenAndroidMK.cmake
View File

@ -48,7 +48,7 @@ if(ANDROID)
string(REPLACE "opencv_" "" OPENCV_MODULES_CONFIGMAKE "${OPENCV_MODULES_CONFIGMAKE}")
if(BUILD_FAT_JAVA_LIB)
set(OPENCV_LIBS_CONFIGMAKE java3)
set(OPENCV_LIBS_CONFIGMAKE java4)
else()
set(OPENCV_LIBS_CONFIGMAKE "${OPENCV_MODULES_CONFIGMAKE}")
endif()

4
doc/tutorials/introduction/android_binary_package/android_ocl_intro.markdown
View File

@ -144,7 +144,7 @@ Here is a simple Java wrapper for our JNI stuff:
public class NativeGLRenderer {
static
{
System.loadLibrary("opencv_java3"); // comment this when using OpenCV Manager
System.loadLibrary("opencv_java4"); // comment this when using OpenCV Manager
System.loadLibrary("JNIrender");
}
@ -383,7 +383,7 @@ Unfortunately `UMat` keeps OpenCL _buffer_ internally, that can't be wrapped ove
path/to/cmake.exe -GNinja -DCMAKE_MAKE_PROGRAM="path/to/ninja.exe" -DCMAKE_TOOLCHAIN_FILE=path/to/opencv/platforms/android/android.toolchain.cmake -DANDROID_ABI="armeabi-v7a with NEON" -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON path/to/opencv
path/to/ninja.exe install/strip
@endcode
To use your own modified `libopencv_java3.so` you have to keep inside your APK, not to use OpenCV Manager and load it manually via `System.loadLibrary("opencv_java3")`.
To use your own modified `libopencv_java4.so` you have to keep inside your APK, not to use OpenCV Manager and load it manually via `System.loadLibrary("opencv_java4")`.
Performance notes
-----------------

2
modules/java/android_sdk/build.gradle.in
View File

@ -49,7 +49,7 @@
// - avoid using of "OpenCVLoader.initAsync()" approach - it is deprecated
// It may load library with different version (from OpenCV Android Manager, which is installed separatelly on device)
//
// - use "System.loadLibrary("opencv_java3")" or "OpenCVLoader.initDebug()"
// - use "System.loadLibrary("opencv_java4")" or "OpenCVLoader.initDebug()"
// TODO: Add accurate API to load OpenCV native library
//
//

2
modules/java/generator/android/java/org/opencv/android/AsyncServiceHelper.java
View File

@ -376,7 +376,7 @@ class AsyncServiceHelper
else
{
// If the dependencies list is not defined or empty.
String AbsLibraryPath = Path + File.separator + "libopencv_java3.so";
String AbsLibraryPath = Path + File.separator + "libopencv_java4.so";
result = loadLibrary(AbsLibraryPath);
}

2
modules/java/generator/android/java/org/opencv/android/StaticHelper.java
View File

@ -92,7 +92,7 @@ class StaticHelper {
else
{
// If dependencies list is not defined or empty.
result = loadLibrary("opencv_java3");
result = loadLibrary("opencv_java4");
}
return result;

2
samples/android/tutorial-4-opencl/src/org/opencv/samples/tutorial4/NativePart.java
View File

@ -3,7 +3,7 @@ package org.opencv.samples.tutorial4;
public class NativePart {
static
{
System.loadLibrary("opencv_java3");
System.loadLibrary("opencv_java4");
System.loadLibrary("JNIpart");
}