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

Android: renamed default library name for static and dynamic fallback load; fixed libz import for 64-bit platforms

Browse Source
This commit is contained in:
Maksim Shabunin 2015-06-19 18:53:45 +03:00
parent 59ed7d06bf
commit 83b2621de4
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/OpenCVFindLibsGrfmt.cmake
View File

@ -8,7 +8,8 @@ if(BUILD_ZLIB)
else() else()
find_package(ZLIB "${MIN_VER_ZLIB}") find_package(ZLIB "${MIN_VER_ZLIB}")
if(ZLIB_FOUND AND ANDROID) if(ZLIB_FOUND AND ANDROID)
if(ZLIB_LIBRARIES STREQUAL "${ANDROID_SYSROOT}/usr/lib/libz.so") if(ZLIB_LIBRARIES STREQUAL "${ANDROID_SYSROOT}/usr/lib/libz.so" OR
ZLIB_LIBRARIES STREQUAL "${ANDROID_SYSROOT}/usr/lib64/libz.so")
set(ZLIB_LIBRARIES z) set(ZLIB_LIBRARIES z)
endif() endif()
endif() endif()

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

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

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

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