Fixed Android build

diff --git a/android/android.toolchain.cmake b/android/android.toolchain.cmake
index 7c7fe21..480c8c7 100644 (file)
--- a/android/android.toolchain.cmake
+++ b/android/android.toolchain.cmake
@@ -318,8 +318,8 @@ else()
 endif()
 
 if( BUILD_WITH_ANDROID_NDK )
- set( CMAKE_CXX_FLAGS "--sysroot='${ANDROID_NDK_SYSROOT}' ${CMAKE_CXX_FLAGS}" )
- set( CMAKE_C_FLAGS "--sysroot='${ANDROID_NDK_SYSROOT}' ${CMAKE_C_FLAGS}" )
+ set( CMAKE_CXX_FLAGS "--sysroot=\"${ANDROID_NDK_SYSROOT}\" ${CMAKE_CXX_FLAGS}" )
+ set( CMAKE_C_FLAGS "--sysroot=\"${ANDROID_NDK_SYSROOT}\" ${CMAKE_C_FLAGS}" )
  if (ANDROID_NDK_SYSROOT MATCHES "[ ]")
   # 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

diff --git a/modules/objdetect/src/datamatrix.cpp b/modules/objdetect/src/datamatrix.cpp
index 9e46239..6845010 100644 (file)
--- a/modules/objdetect/src/datamatrix.cpp
+++ b/modules/objdetect/src/datamatrix.cpp
@@ -502,7 +502,7 @@ namespace
     DataMatrixCode operator()(CvDataMatrixCode& cvdm)
     {
       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);
       cvReleaseMat(&cvdm.original);
       cv::Mat c(cvdm.corners,true);