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

Fixed Android build

Browse Source
This commit is contained in:
Andrey Kamaev 2011-07-14 07:04:36 +00:00
parent 562914e33b
commit 87cfcc8ee2
2 changed files with 3 additions and 3 deletions
android
android.toolchain.cmake
modules/objdetect/src
datamatrix.cpp

4
android/android.toolchain.cmake

@ -318,8 +318,8 @@ else()
endif() endif()
if( BUILD_WITH_ANDROID_NDK ) if( BUILD_WITH_ANDROID_NDK )
set( CMAKE_CXX_FLAGS "--sysroot='${ANDROID_NDK_SYSROOT}' ${CMAKE_CXX_FLAGS}" ) set( CMAKE_CXX_FLAGS "--sysroot=\"${ANDROID_NDK_SYSROOT}\" ${CMAKE_CXX_FLAGS}" )
set( CMAKE_C_FLAGS "--sysroot='${ANDROID_NDK_SYSROOT}' ${CMAKE_C_FLAGS}" ) set( CMAKE_C_FLAGS "--sysroot=\"${ANDROID_NDK_SYSROOT}\" ${CMAKE_C_FLAGS}" )
if (ANDROID_NDK_SYSROOT MATCHES "[ ]") if (ANDROID_NDK_SYSROOT MATCHES "[ ]")
# workaround for ugly cmake bug - compiler identification replaces all spaces in compiler flags with ; symbol # workaround for ugly cmake bug - compiler identification replaces all spaces in compiler flags with ; symbol
# as result identification fails if ANDROID_NDK_SYSROOT contain spaces # as result identification fails if ANDROID_NDK_SYSROOT contain spaces

2
modules/objdetect/src/datamatrix.cpp

@ -502,7 +502,7 @@ namespace
DataMatrixCode operator()(CvDataMatrixCode& cvdm) DataMatrixCode operator()(CvDataMatrixCode& cvdm)
{ {
DataMatrixCode dm; DataMatrixCode dm;
std::memcpy(dm.msg,cvdm.msg,sizeof(cvdm.msg)); memcpy(dm.msg,cvdm.msg,sizeof(cvdm.msg));
dm.original = cv::Mat(cvdm.original,true); dm.original = cv::Mat(cvdm.original,true);
cvReleaseMat(&cvdm.original); cvReleaseMat(&cvdm.original);
cv::Mat c(cvdm.corners,true); cv::Mat c(cvdm.corners,true);