Merge pull request #476 from apavlenko:eclipse_import_fix

Merge pull request #470 from kirill-kornyakov:bug_2788_testing_add_method_for_column
Merge pull request #473 from prclibo:2.4
2026-07-26 05:43:05 +04:00 · 2013-02-11 21:38:07 +04:00 · 2013-02-11 21:16:39 +04:00 · 2013-02-11 20:48:03 +04:00 · 2013-02-11 20:46:48 +04:00 · 2013-02-11 19:49:18 +04:00
571 changed files with 29190 additions and 20021 deletions
@@ -1,15 +1,18 @@
-#build TBB for Android from source
-if(NOT ANDROID)
-  message(FATAL_ERROR "The script is designed for Android only!")
-endif()
-
+#Cross compile TBB from source
 project(tbb)

-# 4.1 update 1 - works fine
-set(tbb_ver "tbb41_20121003oss")
-set(tbb_url "http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb41_20121003oss_src.tgz")
-set(tbb_md5 "2a684fefb855d2d0318d1ef09afa75ff")
+# 4.1 update 2 - works fine
+set(tbb_ver "tbb41_20130116oss")
+set(tbb_url "http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb41_20130116oss_src.tgz")
+set(tbb_md5 "3809790e1001a1b32d59c9fee590ee85")
 set(tbb_version_file "version_string.ver")
+ocv_warnings_disable(CMAKE_CXX_FLAGS -Wshadow)
+
+# 4.1 update 1 - works fine
+#set(tbb_ver "tbb41_20121003oss")
+#set(tbb_url "http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb41_20121003oss_src.tgz")
+#set(tbb_md5 "2a684fefb855d2d0318d1ef09afa75ff")
+#set(tbb_version_file "version_string.ver")

 # 4.1 - works fine
 #set(tbb_ver "tbb41_20120718oss")
@@ -121,9 +124,9 @@ list(APPEND lib_srcs "${tbb_src_dir}/src/rml/client/rml_tbb.cpp")

 add_definitions(-D__TBB_DYNAMIC_LOAD_ENABLED=0         #required
                -D__TBB_BUILD=1                        #required
-                -D__TBB_SURVIVE_THREAD_SWITCH=0        #no cilk on Android ?
-                -DUSE_PTHREAD                          #required
-                -DTBB_USE_GCC_BUILTINS=1               #required
+                -D__TBB_SURVIVE_THREAD_SWITCH=0        #no cilk support
+                -DUSE_PTHREAD                          #required for Unix
+                -DTBB_USE_GCC_BUILTINS=1               #required for ARM GCC
                -DTBB_USE_DEBUG=0                      #just to be sure
                -DTBB_NO_LEGACY=1                      #don't need backward compatibility
                -DDO_ITT_NOTIFY=0                      #it seems that we don't need these notifications
@@ -140,14 +143,24 @@ if(tbb_need_GENERIC_DWORD_LOAD_STORE)
  set(tbb_need_GENERIC_DWORD_LOAD_STORE ON PARENT_SCOPE)
 endif()

-add_library(tbb STATIC ${lib_srcs} ${lib_hdrs} "${CMAKE_CURRENT_SOURCE_DIR}/android_additional.h" "${CMAKE_CURRENT_SOURCE_DIR}/${tbb_version_file}")
+set(TBB_SOURCE_FILES ${lib_srcs} ${lib_hdrs})
+
+if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm")
+  if (NOT ANDROID)
+    set(TBB_SOURCE_FILES ${TBB_SOURCE_FILES} "${CMAKE_CURRENT_SOURCE_DIR}/arm_linux_stub.cpp")
+  endif()
+  set(TBB_SOURCE_FILES ${TBB_SOURCE_FILES} "${CMAKE_CURRENT_SOURCE_DIR}/android_additional.h")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -include \"${CMAKE_CURRENT_SOURCE_DIR}/android_additional.h\"")
+endif()
+
+set(TBB_SOURCE_FILES ${TBB_SOURCE_FILES} "${CMAKE_CURRENT_SOURCE_DIR}/${tbb_version_file}")
+
+add_library(tbb ${TBB_SOURCE_FILES})
 target_link_libraries(tbb c m dl)

 ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef -Wmissing-declarations)
 string(REPLACE "-Werror=non-virtual-dtor" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -include \"${CMAKE_CURRENT_SOURCE_DIR}/android_additional.h\"")
-
 set_target_properties(tbb
  PROPERTIES OUTPUT_NAME tbb
  DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
@@ -164,4 +177,3 @@ endif()

 # get TBB version
 ocv_parse_header("${tbb_src_dir}/include/tbb/tbb_stddef.h" TBB_VERSION_LINES TBB_VERSION_MAJOR TBB_VERSION_MINOR TBB_INTERFACE_VERSION CACHE)
-
@@ -0,0 +1,10 @@
+#include "tbb/tbb_misc.h"
+
+namespace tbb {
+namespace internal {
+
+void affinity_helper::protect_affinity_mask() {}
+affinity_helper::~affinity_helper() {}
+
+}
+}
@@ -110,14 +110,15 @@ endif()

 # Optional 3rd party components
 # ===================================================
-OCV_OPTION(WITH_1394           "Include IEEE1394 support"                    ON   IF (UNIX AND NOT ANDROID AND NOT IOS) )
+OCV_OPTION(WITH_1394           "Include IEEE1394 support"                    ON   IF (UNIX AND NOT ANDROID AND NOT IOS AND NOT CARMA) )
 OCV_OPTION(WITH_AVFOUNDATION   "Use AVFoundation for Video I/O"              ON   IF IOS)
 OCV_OPTION(WITH_CARBON         "Use Carbon for UI instead of Cocoa"          OFF  IF APPLE )
-OCV_OPTION(WITH_CUBLAS         "Include NVidia Cuda Basic Linear Algebra Subprograms (BLAS) library support" OFF IF (CMAKE_VERSION VERSION_GREATER "2.8" AND NOT ANDROID AND NOT IOS) )
 OCV_OPTION(WITH_CUDA           "Include NVidia Cuda Runtime support"         ON   IF (CMAKE_VERSION VERSION_GREATER "2.8" AND NOT ANDROID AND NOT IOS) )
 OCV_OPTION(WITH_CUFFT          "Include NVidia Cuda Fast Fourier Transform (FFT) library support"            ON  IF (CMAKE_VERSION VERSION_GREATER "2.8" AND NOT ANDROID AND NOT IOS) )
+OCV_OPTION(WITH_CUBLAS         "Include NVidia Cuda Basic Linear Algebra Subprograms (BLAS) library support" OFF IF (CMAKE_VERSION VERSION_GREATER "2.8" AND NOT ANDROID AND NOT IOS) )
+OCV_OPTION(WITH_NVCUVID        "Include NVidia Video Decoding library support"                               OFF IF (CMAKE_VERSION VERSION_GREATER "2.8" AND NOT ANDROID AND NOT IOS AND NOT APPLE) )
 OCV_OPTION(WITH_EIGEN          "Include Eigen2/Eigen3 support"               ON)
-OCV_OPTION(WITH_FFMPEG         "Include FFMPEG support"                      ON   IF (NOT ANDROID AND NOT IOS) )
+OCV_OPTION(WITH_FFMPEG         "Include FFMPEG support"                      ON   IF (NOT ANDROID AND NOT IOS))
 OCV_OPTION(WITH_GSTREAMER      "Include Gstreamer support"                   ON   IF (UNIX AND NOT APPLE AND NOT ANDROID) )
 OCV_OPTION(WITH_GTK            "Include GTK support"                         ON   IF (UNIX AND NOT APPLE AND NOT ANDROID) )
 OCV_OPTION(WITH_IMAGEIO        "ImageIO support for OS X"                    OFF  IF APPLE)
@@ -136,18 +137,19 @@ OCV_OPTION(WITH_TBB            "Include Intel TBB support"                   OFF
 OCV_OPTION(WITH_CSTRIPES       "Include C= support"                          OFF  IF WIN32 )
 OCV_OPTION(WITH_TIFF           "Include TIFF support"                        ON   IF (NOT IOS) )
 OCV_OPTION(WITH_UNICAP         "Include Unicap support (GPL)"                OFF  IF (UNIX AND NOT APPLE AND NOT ANDROID) )
-OCV_OPTION(WITH_V4L            "Include Video 4 Linux support"               ON   IF (UNIX AND NOT APPLE AND NOT ANDROID) )
+OCV_OPTION(WITH_V4L            "Include Video 4 Linux support"               ON   IF (UNIX AND NOT ANDROID) )
 OCV_OPTION(WITH_VIDEOINPUT     "Build HighGUI with DirectShow support"       ON   IF WIN32 )
 OCV_OPTION(WITH_XIMEA          "Include XIMEA cameras support"               OFF  IF (NOT ANDROID AND NOT APPLE) )
 OCV_OPTION(WITH_XINE           "Include Xine support (GPL)"                  OFF  IF (UNIX AND NOT APPLE AND NOT ANDROID) )
-OCV_OPTION(WITH_OPENCL         "Include OpenCL Runtime support"              OFF  IF (NOT ANDROID AND NOT IOS) )
-OCV_OPTION(WITH_OPENCLAMDFFT   "Include AMD OpenCL FFT library support"      OFF  IF (NOT ANDROID AND NOT IOS) )
-OCV_OPTION(WITH_OPENCLAMDBLAS  "Include AMD OpenCL BLAS library support"     OFF  IF (NOT ANDROID AND NOT IOS) )
+OCV_OPTION(WITH_OPENCL         "Include OpenCL Runtime support"              OFF  IF (NOT ANDROID AND NOT IOS AND NOT CARMA) )
+OCV_OPTION(WITH_OPENCLAMDFFT   "Include AMD OpenCL FFT library support"      OFF  IF (NOT ANDROID AND NOT IOS AND NOT CARMA) )
+OCV_OPTION(WITH_OPENCLAMDBLAS  "Include AMD OpenCL BLAS library support"     OFF  IF (NOT ANDROID AND NOT IOS AND NOT CARMA) )


 # OpenCV build components
 # ===================================================
 OCV_OPTION(BUILD_SHARED_LIBS        "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)" NOT (ANDROID OR IOS) )
+OCV_OPTION(BUILD_opencv_apps        "Build utility applications (used for example to train classifiers)" (NOT ANDROID) IF (NOT IOS) )
 OCV_OPTION(BUILD_ANDROID_EXAMPLES   "Build examples for Android platform"         ON  IF ANDROID )
 OCV_OPTION(BUILD_DOCS               "Create build rules for OpenCV Documentation" ON )
 OCV_OPTION(BUILD_EXAMPLES           "Build all examples"                          OFF )
@@ -156,18 +158,18 @@ OCV_OPTION(BUILD_PERF_TESTS         "Build performance tests"
 OCV_OPTION(BUILD_TESTS              "Build accuracy & regression tests"           ON  IF (NOT IOS) )
 OCV_OPTION(BUILD_WITH_DEBUG_INFO    "Include debug info into debug libs (not MSCV only)" ON )
 OCV_OPTION(BUILD_WITH_STATIC_CRT    "Enables use of staticaly linked CRT for staticaly linked OpenCV" ON IF MSVC )
-OCV_OPTION(BUILD_FAT_JAVA_LIB       "Create fat java wrapper containing the whole OpenCV library" ON IF ANDROID AND NOT BUILD_SHARED_LIBS AND CMAKE_COMPILER_IS_GNUCXX )
+OCV_OPTION(BUILD_FAT_JAVA_LIB       "Create fat java wrapper containing the whole OpenCV library" ON IF NOT BUILD_SHARED_LIBS AND CMAKE_COMPILER_IS_GNUCXX )
 OCV_OPTION(BUILD_ANDROID_SERVICE    "Build OpenCV Manager for Google Play" OFF IF ANDROID AND ANDROID_SOURCE_TREE )
 OCV_OPTION(BUILD_ANDROID_PACKAGE    "Build platform-specific package for Google Play" OFF IF ANDROID )

 # 3rd party libs
-OCV_OPTION(BUILD_ZLIB               "Build zlib from source"         WIN32 OR APPLE )
-OCV_OPTION(BUILD_TIFF               "Build libtiff from source"      WIN32 OR ANDROID OR APPLE )
-OCV_OPTION(BUILD_JASPER             "Build libjasper from source"    WIN32 OR ANDROID OR APPLE )
-OCV_OPTION(BUILD_JPEG               "Build libjpeg from source"      WIN32 OR ANDROID OR APPLE )
-OCV_OPTION(BUILD_PNG                "Build libpng from source"       WIN32 OR ANDROID OR APPLE )
-OCV_OPTION(BUILD_OPENEXR            "Build openexr from source"      WIN32 OR ANDROID OR APPLE )
-
+OCV_OPTION(BUILD_ZLIB               "Build zlib from source"             WIN32 OR APPLE OR CARMA )
+OCV_OPTION(BUILD_TIFF               "Build libtiff from source"          WIN32 OR ANDROID OR APPLE OR CARMA )
+OCV_OPTION(BUILD_JASPER             "Build libjasper from source"        WIN32 OR ANDROID OR APPLE OR CARMA )
+OCV_OPTION(BUILD_JPEG               "Build libjpeg from source"          WIN32 OR ANDROID OR APPLE OR CARMA )
+OCV_OPTION(BUILD_PNG                "Build libpng from source"           WIN32 OR ANDROID OR APPLE OR CARMA )
+OCV_OPTION(BUILD_OPENEXR            "Build openexr from source"          WIN32 OR ANDROID OR APPLE OR CARMA )
+OCV_OPTION(BUILD_TBB                "Download and build TBB from source" ANDROID IF CMAKE_COMPILER_IS_GNUCXX )

 # OpenCV installation options
 # ===================================================
@@ -415,10 +417,10 @@ if(WITH_OPENCL)
  if(OPENCL_FOUND)
    set(HAVE_OPENCL 1)
  endif()
-  if(WITH_OPENCLAMDFFT)
+  if(WITH_OPENCLAMDFFT AND CLAMDFFT_INCLUDE_DIR)
    set(HAVE_CLAMDFFT 1)
  endif()
-  if(WITH_OPENCLAMDBLAS)
+  if(WITH_OPENCLAMDBLAS AND CLAMDBLAS_INCLUDE_DIR)
    set(HAVE_CLAMDBLAS 1)
  endif()
 endif()
@@ -452,14 +454,16 @@ add_subdirectory(doc)
 add_subdirectory(data)

 # extra applications
-add_subdirectory(apps)
+if(BUILD_opencv_apps)
+  add_subdirectory(apps)
+endif()

 # examples
 if(BUILD_EXAMPLES OR BUILD_ANDROID_EXAMPLES OR INSTALL_PYTHON_EXAMPLES)
  add_subdirectory(samples)
 endif()

-if(BUILD_ANDROID_SERVICE)
+if(ANDROID)
  add_subdirectory(android/service)
 endif()

@@ -551,7 +555,11 @@ foreach(m ${OPENCV_MODULES_DISABLED_AUTO})
      list(APPEND __mdeps ${d})
    endif()
  endforeach()
-  list(APPEND OPENCV_MODULES_DISABLED_AUTO_ST "${m}(deps: ${__mdeps})")
+  if(__mdeps)
+    list(APPEND OPENCV_MODULES_DISABLED_AUTO_ST "${m}(deps: ${__mdeps})")
+  else()
+    list(APPEND OPENCV_MODULES_DISABLED_AUTO_ST "${m}")
+  endif()
 endforeach()
 string(REPLACE "opencv_" "" OPENCV_MODULES_DISABLED_AUTO_ST  "${OPENCV_MODULES_DISABLED_AUTO_ST}")

@@ -565,6 +573,7 @@ if(ANDROID)
  status("")
  status("  Android: ")
  status("    Android ABI:" ${ANDROID_ABI})
+  status("    STL type:" ${ANDROID_STL})
  status("    Native API level:" android-${ANDROID_NATIVE_API_LEVEL})
  status("    SDK target:" "${ANDROID_SDK_TARGET}")
  if(BUILD_WITH_ANDROID_NDK)
@@ -719,11 +728,13 @@ if(DEFINED WITH_V4L)
  endif()
  if(HAVE_CAMV4L2)
    set(HAVE_CAMV4L2_STR "YES")
+  elseif(HAVE_VIDEOIO)
+    set(HAVE_CAMV4L2_STR "YES(videoio)")
  else()
    set(HAVE_CAMV4L2_STR "NO")
  endif()
  status("    V4L/V4L2:"       HAVE_LIBV4L         THEN "Using libv4l (ver ${ALIASOF_libv4l1_VERSION})"
-                                                                                                   ELSE "${HAVE_CAMV4L_STR}/${HAVE_CAMV4L2_STR}")
+                                                   ELSE "${HAVE_CAMV4L_STR}/${HAVE_CAMV4L2_STR}")
 endif(DEFINED WITH_V4L)

 if(DEFINED WITH_VIDEOINPUT)
@@ -771,8 +782,9 @@ if(HAVE_CUDA)
  status("")
  status("  NVIDIA CUDA")

-  status("    Use CUFFT:"            HAVE_CUFFT  THEN YES ELSE NO)
-  status("    Use CUBLAS:"           HAVE_CUBLAS THEN YES ELSE NO)
+  status("    Use CUFFT:"            HAVE_CUFFT   THEN YES ELSE NO)
+  status("    Use CUBLAS:"           HAVE_CUBLAS  THEN YES ELSE NO)
+  status("    USE NVCUVID:"          HAVE_NVCUVID THEN YES ELSE NO)
  status("    NVIDIA GPU arch:"      ${OPENCV_CUDA_ARCH_BIN})
  status("    NVIDIA PTX archs:"     ${OPENCV_CUDA_ARCH_PTX})
  status("    Use fast math:"        CUDA_FAST_MATH THEN YES ELSE NO)
@@ -280,6 +280,9 @@
 #   - November 2012
 #     [+] updated for NDK r8c
 #     [+] added support for clang compiler
+#   - December 2012
+#     [~] fixed ccache full path search
+#     [+] updated for NDK r8d
 # ------------------------------------------------------------------------------

 cmake_minimum_required( VERSION 2.6.3 )
@@ -302,7 +305,7 @@ set( CMAKE_SYSTEM_VERSION 1 )
 # rpath makes low sence for Android
 set( CMAKE_SKIP_RPATH TRUE CACHE BOOL "If set, runtime paths are not added when using shared libraries." )

-set( ANDROID_SUPPORTED_NDK_VERSIONS ${ANDROID_EXTRA_NDK_VERSIONS} -r8c -r8b -r8 -r7c -r7b -r7 -r6b -r6 -r5c -r5b -r5 "" )
+set( ANDROID_SUPPORTED_NDK_VERSIONS ${ANDROID_EXTRA_NDK_VERSIONS} -r8d -r8c -r8b -r8 -r7c -r7b -r7 -r6b -r6 -r5c -r5b -r5 "" )
 if(NOT DEFINED ANDROID_NDK_SEARCH_PATHS)
 if( CMAKE_HOST_WIN32 )
  file( TO_CMAKE_PATH "$ENV{PROGRAMFILES}" ANDROID_NDK_SEARCH_PATHS )
@@ -962,7 +965,11 @@ if( BUILD_WITH_ANDROID_NDK )
  set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_NDK}/sources/cxx-stl/gabi++/include" )
  set( __libstl                 "${ANDROID_NDK}/sources/cxx-stl/gabi++/libs/${ANDROID_NDK_ABI_NAME}/libgabi++_static.a" )
 elseif( ANDROID_STL MATCHES "stlport" )
-  set( ANDROID_EXCEPTIONS       OFF )
+  if( NOT ANDROID_NDK_RELEASE STRLESS "r8d" )
+   set( ANDROID_EXCEPTIONS       ON )
+  else()
+   set( ANDROID_EXCEPTIONS       OFF )
+  endif()
  if( ANDROID_NDK_RELEASE STRLESS "r7" )
   set( ANDROID_RTTI            OFF )
  else()
@@ -974,7 +981,13 @@ if( BUILD_WITH_ANDROID_NDK )
  set( ANDROID_EXCEPTIONS       ON )
  set( ANDROID_RTTI             ON )
  if( EXISTS "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${ANDROID_COMPILER_VERSION}" )
-   set( __libstl                "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${ANDROID_COMPILER_VERSION}" )
+   if( ARMEABI_V7A AND ANDROID_COMPILER_VERSION VERSION_EQUAL "4.7" AND ANDROID_NDK_RELEASE STREQUAL "r8d" )
+    # gnustl binary for 4.7 compiler is buggy :(
+    # TODO: look for right fix
+    set( __libstl                "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/4.6" )
+   else()
+    set( __libstl                "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${ANDROID_COMPILER_VERSION}" )
+   endif()
  else()
   set( __libstl                "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++" )
  endif()
@@ -1031,6 +1044,9 @@ endif()
 # ccache support
 __INIT_VARIABLE( _ndk_ccache NDK_CCACHE ENV_NDK_CCACHE )
 if( _ndk_ccache )
+ if( DEFINED NDK_CCACHE AND NOT EXISTS NDK_CCACHE )
+  unset( NDK_CCACHE CACHE )
+ endif()
 find_program( NDK_CCACHE "${_ndk_ccache}" DOC "The path to ccache binary")
 else()
 unset( NDK_CCACHE CACHE )
@@ -1260,7 +1276,7 @@ endif()
 if( ANDROID_COMPILER_VERSION VERSION_EQUAL "4.6" )
 if( ANDROID_GOLD_LINKER AND (CMAKE_HOST_UNIX OR ANDROID_NDK_RELEASE STRGREATER "r8b") AND (ARMEABI OR ARMEABI_V7A OR X86) )
  set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -fuse-ld=gold" )
- elseif( ANDROID_NDK_RELEASE STREQUAL "r8c")
+ elseif( ANDROID_NDK_RELEASE STRGREATER "r8b")
  set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -fuse-ld=bfd" )
 elseif( ANDROID_NDK_RELEASE STREQUAL "r8b" AND ARMEABI AND NOT _CMAKE_IN_TRY_COMPILE )
  message( WARNING "The default bfd linker from arm GCC 4.6 toolchain can fail with 'unresolvable R_ARM_THM_CALL relocation' error message. See https://code.google.com/p/android/issues/detail?id=35342
@@ -1520,7 +1536,7 @@ endif()
 #   BUILD_WITH_STANDALONE_TOOLCHAIN : TRUE if standalone toolchain is used
 #   ANDROID_NDK_HOST_SYSTEM_NAME : "windows", "linux-x86" or "darwin-x86" depending on host platform
 #   ANDROID_NDK_ABI_NAME : "armeabi", "armeabi-v7a", "x86" or "mips" depending on ANDROID_ABI
-#   ANDROID_NDK_RELEASE : one of r5, r5b, r5c, r6, r6b, r7, r7b, r7c, r8, r8b, r8c; set only for NDK
+#   ANDROID_NDK_RELEASE : one of r5, r5b, r5c, r6, r6b, r7, r7b, r7c, r8, r8b, r8c, r8d; set only for NDK
 #   ANDROID_ARCH_NAME : "arm" or "x86" or "mips" depending on ANDROID_ABI
 #   ANDROID_SYSROOT : path to the compiler sysroot
 #   TOOL_OS_SUFFIX : "" or ".exe" depending on host platform
@@ -3,4 +3,4 @@ Java API
 ********


-`Java API reference external link (JavaDoc) <http://docs.opencv.org/java/>`_ 
+Java API reference (JavaDoc): external `link <http://docs.opencv.org/java/>`_.
@@ -6,8 +6,8 @@ const char* GetRevision(void);
 const char* GetLibraryList(void);
 JNIEXPORT jstring JNICALL Java_org_opencv_android_StaticHelper_getLibraryList(JNIEnv *, jclass);

-#define PACKAGE_NAME "org.opencv.lib_v" CVAUX_STR(CV_MAJOR_VERSION) CVAUX_STR(CV_MINOR_VERSION) "_" ANDROID_PACKAGE_PLATFORM
-#define PACKAGE_REVISION CVAUX_STR(CV_SUBMINOR_VERSION) "." CVAUX_STR(ANDROID_PACKAGE_RELEASE)
+#define PACKAGE_NAME "org.opencv.lib_v" CVAUX_STR(CV_VERSION_EPOCH) CVAUX_STR(CV_VERSION_MAJOR) "_" ANDROID_PACKAGE_PLATFORM
+#define PACKAGE_REVISION CVAUX_STR(CV_VERSION_MINOR) "." CVAUX_STR(ANDROID_PACKAGE_RELEASE)

 const char* GetPackageName(void)
 {
@@ -56,7 +56,7 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/${ANDROID_MANIFEST_FILE}" "${PACKAGE
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/res/values/strings.xml"   "${PACKAGE_DIR}/res/values/strings.xml"    @ONLY)
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/res/drawable/icon.png"   "${PACKAGE_DIR}/res/drawable/icon.png"   COPYONLY)

-set(target_name "OpenCV_${OPENCV_VERSION_MAJOR}.${OPENCV_VERSION_MINOR}.${OPENCV_VERSION_PATCH}_binary_pack_${ANDROID_PACKAGE_PLATFORM}")
+set(target_name "OpenCV_${OPENCV_VERSION}_binary_pack_${ANDROID_PACKAGE_PLATFORM}")
 get_target_property(opencv_java_location opencv_java LOCATION)

 set(android_proj_target_files ${ANDROID_PROJECT_FILES})
@@ -86,7 +86,7 @@ add_custom_command(
         COMMAND ${CMAKE_COMMAND} -E touch "${APK_NAME}"
         WORKING_DIRECTORY "${PACKAGE_DIR}"
         MAIN_DEPENDENCY "${PACKAGE_DIR}/${ANDROID_MANIFEST_FILE}"
-         DEPENDS "${OpenCV_BINARY_DIR}/bin/.classes.jar.dephelper" "${PACKAGE_DIR}/res/values/strings.xml" "${PACKAGE_DIR}/res/drawable/icon.png" ${camera_wrappers} opencv_java
+         DEPENDS "${OpenCV_BINARY_DIR}/bin/classes.jar.dephelper" "${PACKAGE_DIR}/res/values/strings.xml" "${PACKAGE_DIR}/res/drawable/icon.png" ${camera_wrappers} opencv_java
       )

 install(FILES "${APK_NAME}" DESTINATION "apk/" COMPONENT main)
@@ -1,2 +1,6 @@
-add_subdirectory(engine)
-#add_subdirectory(engine_test)
+if(BUILD_ANDROID_SERVICE)
+  add_subdirectory(engine)
+  #add_subdirectory(engine_test)
+endif()
+
+install(FILES "readme.txt" DESTINATION "apk/" COMPONENT main)
@@ -1,22 +0,0 @@
-***************
-Package Content
-***************
-
-The package provides new OpenCV SDK that uses OpenCV Manager for library initialization. OpenCV Manager provides the following benefits:
-
-* Less memory usage. All apps use the same binaries from service and do not keep native libs inside them self;
-* Hardware specific optimizations for all supported platforms;
-* Trusted OpenCV library source. All packages with OpenCV are published on Google Play service;
-* Regular updates and bug fixes;
- 
-Package consists from Library Project for Java development with Eclipse, C++ headers and libraries for native application development, javadoc samples and prebuilt binaries for ARM and X86 platforms.
-To try new SDK on serial device with Google Play just install sample package and follow application messages (Google Play service access will be needed).
-TO start example on device without Google Play you need to install OpenCV manager package and OpenCV binary pack for your platform from apk folder before.
-See docs/doc/tutorials/introduction/android_binary_package/android_binary_package.html and docs/android/refmain.html for details about service.
-On-line documentation will be available at address: http://docs.opencv.org/trunk
-
-********
-Contacts
-********
-
-Please send all feedback to Alexander Smorkalov mailto: alexander.smorkalov@itseez.com
@@ -1,18 +1,20 @@
 *********************************************
-Base Loader Callback Interface implementation
+Base Loader Callback Interface Implementation
 *********************************************

 .. highlight:: java
 .. class:: BaseLoaderCallback

-    Basic implementation of LoaderCallbackInterface. Logic of this implementation is well-described by the following scheme:
+    Basic implementation of ``LoaderCallbackInterface``. Logic of this implementation is
+    well-described by the following scheme:

 .. image:: img/AndroidAppUsageModel.png

 Using in Java Activity
 ----------------------

-There is a very base code snippet implementing the async initialization with BaseLoaderCallback. See the "15-puzzle" OpenCV sample for details.
+There is a very base code snippet implementing the async initialization with ``BaseLoaderCallback``.
+See the "15-puzzle" OpenCV sample for details.

 .. code-block:: java
    :linenos:
@@ -42,7 +44,7 @@ There is a very base code snippet implementing the async initialization with Bas
    @Override
    protected void onResume()
    {
-        Log.i(TAG, "called onResume");
+        Log.i(TAG, "Called onResume");
        super.onResume();

        Log.i(TAG, "Trying to load OpenCV library");
@@ -55,6 +57,7 @@ There is a very base code snippet implementing the async initialization with Bas
 Using in Service
 ----------------

-Default BaseLoaderCallback implementation treat application context as Activity and calls Activity.finish() method to exit in case of initialization failure.
-To override this behavior you need to override finish() method of BaseLoaderCallback class and implement your own finalization method.
-
+Default ``BaseLoaderCallback`` implementation treats application context as ``Activity`` and calls
+``Activity.finish()`` method to exit in case of initialization failure.
+To override this behavior you need to override ``finish()`` method of ``BaseLoaderCallback`` class
+and implement your own finalization method.
@@ -28,7 +28,7 @@ void cancel()

 .. method:: void cancel()

-    Installation if package has been canceled.
+    Installation of package has been cancelled.

 void wait_install()
 -------------------
@@ -7,34 +7,38 @@ Introduction

 .. highlight:: java

-OpenCV Manager is an Android service targeted to manage OpenCV library binaries on end users devices. It allows sharing the OpenCV dynamic libraries of different versions between applications on the same device. The Manager provides the following benefits\:
+OpenCV Manager is an Android service targeted to manage OpenCV library binaries on end users devices.
+It allows sharing the OpenCV dynamic libraries between applications on the same device. The Manager
+provides the following benefits\:

 #. Less memory usage. All apps use the same binaries from service and do not keep native libs inside themselves;
 #. Hardware specific optimizations for all supported platforms;
-#. Trusted OpenCV library source. All packages with OpenCV are published on Google Play service;
+#. Trusted OpenCV library source. All packages with OpenCV are published on Google Play market;
 #. Regular updates and bug fixes;

-Usage model for target user
---------------------------
+Usage model for end user
+------------------------

 .. image:: img/AndroidAppUsageModel.png

 First OpenCV app\:

 #. Any OpenCV-dependent app is installed from Google Play marketplace or manually;
-#. At the first launch, it suggests installing OpenCV Manager;
-#. Then OpenCV Manager is downloaded and installed, using Google Play marketplace service.
-#. When Manager has ben started, the application suggests installing OpenCV library for the target device trough Google Play marketplace if it is necessary;
-#. After installation is finished, the app may be launched to perform common tasks.
+#. At the first launch, it suggests installation of OpenCV Manager;
+#. Then OpenCV Manager is downloaded and installed, using the Google Play application.
+#. When Manager has been started, the application suggests installation of OpenCV library for the
+   target device architecture if it is necessary;
+#. After the installation is finished, the app may be launched.

-Next OpenCV app\:
+Subsequent launches of OpenCV apps\:

-#. Any OpenCV-dependent app is installed from Google Play marketplace or manually;
+#. Any OpenCV-dependent app is installed from Google Play market or manually;
 #. At the first launch, the app starts as usually;
-#. If the selected version is not installed, OpenCV Manager suggests installing OpenCV library for the target device trough Google Play marketplace;
-#. After installation is finished, the app may be launched to perform common tasks.
+#. If the selected OpenCV version is not installed, OpenCV Manager suggests installing OpenCV
+   library for the target device through Google Play marketplace;
+#. After the installation is finished, the app may be launched.

-OpenCV Manager structure
------------------------
+Architecture of OpenCV Manager
+------------------------------

 .. image:: img/Structure.png
@@ -12,23 +12,27 @@ boolean initDebug()

 .. method:: static boolean initDebug()

-    Loads and initializes OpenCV library from within current application package. Roughly it is analog of ``system.loadLibrary("opencv_java")``.
+    Loads and initializes OpenCV library from within current application package. Roughly it is
+    analog of ``system.loadLibrary("opencv_java")``.

    :rtype: boolean;
    :return: returns true if initialization of OpenCV was successful.

-.. note:: This method is deprecated for production code. It is designed for experimantal and local development purposes only. If you want to publish your app use approach with async initialization.
+.. note:: This method is deprecated for production code. It is designed for experimental and local
+          development purposes only. If you want to publish your app use approach with async
+          initialization.

 boolean initAsync()
 -------------------

 .. method:: static boolean initAsync(String Version, Context AppContext, LoaderCallbackInterface Callback)

-    Loads and initializes OpenCV library using OpenCV Manager service.
+    Loads and initializes OpenCV library using OpenCV Manager.

    :param Version: OpenCV Library version.
    :param AppContext: application context for connecting to the service.
-    :param Callback: object, that implements LoaderCallbackInterface for handling connection status (see BaseLoaderCallback).
+    :param Callback: object, that implements ``LoaderCallbackInterface`` for handling connection
+                     status (see ``BaseLoaderCallback``).

    :rtype: boolean;
    :return: returns true if initialization of OpenCV starts successfully.
@@ -43,10 +47,3 @@ OpenCV version constants
 .. data:: OPENCV_VERSION_2_4_3

    OpenCV Library version 2.4.3
-
-Other constatnts
----------------
-
-.. data:: OPEN_CV_SERVICE_URL
-
-    Url for OpenCV Manager on Google Play (Android Market)
@@ -12,9 +12,9 @@ void onManagerConnected()

 .. method:: void onManagerConnected(int status)

-    Callback method that is called after OpenCV Library initialization.
+    Callback method that is called after OpenCV library initialization.

-    :param status: status of initialization (see Initialization Status Constants).
+    :param status: status of initialization (see "Initialization Status Constants" section below).

 void onPackageInstall()
 -----------------------
@@ -23,7 +23,7 @@ void onPackageInstall()

    Callback method that is called in case when package installation is needed.

-    :param callback: answer object with approve and cancel methods and package description.
+    :param callback: answer object with ``install`` and ``cancel`` methods and package description.

 Initialization status constants
 -------------------------------
@@ -34,15 +34,15 @@ Initialization status constants

 .. data:: MARKET_ERROR

-    Google Play (Android Market) cannot be invoked
+    Google Play (Android Market) application cannot be invoked

 .. data:: INSTALL_CANCELED

-    OpenCV library installation was canceled by user
+    OpenCV library installation was cancelled by user

 .. data:: INCOMPATIBLE_MANAGER_VERSION

-    Version of OpenCV Manager Service is incompatible with this app. Service update is needed
+    Version of OpenCV Manager is incompatible with this app. Manager update is needed.

 .. data:: INIT_FAILED

@@ -1,6 +1,9 @@
-*******************************************
 Manager Workflow
-*******************************************
+****************
+
+.. _manager_selection:
+
+.. include:: ../readme.txt

 First application start
 -----------------------
@@ -9,15 +12,15 @@ There is no OpenCV Manager or OpenCV libraries:

 .. image:: img/NoService.png

-Aditional library package installation
--------------------------------------
+Additional library package installation
+---------------------------------------

-There is an OpenCV Manager service, but there is no apropriate OpenCV library.
+There is an OpenCV Manager service, but it does not contain appropriate OpenCV library.
 If OpenCV library installation has been approved\:

 .. image:: img/LibInstallAproved.png

-If OpenCV library installation has been canceled\:
+If OpenCV library installation has been cancelled\:

 .. image:: img/LibInstallCanceled.png

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="org.opencv.engine"
-    android:versionCode="23@ANDROID_PLATFORM_VERSION_CODE@"
-    android:versionName="2.3" >
+    android:versionCode="25@ANDROID_PLATFORM_VERSION_CODE@"
+    android:versionName="2.5" >

    <uses-sdk android:minSdkVersion="@ANDROID_NATIVE_API_LEVEL@" />
    <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
@@ -2,7 +2,7 @@ set(engine OpenCVEngine)
 set(JNI_LIB_NAME ${engine} ${engine}_jni)

 unset(__android_project_chain CACHE)
-add_android_project(opencv_engine "${CMAKE_CURRENT_SOURCE_DIR}" SDK_TARGET 8 ${ANDROID_SDK_TARGET} IGNORE_JAVA ON IGNORE_MANIFEST ON )
+add_android_project(opencv_engine "${CMAKE_CURRENT_SOURCE_DIR}" SDK_TARGET 9 ${ANDROID_SDK_TARGET} IGNORE_JAVA ON IGNORE_MANIFEST ON )

 set(ANDROID_PLATFORM_VERSION_CODE "0")

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="ManagerActivity" default="help">
+<project name="OpenCV Manager" default="help">

    <!-- The local.properties file is created and updated by the 'android' tool.
         It contains the path to the SDK. It should *NOT* be checked into
@@ -52,7 +52,8 @@ LOCAL_SRC_FILES := \
    NativeService/CommonPackageManager.cpp \
    JNIWrapper/JavaBasedPackageManager.cpp \
    NativeService/PackageInfo.cpp \
-    JNIWrapper/HardwareDetector_jni.cpp
+    JNIWrapper/HardwareDetector_jni.cpp \
+    JNIWrapper/OpenCVLibraryInfo.cpp

 LOCAL_C_INCLUDES := \
    $(LOCAL_PATH)/include \
@@ -15,60 +15,44 @@ using namespace android;

 const int OpenCVEngine::Platform = DetectKnownPlatforms();
 const int OpenCVEngine::CpuID = GetCpuID();
+const int OpenCVEngine::KnownVersions[] = {2040000, 2040100, 2040200, 2040300, 2040301, 2040302};

-std::set<std::string> OpenCVEngine::InitKnownOpenCVersions()
+bool OpenCVEngine::ValidateVersion(int version)
 {
-    std::set<std::string> result;
+    for (size_t i = 0; i < sizeof(KnownVersions)/sizeof(int); i++)
+        if (KnownVersions[i] == version)
+            return true;

-    result.insert("240");
-    result.insert("241");
-    result.insert("242");
-    result.insert("243");
-
-    return result;
+    return false;
 }

-const std::set<std::string> OpenCVEngine::KnownVersions = InitKnownOpenCVersions();
-
-bool OpenCVEngine::ValidateVersionString(const std::string& version)
+int OpenCVEngine::NormalizeVersionString(std::string version)
 {
-    return (KnownVersions.find(version) != KnownVersions.end());
-}
-
-std::string OpenCVEngine::NormalizeVersionString(std::string version)
-{
-    std::string result = "";
-    std::string suffix = "";
+    int result = 0;

    if (version.empty())
    {
        return result;
    }

-    if (('a' == version[version.size()-1]) || ('b' == version[version.size()-1]))
-    {
-        suffix = version[version.size()-1];
-        version.erase(version.size()-1);
-    }
-
    std::vector<std::string> parts = SplitStringVector(version, '.');

-    if (parts.size() >= 2)
+    // Use only 4 digits of the version, i.e. 1.2.3.4.
+    // Other digits will be ignored.
+    if (parts.size() > 4)
+        parts.erase(parts.begin()+4, parts.end());
+
+    int multiplyer = 1000000;
+    for (std::vector<std::string>::const_iterator it = parts.begin(); it != parts.end(); ++it)
    {
-        if (parts.size() >= 3)
-        {
-            result = parts[0] + parts[1] + parts[2] + suffix;
-            if (!ValidateVersionString(result))
-                result = "";
-        }
-        else
-        {
-            result = parts[0] + parts[1] + "0" + suffix;
-            if (!ValidateVersionString(result))
-                result = "";
-        }
+        int digit = atoi(it->c_str());
+        result += multiplyer*digit;
+        multiplyer /= 100;
    }

+    if (!ValidateVersion(result))
+        result  = 0;
+
    return result;
 }

@@ -86,19 +70,19 @@ int32_t OpenCVEngine::GetVersion()
 String16 OpenCVEngine::GetLibPathByVersion(android::String16 version)
 {
    std::string std_version(String8(version).string());
-    std::string norm_version;
+    int norm_version;
    std::string path;

    LOGD("OpenCVEngine::GetLibPathByVersion(%s) impl", String8(version).string());

    norm_version = NormalizeVersionString(std_version);

-    if (!norm_version.empty())
+    if (0 != norm_version)
    {
        path = PackageManager->GetPackagePathByVersion(norm_version, Platform, CpuID);
        if (path.empty())
        {
-            LOGI("Package OpenCV of version %s is not installed. Try to install it :)", norm_version.c_str());
+            LOGI("Package OpenCV of version \"%s\" (%d) is not installed. Try to install it :)", String8(version).string(), norm_version);
        }
        else
        {
@@ -107,7 +91,7 @@ String16 OpenCVEngine::GetLibPathByVersion(android::String16 version)
    }
    else
    {
-        LOGE("OpenCV version \"%s\" (%s) is not supported", String8(version).string(), norm_version.c_str());
+        LOGE("OpenCV version \"%s\" (%d) is not supported", String8(version).string(), norm_version);
    }

    return String16(path.c_str());
@@ -116,11 +100,11 @@ String16 OpenCVEngine::GetLibPathByVersion(android::String16 version)
 android::String16 OpenCVEngine::GetLibraryList(android::String16 version)
 {
    std::string std_version = String8(version).string();
-    std::string norm_version;
+    int norm_version;
    String16 result;
    norm_version = NormalizeVersionString(std_version);

-    if (!norm_version.empty())
+    if (0 != norm_version)
    {
        std::string tmp = PackageManager->GetPackagePathByVersion(norm_version, Platform, CpuID);
        if (!tmp.empty())
@@ -130,7 +114,7 @@ android::String16 OpenCVEngine::GetLibraryList(android::String16 version)
            LOGD("Trying to load info library \"%s\"", tmp.c_str());

            void* handle;
-            const char* (*info_func)();
+            InfoFunctionType info_func;

            handle = dlopen(tmp.c_str(), RTLD_LAZY);
            if (handle)
@@ -138,7 +122,7 @@ android::String16 OpenCVEngine::GetLibraryList(android::String16 version)
                const char* error;

                dlerror();
-                *(void **) (&info_func) = dlsym(handle, "GetLibraryList");
+                info_func = (InfoFunctionType)dlsym(handle, "GetLibraryList");
                if ((error = dlerror()) == NULL)
                {
                    result = String16((*info_func)());
@@ -156,12 +140,12 @@ android::String16 OpenCVEngine::GetLibraryList(android::String16 version)
        }
        else
        {
-            LOGI("Package OpenCV of version %s is not installed. Try to install it :)", norm_version.c_str());
+            LOGI("Package OpenCV of version \"%s\" (%d) is not installed. Try to install it :)", std_version.c_str(), norm_version);
        }
    }
    else
    {
-        LOGE("OpenCV version \"%s\" is not supported", norm_version.c_str());
+        LOGE("OpenCV version \"%s\" is not supported", std_version.c_str());
    }

    return result;
@@ -170,21 +154,21 @@ android::String16 OpenCVEngine::GetLibraryList(android::String16 version)
 bool OpenCVEngine::InstallVersion(android::String16 version)
 {
    std::string std_version = String8(version).string();
-    std::string norm_version;
+    int norm_version;
    bool result = false;

    LOGD("OpenCVEngine::InstallVersion() begin");

    norm_version = NormalizeVersionString(std_version);

-    if (!norm_version.empty())
+    if (0 != norm_version)
    {
        LOGD("PackageManager->InstallVersion call");
        result = PackageManager->InstallVersion(norm_version, Platform, CpuID);
    }
    else
    {
-        LOGE("OpenCV version \"%s\" is not supported", norm_version.c_str());
+        LOGE("OpenCV version \"%s\" (%d) is not supported", std_version.c_str(), norm_version);
    }

    LOGD("OpenCVEngine::InstallVersion() end");
@@ -23,16 +23,15 @@ public:

 protected:
    IPackageManager* PackageManager;
-    static const std::set<std::string> KnownVersions;
+    static const int KnownVersions[];

    OpenCVEngine();
-    static std::set<std::string> InitKnownOpenCVersions();
-    bool ValidateVersionString(const std::string& version);
-    std::string NormalizeVersionString(std::string version);
+    bool ValidateVersion(int version);
+    int NormalizeVersionString(std::string version);
    bool FixPermissions(const std::string& path);

    static const int Platform;
    static const int CpuID;
 };

-#endif
+#endif
@@ -46,7 +46,9 @@ bool JavaBasedPackageManager::InstallPackage(const PackageInfo& package)
    LOGD("Calling java package manager with package name %s\n", package.GetFullName().c_str());
    jobject jpkgname = jenv->NewStringUTF(package.GetFullName().c_str());
    bool result = jenv->CallNonvirtualBooleanMethod(JavaPackageManager, jclazz, jmethod, jpkgname);
+
    jenv->DeleteLocalRef(jpkgname);
+    jenv->DeleteLocalRef(jclazz);

    if (self_attached)
    {
@@ -104,9 +106,12 @@ vector<PackageInfo> JavaBasedPackageManager::GetInstalledPackages()

        if (tmp.IsValid())
            result.push_back(tmp);
+
+        jenv->DeleteLocalRef(jtmp);
    }

    jenv->DeleteLocalRef(jpkgs);
+    jenv->DeleteLocalRef(jclazz);

    if (self_attached)
    {
@@ -118,6 +123,16 @@ vector<PackageInfo> JavaBasedPackageManager::GetInstalledPackages()
    return result;
 }

+static jint GetAndroidVersion(JNIEnv* jenv)
+{
+    jclass jclazz = jenv->FindClass("android/os/Build$VERSION");
+    jfieldID jfield = jenv->GetStaticFieldID(jclazz, "SDK_INT", "I");
+    jint api_level = jenv->GetStaticIntField(jclazz, jfield);
+    jenv->DeleteLocalRef(jclazz);
+
+    return api_level;
+}
+
 // IMPORTANT: This method can be called only if thread is attached to Dalvik
 PackageInfo JavaBasedPackageManager::ConvertPackageFromJava(jobject package, JNIEnv* jenv)
 {
@@ -133,23 +148,27 @@ PackageInfo JavaBasedPackageManager::ConvertPackageFromJava(jobject package, JNI
    const char* jversionstr = jenv->GetStringUTFChars(jversionobj, NULL);
    string verison(jversionstr);
    jenv->DeleteLocalRef(jversionobj);
+    jenv->DeleteLocalRef(jclazz);

+    static const jint api_level = GetAndroidVersion(jenv);
    string path;
-    jclazz = jenv->FindClass("android/os/Build$VERSION");
-    jfield = jenv->GetStaticFieldID(jclazz, "SDK_INT", "I");
-    jint api_level = jenv->GetStaticIntField(jclazz, jfield);
    if (api_level > 8)
    {
        jclazz = jenv->GetObjectClass(package);
        jfield = jenv->GetFieldID(jclazz, "applicationInfo", "Landroid/content/pm/ApplicationInfo;");
        jobject japp_info = jenv->GetObjectField(package, jfield);
+        jenv->DeleteLocalRef(jclazz);
+
        jclazz = jenv->GetObjectClass(japp_info);
        jfield = jenv->GetFieldID(jclazz, "nativeLibraryDir", "Ljava/lang/String;");
        jstring jpathobj = static_cast<jstring>(jenv->GetObjectField(japp_info, jfield));
        const char* jpathstr = jenv->GetStringUTFChars(jpathobj, NULL);
        path = string(jpathstr);
        jenv->ReleaseStringUTFChars(jpathobj, jpathstr);
+
+        jenv->DeleteLocalRef(japp_info);
        jenv->DeleteLocalRef(jpathobj);
+        jenv->DeleteLocalRef(jclazz);
    }
    else
    {
@@ -19,4 +19,4 @@ private:

    JavaBasedPackageManager();
    PackageInfo ConvertPackageFromJava(jobject package, JNIEnv* jenv);
-};
+};
@@ -0,0 +1,88 @@
+#include "OpenCVLibraryInfo.h"
+#include "EngineCommon.h"
+#include <utils/Log.h>
+#include <dlfcn.h>
+
+JNIEXPORT jlong JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_open
+  (JNIEnv * env, jobject, jstring str)
+{
+    const char* infoLibPath = env->GetStringUTFChars(str, NULL);
+    if (infoLibPath == NULL)
+        return 0;
+
+    LOGD("Trying to load info library \"%s\"", infoLibPath);
+
+    void* handle;
+
+    handle = dlopen(infoLibPath, RTLD_LAZY);
+    if (handle == NULL)
+        LOGI("Info library not found by path \"%s\"", infoLibPath);
+
+    return (jlong)handle;
+}
+
+JNIEXPORT jstring JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_getPackageName
+  (JNIEnv* env, jobject, jlong handle)
+{
+    InfoFunctionType info_func;
+    const char* result;
+    const char* error;
+
+    dlerror();
+    info_func = (InfoFunctionType)dlsym((void*)handle, "GetPackageName");
+    if ((error = dlerror()) == NULL)
+        result = (*info_func)();
+    else
+    {
+        LOGE("dlsym error: \"%s\"", error);
+        result = "unknown";
+    }
+
+    return env->NewStringUTF(result);
+}
+
+JNIEXPORT jstring JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_getLibraryList
+  (JNIEnv* env, jobject, jlong handle)
+{
+    InfoFunctionType info_func;
+    const char* result;
+    const char* error;
+
+    dlerror();
+    info_func = (InfoFunctionType)dlsym((void*)handle, "GetLibraryList");
+    if ((error = dlerror()) == NULL)
+        result = (*info_func)();
+    else
+    {
+        LOGE("dlsym error: \"%s\"", error);
+        result = "unknown";
+    }
+
+    return env->NewStringUTF(result);
+}
+
+JNIEXPORT jstring JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_getVersionName
+  (JNIEnv* env, jobject, jlong handle)
+{
+    InfoFunctionType info_func;
+    const char* result;
+    const char* error;
+
+    dlerror();
+    info_func = (InfoFunctionType)dlsym((void*)handle, "GetRevision");
+    if ((error = dlerror()) == NULL)
+        result = (*info_func)();
+    else
+    {
+        LOGE("dlsym error: \"%s\"", error);
+        result = "unknown";
+    }
+
+    return env->NewStringUTF(result);
+}
+
+JNIEXPORT void JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_close
+  (JNIEnv*, jobject, jlong handle)
+{
+    dlclose((void*)handle);
+}
@@ -0,0 +1,27 @@
+#include <jni.h>
+
+#ifndef _Included_org_opencv_engine_OpenCVLibraryInfo
+#define _Included_org_opencv_engine_OpenCVLibraryInfo
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+JNIEXPORT jlong JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_open
+  (JNIEnv *, jobject, jstring);
+
+JNIEXPORT jstring JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_getPackageName
+  (JNIEnv *, jobject, jlong);
+
+JNIEXPORT jstring JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_getLibraryList
+  (JNIEnv *, jobject, jlong);
+
+JNIEXPORT jstring JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_getVersionName
+  (JNIEnv *, jobject, jlong);
+
+JNIEXPORT void JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_close
+  (JNIEnv *, jobject, jlong);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
@@ -11,22 +11,24 @@

 using namespace std;

-set<string> CommonPackageManager::GetInstalledVersions()
+vector<int> CommonPackageManager::GetInstalledVersions()
 {
-    set<string> result;
+    vector<int> result;
    vector<PackageInfo> installed_packages = GetInstalledPackages();

-    for (vector<PackageInfo>::const_iterator it = installed_packages.begin(); it != installed_packages.end(); ++it)
+    result.resize(installed_packages.size());
+
+    for (size_t i = 0; i < installed_packages.size(); i++)
    {
-        string version = it->GetVersion();
-        assert(!version.empty());
-        result.insert(version);
+        int version = installed_packages[i].GetVersion();
+        assert(version);
+        result[i] = version;
    }

    return result;
 }

-bool CommonPackageManager::CheckVersionInstalled(const std::string& version, int platform, int cpu_id)
+bool CommonPackageManager::CheckVersionInstalled(int version, int platform, int cpu_id)
 {
    bool result = false;
    LOGD("CommonPackageManager::CheckVersionInstalled() begin");
@@ -48,14 +50,14 @@ bool CommonPackageManager::CheckVersionInstalled(const std::string& version, int
    return result;
 }

-bool CommonPackageManager::InstallVersion(const std::string& version, int platform, int cpu_id)
+bool CommonPackageManager::InstallVersion(int version, int platform, int cpu_id)
 {
    LOGD("CommonPackageManager::InstallVersion() begin");
    PackageInfo package(version, platform, cpu_id);
    return InstallPackage(package);
 }

-string CommonPackageManager::GetPackagePathByVersion(const std::string& version, int platform, int cpu_id)
+string CommonPackageManager::GetPackagePathByVersion(int version, int platform, int cpu_id)
 {
    string result;
    PackageInfo target_package(version, platform, cpu_id);
@@ -64,7 +66,7 @@ string CommonPackageManager::GetPackagePathByVersion(const std::string& version,

    for (vector<PackageInfo>::iterator it = all_packages.begin(); it != all_packages.end(); ++it)
    {
-        LOGD("Check version \"%s\" compatibility with \"%s\"\n", version.c_str(), it->GetVersion().c_str());
+        LOGD("Check version \"%d\" compatibility with \"%d\"\n", version, it->GetVersion());
        if (IsVersionCompatible(version, it->GetVersion()))
        {
            LOGD("Compatible");
@@ -78,49 +80,45 @@ string CommonPackageManager::GetPackagePathByVersion(const std::string& version,

    if (!packages.empty())
    {
-        vector<PackageInfo>::iterator found = find(packages.begin(), packages.end(), target_package);
-        if (packages.end() != found)
+        int OptRating = -1;
+        int OptVersion = 0;
+        std::vector<std::pair<int, int> >& group = CommonPackageManager::ArmRating;
+
+        if ((cpu_id & ARCH_X86) || (cpu_id & ARCH_X64))
+            group = CommonPackageManager::IntelRating;
+
+        int HardwareRating = GetHardwareRating(platform, cpu_id, group);
+        LOGD("Current hardware platform rating %d for (%d,%d)", HardwareRating, platform, cpu_id);
+
+        if (-1 == HardwareRating)
        {
-            result = found->GetInstalationPath();
+            LOGE("Cannot calculate rating for current hardware platform!");
        }
        else
        {
-            int OptRating = -1;
-            std::vector<std::pair<int, int> >& group = CommonPackageManager::ArmRating;
-
-            if ((cpu_id & ARCH_X86) || (cpu_id & ARCH_X64))
-                group = CommonPackageManager::IntelRating;
-
-            int HardwareRating = GetHardwareRating(platform, cpu_id, group);
-            LOGD("Current hardware platform %d, %d", platform, cpu_id);
-
-            if (-1 == HardwareRating)
+            vector<PackageInfo>::iterator found = packages.end();
+            for (vector<PackageInfo>::iterator it = packages.begin(); it != packages.end(); ++it)
            {
-                LOGE("Cannot calculate rating for current hardware platform!");
+                int PackageRating = GetHardwareRating(it->GetPlatform(), it->GetCpuID(), group);
+                LOGD("Package \"%s\" rating %d for (%d,%d)", it->GetFullName().c_str(), PackageRating, it->GetPlatform(), it->GetCpuID());
+                if ((PackageRating >= 0) && (PackageRating <= HardwareRating))
+                {
+                    if (((it->GetVersion() >= OptVersion) && (PackageRating >= OptRating)) || (it->GetVersion() > OptVersion))
+                    {
+                        OptRating = PackageRating;
+                        OptVersion = it->GetVersion();
+                        found = it;
+                    }
+                }
+            }
+
+            if ((-1 != OptRating) && (packages.end() != found))
+            {
+                result = found->GetInstalationPath();
            }
            else
            {
-                for (vector<PackageInfo>::iterator it = packages.begin(); it != packages.end(); ++it)
-                {
-                    int PackageRating = GetHardwareRating(it->GetPlatform(), it->GetCpuID(), group);
-                    if (PackageRating >= 0)
-                    {
-                        if ((PackageRating <= HardwareRating) && (PackageRating > OptRating))
-                        {
-                            OptRating = PackageRating;
-                            found = it;
-                        }
-                    }
-                }
-
-                if ((-1 != OptRating) && (packages.end() != found))
-                {
-                    result = found->GetInstalationPath();
-                }
-                else
-                {
-                    LOGI("Found package is incompatible with current hardware platform");
-                }
+                LOGI("Found package is incompatible with current hardware platform");
            }
        }
    }
@@ -128,33 +126,34 @@ string CommonPackageManager::GetPackagePathByVersion(const std::string& version,
    return result;
 }

-bool CommonPackageManager::IsVersionCompatible(const std::string& target_version, const std::string& package_version)
+bool CommonPackageManager::IsVersionCompatible(int target_version, int package_version)
 {
-    assert (target_version.size() == 3);
-    assert (package_version.size() == 3);
-
-    bool result = false;
+    assert(target_version);
+    assert(package_version);

    // major version is the same and minor package version is above or the same as target.
-    if ((package_version[0] == target_version[0]) && (package_version[1] == target_version[1]) && (package_version[2] >= target_version[2]))
-    {
-    result = true;
-    }
-
-    return result;
+    return ( (package_version/10000 == target_version/10000) && (package_version%10000 >= target_version%10000) );
 }

 int CommonPackageManager::GetHardwareRating(int platform, int cpu_id, const std::vector<std::pair<int, int> >& group)
 {
    int result = -1;

-    for (size_t i = 0; i < group.size(); i++)
+    if ((cpu_id & ARCH_X86) || (cpu_id & ARCH_X64) || (cpu_id & ARCH_MIPS))
+        // Note: No raiting for x86, x64 and MIPS
+        // only one package is used
+        result = 0;
+    else
    {
-    if (group[i] == std::pair<int, int>(platform, cpu_id))
-    {
-        result = i;
-        break;
-    }
+        // Calculate rating for Arm
+        for (size_t i = 0; i < group.size(); i++)
+        {
+            if (group[i] == std::pair<int, int>(platform, cpu_id))
+            {
+                result = i;
+                break;
+            }
+        }
    }

    return result;
@@ -171,14 +170,14 @@ std::vector<std::pair<int, int> > CommonPackageManager::InitArmRating()
    result.push_back(std::pair<int, int>(PLATFORM_UNKNOWN, ARCH_ARMv6 | FEATURES_HAS_VFPv3 | FEATURES_HAS_VFPv3d16));
    result.push_back(std::pair<int, int>(PLATFORM_UNKNOWN, ARCH_ARMv7));
    result.push_back(std::pair<int, int>(PLATFORM_UNKNOWN, ARCH_ARMv7 | FEATURES_HAS_VFPv3d16));
+    result.push_back(std::pair<int, int>(PLATFORM_TEGRA2,  ARCH_ARMv7 | FEATURES_HAS_VFPv3d16));
    result.push_back(std::pair<int, int>(PLATFORM_UNKNOWN, ARCH_ARMv7 | FEATURES_HAS_VFPv3));
    result.push_back(std::pair<int, int>(PLATFORM_UNKNOWN, ARCH_ARMv7 | FEATURES_HAS_VFPv3d16 | FEATURES_HAS_VFPv3));
    result.push_back(std::pair<int, int>(PLATFORM_UNKNOWN, ARCH_ARMv7 | FEATURES_HAS_NEON));
    result.push_back(std::pair<int, int>(PLATFORM_UNKNOWN, ARCH_ARMv7 | FEATURES_HAS_VFPv3d16 | FEATURES_HAS_NEON));
    result.push_back(std::pair<int, int>(PLATFORM_UNKNOWN, ARCH_ARMv7 | FEATURES_HAS_VFPv3 | FEATURES_HAS_NEON));
    result.push_back(std::pair<int, int>(PLATFORM_UNKNOWN, ARCH_ARMv7 | FEATURES_HAS_VFPv3 | FEATURES_HAS_VFPv3d16 | FEATURES_HAS_NEON));
-    result.push_back(std::pair<int, int>(PLATFORM_TEGRA2, ARCH_ARMv7 | FEATURES_HAS_VFPv3d16));
-    result.push_back(std::pair<int, int>(PLATFORM_TEGRA3, ARCH_ARMv7 | FEATURES_HAS_VFPv3 | FEATURES_HAS_NEON));
+    result.push_back(std::pair<int, int>(PLATFORM_TEGRA3,  ARCH_ARMv7 | FEATURES_HAS_VFPv3 | FEATURES_HAS_NEON));

    return result;
 }
@@ -3,17 +3,16 @@

 #include "IPackageManager.h"
 #include "PackageInfo.h"
-#include <set>
 #include <vector>
 #include <string>

 class CommonPackageManager: public IPackageManager
 {
 public:
-    std::set<std::string> GetInstalledVersions();
-    bool CheckVersionInstalled(const std::string& version, int platform, int cpu_id);
-    bool InstallVersion(const std::string& version, int platform, int cpu_id);
-    std::string GetPackagePathByVersion(const std::string& version, int platform, int cpu_id);
+    std::vector<int> GetInstalledVersions();
+    bool CheckVersionInstalled(int version, int platform, int cpu_id);
+    bool InstallVersion(int version, int platform, int cpu_id);
+    std::string GetPackagePathByVersion(int version, int platform, int cpu_id);
    virtual ~CommonPackageManager();

 protected:
@@ -23,7 +22,7 @@ protected:
    static std::vector<std::pair<int, int> > InitArmRating();
    static std::vector<std::pair<int, int> > InitIntelRating();

-    bool IsVersionCompatible(const std::string& target_version, const std::string& package_version);
+    bool IsVersionCompatible(int target_version, int package_version);
    int GetHardwareRating(int platform, int cpu_id, const std::vector<std::pair<int, int> >& group);

    virtual bool InstallPackage(const PackageInfo& package) = 0;
@@ -31,4 +30,4 @@ protected:
 };


-#endif
+#endif
@@ -124,14 +124,19 @@ inline int SplitIntelFeatures(const vector<string>& features)
    return result;
 }

-inline string SplitVersion(const vector<string>& features, const string& package_version)
+inline int SplitVersion(const vector<string>& features, const string& package_version)
 {
-    string result;
+    int result = 0;

    if ((features.size() > 1) && ('v' == features[1][0]))
    {
-        result = features[1].substr(1);
-        result += SplitStringVector(package_version, '.')[0];
+        // Taking major and minor mart of library version from package name
+        string tmp1 = features[1].substr(1);
+        result += atoi(tmp1.substr(0,1).c_str())*1000000 + atoi(tmp1.substr(1,1).c_str())*10000;
+
+        // Taking release and build number from package revision
+        vector<string> tmp2 = SplitStringVector(package_version, '.');
+        result += atoi(tmp2[0].c_str())*100 + atoi(tmp2[1].c_str());
    }
    else
    {
@@ -186,9 +191,9 @@ inline int SplitPlatfrom(const vector<string>& features)
 * Second part is version. Version starts from "v" symbol. After "v" symbol version nomber without dot symbol added.
 * If platform is known third part is platform name
 * If platform is unknown it is defined by hardware capabilities using pattern: <arch>_<floating point and vectorization features>_<other features>
- * Example: armv7_neon, armv5_vfpv3
+ * Example: armv7_neon
 */
-PackageInfo::PackageInfo(const string& version, int platform, int cpu_id, std::string install_path):
+PackageInfo::PackageInfo(int version, int platform, int cpu_id, std::string install_path):
 Version(version),
 Platform(platform),
 CpuID(cpu_id),
@@ -197,7 +202,15 @@ InstallPath("")
    #ifndef __SUPPORT_TEGRA3
    Platform = PLATFORM_UNKNOWN;
    #endif
-    FullName = BasePackageName + "_v" + Version.substr(0, Version.size()-1);
+
+    int major_version = version/1000000;
+    int minor_version = version/10000 - major_version*100;
+
+    char tmp[32];
+
+    sprintf(tmp, "%d%d", major_version, minor_version);
+
+    FullName = BasePackageName + std::string("_v") + std::string(tmp);
    if (PLATFORM_UNKNOWN != Platform)
    {
        FullName += string("_") + JoinPlatform(platform);
@@ -295,7 +308,7 @@ InstallPath("")
            else
            {
                LOGD("PackageInfo::PackageInfo: package arch unknown");
-                Version.clear();
+                Version = 0;
                CpuID = ARCH_UNKNOWN;
                Platform = PLATFORM_UNKNOWN;
            }
@@ -303,7 +316,7 @@ InstallPath("")
        else
        {
            LOGD("PackageInfo::PackageInfo: package arch unknown");
-            Version.clear();
+            Version = 0;
            CpuID = ARCH_UNKNOWN;
            Platform = PLATFORM_UNKNOWN;
        }
@@ -341,8 +354,8 @@ InstallPath(install_path)
        LOGD("Trying to load info library \"%s\"", tmp.c_str());

            void* handle;
-            const char* (*name_func)();
-            const char* (*revision_func)();
+            InfoFunctionType name_func;
+            InfoFunctionType revision_func;

            handle = dlopen(tmp.c_str(), RTLD_LAZY);
            if (handle)
@@ -350,8 +363,8 @@ InstallPath(install_path)
                const char* error;

                dlerror();
-                *(void **) (&name_func) = dlsym(handle, "GetPackageName");
-                *(void **) (&revision_func) = dlsym(handle, "GetRevision");
+                name_func = (InfoFunctionType)dlsym(handle, "GetPackageName");
+                revision_func = (InfoFunctionType)dlsym(handle, "GetRevision");
                error = dlerror();

                if (!error && revision_func && name_func)
@@ -370,7 +383,7 @@ InstallPath(install_path)
            {
                LOGI("Info library not found in package");
                LOGI("OpenCV Manager package does not contain any verison of OpenCV library");
-                Version.clear();
+                Version = 0;
                CpuID = ARCH_UNKNOWN;
                Platform = PLATFORM_UNKNOWN;
                return;
@@ -382,7 +395,7 @@ InstallPath(install_path)
    if (!features.empty() && (BasePackageName == features[0]))
    {
        Version = SplitVersion(features, package_version);
-        if (Version.empty())
+        if (0 == Version)
        {
            CpuID = ARCH_UNKNOWN;
            Platform = PLATFORM_UNKNOWN;
@@ -392,14 +405,24 @@ InstallPath(install_path)
        Platform = SplitPlatfrom(features);
        if (PLATFORM_UNKNOWN != Platform)
        {
-            CpuID = 0;
+            switch (Platform)
+            {
+                case PLATFORM_TEGRA2:
+                {
+                    CpuID = ARCH_ARMv7 | FEATURES_HAS_VFPv3d16;
+                } break;
+                case PLATFORM_TEGRA3:
+                {
+                    CpuID = ARCH_ARMv7 | FEATURES_HAS_VFPv3 | FEATURES_HAS_NEON;
+                } break;
+            }
        }
        else
        {
            if (features.size() < 3)
            {
                LOGD("It is not OpenCV library package for this platform");
-                Version.clear();
+                Version = 0;
                CpuID = ARCH_UNKNOWN;
                Platform = PLATFORM_UNKNOWN;
                return;
@@ -433,7 +456,7 @@ InstallPath(install_path)
            else
            {
                LOGD("It is not OpenCV library package for this platform");
-                Version.clear();
+                Version = 0;
                CpuID = ARCH_UNKNOWN;
                Platform = PLATFORM_UNKNOWN;
                return;
@@ -443,7 +466,7 @@ InstallPath(install_path)
    else
    {
        LOGD("It is not OpenCV library package for this platform");
-        Version.clear();
+        Version = 0;
        CpuID = ARCH_UNKNOWN;
        Platform = PLATFORM_UNKNOWN;
        return;
@@ -452,7 +475,7 @@ InstallPath(install_path)

 bool PackageInfo::IsValid() const
 {
-    return !(Version.empty() && (PLATFORM_UNKNOWN == Platform) && (ARCH_UNKNOWN == CpuID));
+    return !((0 == Version) && (PLATFORM_UNKNOWN == Platform) && (ARCH_UNKNOWN == CpuID));
 }

 int PackageInfo::GetPlatform() const
@@ -470,7 +493,7 @@ string PackageInfo::GetFullName() const
    return FullName;
 }

-string PackageInfo::GetVersion() const
+int PackageInfo::GetVersion() const
 {
    return Version;
 }
@@ -483,4 +506,4 @@ string PackageInfo::GetInstalationPath() const
 bool PackageInfo::operator==(const PackageInfo& package) const
 {
    return (package.FullName == FullName);
-}
+}
@@ -30,10 +30,10 @@
 class PackageInfo
 {
 public:
-    PackageInfo(const std::string& version, int platform, int cpu_id, std::string install_path = "/data/data/");
+    PackageInfo(int version, int platform, int cpu_id, std::string install_path = "/data/data/");
    PackageInfo(const std::string& fullname, const std::string& install_path, std::string package_version = "0.0");
    std::string GetFullName() const;
-    std::string GetVersion() const;
+    int GetVersion() const;
    int GetPlatform() const;
    int GetCpuID() const;
    std::string GetInstalationPath() const;
@@ -43,7 +43,7 @@ public:

 protected:
    static std::map<int, std::string> InitPlatformNameMap();
-    std::string Version;
+    int Version;
    int Platform;
    int CpuID;
    std::string FullName;
@@ -51,4 +51,4 @@ protected:
    static const std::string BasePackageName;
 };

-#endif
+#endif
@@ -17,4 +17,6 @@
 // Class name of OpenCV engine binder object. Is needned for connection to service
 #define OPECV_ENGINE_CLASSNAME "org.opencv.engine.OpenCVEngineInterface"

+typedef const char* (*InfoFunctionType)();
+
 #endif
@@ -1,17 +1,17 @@
 #ifndef __IPACKAGE_MANAGER__
 #define __IPACKAGE_MANAGER__

-#include <set>
+#include <vector>
 #include <string>

 class IPackageManager
 {
 public:
-    virtual std::set<std::string> GetInstalledVersions() = 0;
-    virtual bool CheckVersionInstalled(const std::string& version, int platform, int cpu_id) = 0;
-    virtual bool InstallVersion(const std::string&, int platform, int cpu_id) = 0;
-    virtual std::string GetPackagePathByVersion(const std::string&, int platform, int cpu_id) = 0;
+    virtual std::vector<int> GetInstalledVersions() = 0;
+    virtual bool CheckVersionInstalled(int version, int platform, int cpu_id) = 0;
+    virtual bool InstallVersion(int version, int platform, int cpu_id) = 0;
+    virtual std::string GetPackagePathByVersion(int version, int platform, int cpu_id) = 0;
    virtual ~IPackageManager(){};
 };

-#endif
+#endif
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt

 # Project target.
-target=android-8
+target=android-9
@@ -26,7 +26,7 @@
            android:id="@+id/textView1"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:text="Version: "
+            android:text="Library version: "
            android:textAppearance="?android:attr/textAppearanceSmall" />

        <TextView
@@ -30,7 +30,7 @@
            android:id="@+id/EngineVersionCaption"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:text="Version: "
+            android:text="OpenCV Manager version: "
            android:textAppearance="?android:attr/textAppearanceMedium" />

        <TextView
@@ -20,8 +20,6 @@ public class MarketConnector
    private static final String TAG = "OpenCVEngine/MarketConnector";
    protected Context mContext;

-    public boolean mIncludeManager = true;
-
    public MarketConnector(Context context)
    {
        mContext = context;
@@ -100,15 +98,13 @@ public class MarketConnector
    {
        List<PackageInfo> AllPackages = mContext.getPackageManager().getInstalledPackages(PackageManager.GET_CONFIGURATIONS);
        List<PackageInfo> OpenCVPackages = new ArrayList<PackageInfo>();
-        if (mIncludeManager)
-        {
-            try {
-                OpenCVPackages.add(mContext.getPackageManager().getPackageInfo("org.opencv.engine", PackageManager.GET_CONFIGURATIONS));
-            } catch (NameNotFoundException e) {
-                Log.e(TAG, "OpenCV Manager package info was not found!");
-                e.printStackTrace();
-            }
+        try {
+            OpenCVPackages.add(mContext.getPackageManager().getPackageInfo("org.opencv.engine", PackageManager.GET_CONFIGURATIONS));
+        } catch (NameNotFoundException e) {
+            Log.e(TAG, "OpenCV Manager package info was not found!");
+            e.printStackTrace();
        }
+
        Iterator<PackageInfo> it = AllPackages.iterator();
        while(it.hasNext())
        {
@@ -0,0 +1,40 @@
+package org.opencv.engine;
+
+public class OpenCVLibraryInfo {
+    public OpenCVLibraryInfo(String packagePath) {
+        mNativeObj = open(packagePath + "/libopencv_info.so");
+        if (mNativeObj != 0) {
+            mPackageName = getPackageName(mNativeObj);
+            mLibraryList = getLibraryList(mNativeObj);
+            mVersionName = getVersionName(mNativeObj);
+            close(mNativeObj);
+        }
+    }
+
+    public boolean status() {
+        return (mNativeObj != 0);
+    }
+
+    public String packageName() {
+        return mPackageName;
+    }
+
+    public String libraryList() {
+        return mLibraryList;
+    }
+
+    public String versionName() {
+        return mVersionName;
+    }
+
+    private long mNativeObj;
+    private String mPackageName;
+    private String mLibraryList;
+    private String mVersionName;
+
+    private native long open(String packagePath);
+    private native String getPackageName(long obj);
+    private native String getLibraryList(long obj);
+    private native String getVersionName(long obj);
+    private native void close(long obj);
+}
@@ -7,7 +7,9 @@ import java.util.StringTokenizer;
 import org.opencv.engine.HardwareDetector;
 import org.opencv.engine.MarketConnector;
 import org.opencv.engine.OpenCVEngineInterface;
+import org.opencv.engine.OpenCVLibraryInfo;
 import org.opencv.engine.R;
+import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.BroadcastReceiver;
@@ -77,7 +79,7 @@ public class ManagerActivity extends Activity
            {
                HardwarePlatformView.setText("Tegra");
            }
-            else if (HardwareDetector.PLATFORM_TEGRA == Platfrom)
+            else if (HardwareDetector.PLATFORM_TEGRA2 == Platfrom)
            {
                HardwarePlatformView.setText("Tegra 2");
            }
@@ -170,9 +172,13 @@ public class ManagerActivity extends Activity

        mInstalledPackageView.setOnItemClickListener(new OnItemClickListener() {

-            public void onItemClick(AdapterView<?> arg0, View arg1, int arg2, long id) {
-                mInstalledPackageView.setTag(Integer.valueOf((int)id));
-                mActionDialog.show();
+            public void onItemClick(AdapterView<?> adapter, View view, int position, long id) {
+                //if (!mListViewItems.get((int) id).get("Name").equals("Built-in OpenCV library"));
+                if (!mInstalledPackageInfo[(int) id].packageName.equals("org.opencv.engine"))
+                {
+                    mInstalledPackageView.setTag(Integer.valueOf((int)id));
+                    mActionDialog.show();
+                }
            }
        });

@@ -232,8 +238,6 @@ public class ManagerActivity extends Activity
    protected class OpenCVEngineServiceConnection implements ServiceConnection
    {
        public void onServiceDisconnected(ComponentName name) {
-            // TODO Auto-generated method stub
-
        }

        public void onServiceConnected(ComponentName name, IBinder service) {
@@ -266,23 +270,58 @@ public class ManagerActivity extends Activity
        }
    };

+    @TargetApi(Build.VERSION_CODES.GINGERBREAD)
    synchronized protected void FillPackageList()
    {
        synchronized (mListViewItems) {
-            mMarket.mIncludeManager = false;
            mInstalledPackageInfo = mMarket.GetInstalledOpenCVPackages();
            mListViewItems.clear();

-            for (int i = 0; i < mInstalledPackageInfo.length; i++)
+            int RealPackageCount = mInstalledPackageInfo.length;
+            for (int i = 0; i < RealPackageCount; i++)
            {
+                if (mInstalledPackageInfo[i] == null)
+                    break;
+
                // Convert to Items for package list view
                HashMap<String,String> temp = new HashMap<String,String>();
+
+                String HardwareName = "";
+                String NativeLibDir = "";
+                String OpenCVersion = "";
+
                String PublicName = mMarket.GetApplicationName(mInstalledPackageInfo[i].applicationInfo);
+                String PackageName = mInstalledPackageInfo[i].packageName;
+                String VersionName = mInstalledPackageInfo[i].versionName;
+
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD)
+                    NativeLibDir = mInstalledPackageInfo[i].applicationInfo.nativeLibraryDir;
+                else
+                    NativeLibDir = "/data/data/" + mInstalledPackageInfo[i].packageName + "/lib";
+
+                OpenCVLibraryInfo NativeInfo = new OpenCVLibraryInfo(NativeLibDir);
+
+                if (PackageName.equals("org.opencv.engine"))
+                {
+                    if (NativeInfo.status())
+                    {
+                        PublicName = "Built-in OpenCV library";
+                        PackageName = NativeInfo.packageName();
+                        VersionName = NativeInfo.versionName();
+                    }
+                    else
+                    {
+                        mInstalledPackageInfo[i] = mInstalledPackageInfo[RealPackageCount-1];
+                        mInstalledPackageInfo[RealPackageCount-1] = null;
+                        RealPackageCount--;
+                        i--;
+                        continue;
+                    }
+                }

                int idx = 0;
-                String OpenCVersion = "unknown";
-                String HardwareName = "";
-                StringTokenizer tokenizer = new StringTokenizer(mInstalledPackageInfo[i].packageName, "_");
+                Log.d(TAG, PackageName);
+                StringTokenizer tokenizer = new StringTokenizer(PackageName, "_");
                while (tokenizer.hasMoreTokens())
                {
                    if (idx == 1)
@@ -303,6 +342,7 @@ public class ManagerActivity extends Activity
                }

                String ActivePackagePath;
+                String Tags = null;
                ActivePackagePath = mActivePackageMap.get(OpenCVersion);
                Log.d(TAG, OpenCVersion + " -> " + ActivePackagePath);

@@ -313,11 +353,13 @@ public class ManagerActivity extends Activity
                    if (start >= 0 && ActivePackagePath.charAt(stop) == '/')
                    {
                        temp.put("Activity", "y");
-                        PublicName += " (in use)";
+                        Tags = "active";
                    }
                    else
                    {
                        temp.put("Activity", "n");
+                        if (!PublicName.equals("Built-in OpenCV library"))
+                            Tags = "safe to remove";
                    }
                }
                else
@@ -325,9 +367,32 @@ public class ManagerActivity extends Activity
                    temp.put("Activity", "n");
                }

+                temp.put("Version", NormalizeVersion(OpenCVersion, VersionName));
+                // HACK: OpenCV Manager for Armv7-a Neon already has Tegra3 optimizations
+                // that is enabled on proper hardware
+                if (HardwareDetector.DetectKnownPlatforms() == HardwareDetector.PLATFORM_TEGRA3 &&
+                  HardwareName.equals("armv7a neon ") &&  Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD)
+                {
+                    temp.put("Hardware", "Tegra 3");
+                    if (Tags == null)
+                    {
+                        Tags = "optimized";
+                    }
+                    else
+                    {
+                        Tags = Tags + ", optimized";
+                    }
+                }
+                else
+                {
+                    temp.put("Hardware", HardwareName);
+                }
+
+                if (Tags != null)
+                    PublicName = PublicName + " (" + Tags + ")";
+
                temp.put("Name", PublicName);
-                temp.put("Version", NormalizeVersion(OpenCVersion, mInstalledPackageInfo[i].versionName));
-                temp.put("Hardware", HardwareName);
+
                mListViewItems.add(temp);
            }

@@ -337,10 +402,16 @@ public class ManagerActivity extends Activity

    protected String NormalizeVersion(String OpenCVersion, String PackageVersion)
    {
+        if (OpenCVersion == null || PackageVersion == null)
+            return "unknown";
+
        int dot = PackageVersion.indexOf(".");
-        return OpenCVersion.substring(0,  OpenCVersion.length()-1) + "." +
-            OpenCVersion.toCharArray()[OpenCVersion.length()-1] + "." +
-            PackageVersion.substring(0, dot) + " rev " + PackageVersion.substring(dot+1);
+        if (dot == -1 || OpenCVersion.length() == 0)
+            return "unknown";
+        else
+            return OpenCVersion.substring(0,  OpenCVersion.length()-1) + "." +
+                OpenCVersion.toCharArray()[OpenCVersion.length()-1] + "." +
+                PackageVersion.substring(0, dot) + " rev " + PackageVersion.substring(dot+1);
    }

    protected String ConvertPackageName(String Name, String Version)
@@ -0,0 +1,33 @@
+How to select the proper version of OpenCV Manager
+--------------------------------------------------
+
+Since version 1.7 several packages of OpenCV Manager are built. Every package is targeted for some
+specific hardware platform and includes corresponding OpenCV binaries. So, in most cases OpenCV
+Manager uses built-in version of OpenCV. Separate package with OpenCV binaries is currently used in
+a single rare case, when an ARMv7-A processor without NEON support is detected. In this case an
+additional binary package is used. The new package selection logic in most cases simplifies OpenCV
+installation on end user devices. In most cases OpenCV Manager may be installed automatically from
+Google Play.
+
+If Google Play is not available (i.e. on emulator, developer board, etc), you can install it
+manually using adb tool:
+
+.. code-block:: sh
+
+    adb install OpenCV-2.4.3-android-sdk/apk/OpenCV_2.4.3.2_Manager_2.4_<platform>.apk
+
+Use the table below to determine proper OpenCV Manager package for your device:
+
+------------------------------+--------------+-----------------------------------------------------+
+| Hardware Platform            | Android ver. | Package name                                        |
+==============================+==============+=====================================================+
+| armeabi-v7a (ARMv7-A + NEON) |    >= 2.3    | OpenCV_2.4.3.2_Manager_2.4_armv7a-neon.apk          |
+------------------------------+--------------+-----------------------------------------------------+
+| armeabi-v7a (ARMv7-A + NEON) |     = 2.2    | OpenCV_2.4.3.2_Manager_2.4_armv7a-neon-android8.apk |
+------------------------------+--------------+-----------------------------------------------------+
+| armeabi (ARMv5, ARMv6)       |    >= 2.3    | OpenCV_2.4.3.2_Manager_2.4_armeabi.apk              |
+------------------------------+--------------+-----------------------------------------------------+
+| Intel x86                    |    >= 2.3    | OpenCV_2.4.3.2_Manager_2.4_x86.apk                  |
+------------------------------+--------------+-----------------------------------------------------+
+| MIPS                         |    >= 2.3    | OpenCV_2.4.3.2_Manager_2.4_mips.apk                 |
+------------------------------+--------------+-----------------------------------------------------+
@@ -1,7 +1,3 @@
-if(IOS OR ANDROID)
-  return()
-endif()
-
 SET(OPENCV_HAARTRAINING_DEPS opencv_core opencv_imgproc opencv_highgui opencv_objdetect opencv_calib3d opencv_video opencv_features2d opencv_flann opencv_legacy)
 ocv_check_dependencies(${OPENCV_HAARTRAINING_DEPS})

@@ -1,7 +1,3 @@
-if(IOS OR ANDROID)
-  return()
-endif()
-
 SET(OPENCV_TRAINCASCADE_DEPS opencv_core opencv_ml opencv_imgproc opencv_objdetect opencv_highgui opencv_calib3d opencv_video opencv_features2d opencv_flann opencv_legacy)
 ocv_check_dependencies(${OPENCV_TRAINCASCADE_DEPS})

@@ -360,7 +360,7 @@ CvDTreeNode* CvCascadeBoostTrainData::subsample_data( const CvMat* _subsample_id

            if (is_buf_16u)
            {
-                unsigned short* udst_idx = (unsigned short*)(buf->data.s + root->buf_idx*buf->cols +
+                unsigned short* udst_idx = (unsigned short*)(buf->data.s + root->buf_idx*get_length_subbuf() +
                    vi*sample_count + data_root->offset);
                for( int i = 0; i < num_valid; i++ )
                {
@@ -373,7 +373,7 @@ CvDTreeNode* CvCascadeBoostTrainData::subsample_data( const CvMat* _subsample_id
            }
            else
            {
-                int* idst_idx = buf->data.i + root->buf_idx*buf->cols +
+                int* idst_idx = buf->data.i + root->buf_idx*get_length_subbuf() +
                    vi*sample_count + root->offset;
                for( int i = 0; i < num_valid; i++ )
                {
@@ -390,14 +390,14 @@ CvDTreeNode* CvCascadeBoostTrainData::subsample_data( const CvMat* _subsample_id
        const int* src_lbls = get_cv_labels(data_root, (int*)(uchar*)inn_buf);
        if (is_buf_16u)
        {
-            unsigned short* udst = (unsigned short*)(buf->data.s + root->buf_idx*buf->cols +
+            unsigned short* udst = (unsigned short*)(buf->data.s + root->buf_idx*get_length_subbuf() +
                (workVarCount-1)*sample_count + root->offset);
            for( int i = 0; i < count; i++ )
                udst[i] = (unsigned short)src_lbls[sidx[i]];
        }
        else
        {
-            int* idst = buf->data.i + root->buf_idx*buf->cols +
+            int* idst = buf->data.i + root->buf_idx*get_length_subbuf() +
                (workVarCount-1)*sample_count + root->offset;
            for( int i = 0; i < count; i++ )
                idst[i] = src_lbls[sidx[i]];
@@ -407,14 +407,14 @@ CvDTreeNode* CvCascadeBoostTrainData::subsample_data( const CvMat* _subsample_id
        const int* sample_idx_src = get_sample_indices(data_root, (int*)(uchar*)inn_buf);
        if (is_buf_16u)
        {
-            unsigned short* sample_idx_dst = (unsigned short*)(buf->data.s + root->buf_idx*buf->cols +
+            unsigned short* sample_idx_dst = (unsigned short*)(buf->data.s + root->buf_idx*get_length_subbuf() +
                workVarCount*sample_count + root->offset);
            for( int i = 0; i < count; i++ )
                sample_idx_dst[i] = (unsigned short)sample_idx_src[sidx[i]];
        }
        else
        {
-            int* sample_idx_dst = buf->data.i + root->buf_idx*buf->cols +
+            int* sample_idx_dst = buf->data.i + root->buf_idx*get_length_subbuf() +
                workVarCount*sample_count + root->offset;
            for( int i = 0; i < count; i++ )
                sample_idx_dst[i] = sample_idx_src[sidx[i]];
@@ -489,6 +489,10 @@ void CvCascadeBoostTrainData::setData( const CvFeatureEvaluator* _featureEvaluat
    int* idst = 0;
    unsigned short* udst = 0;

+    uint64 effective_buf_size = 0;
+    int effective_buf_height = 0, effective_buf_width = 0;
+
+
    clear();
    shared = true;
    have_labels = true;
@@ -548,13 +552,28 @@ void CvCascadeBoostTrainData::setData( const CvFeatureEvaluator* _featureEvaluat
    var_type->data.i[var_count] = cat_var_count;
    var_type->data.i[var_count+1] = cat_var_count+1;
    work_var_count = ( cat_var_count ? 0 : numPrecalcIdx ) + 1/*cv_lables*/;
-    buf_size = (work_var_count + 1) * sample_count/*sample_indices*/;
    buf_count = 2;

-    if ( is_buf_16u )
-        buf = cvCreateMat( buf_count, buf_size, CV_16UC1 );
+    buf_size = -1; // the member buf_size is obsolete
+
+    effective_buf_size = (uint64)(work_var_count + 1)*(uint64)sample_count * buf_count; // this is the total size of "CvMat buf" to be allocated
+    effective_buf_width = sample_count;
+    effective_buf_height = work_var_count+1;
+
+    if (effective_buf_width >= effective_buf_height)
+        effective_buf_height *= buf_count;
    else
-        buf = cvCreateMat( buf_count, buf_size, CV_32SC1 );
+        effective_buf_width *= buf_count;
+
+    if ((uint64)effective_buf_width * (uint64)effective_buf_height != effective_buf_size)
+    {
+        CV_Error(CV_StsBadArg, "The memory buffer cannot be allocated since its size exceeds integer fields limit");
+    }
+
+    if ( is_buf_16u )
+        buf = cvCreateMat( effective_buf_height, effective_buf_width, CV_16UC1 );
+    else
+        buf = cvCreateMat( effective_buf_height, effective_buf_width, CV_32SC1 );

    cat_count = cvCreateMat( 1, cat_var_count + 1, CV_32SC1 );

@@ -609,7 +628,7 @@ void CvCascadeBoostTrainData::setData( const CvFeatureEvaluator* _featureEvaluat
    priors_mult = cvCloneMat( priors );
    counts = cvCreateMat( 1, get_num_classes(), CV_32SC1 );
    direction = cvCreateMat( 1, sample_count, CV_8UC1 );
-    split_buf = cvCreateMat( 1, sample_count, CV_32SC1 );
+    split_buf = cvCreateMat( 1, sample_count, CV_32SC1 );//TODO: make a pointer
 }

 void CvCascadeBoostTrainData::free_train_data()
@@ -652,10 +671,10 @@ void CvCascadeBoostTrainData::get_ord_var_data( CvDTreeNode* n, int vi, float* o
    if ( vi < numPrecalcIdx )
    {
        if( !is_buf_16u )
-            *sortedIndices = buf->data.i + n->buf_idx*buf->cols + vi*sample_count + n->offset;
+            *sortedIndices = buf->data.i + n->buf_idx*get_length_subbuf() + vi*sample_count + n->offset;
        else
        {
-            const unsigned short* shortIndices = (const unsigned short*)(buf->data.s + n->buf_idx*buf->cols +
+            const unsigned short* shortIndices = (const unsigned short*)(buf->data.s + n->buf_idx*get_length_subbuf() +
                                                    vi*sample_count + n->offset );
            for( int i = 0; i < nodeSampleCount; i++ )
                sortedIndicesBuf[i] = shortIndices[i];
@@ -1027,6 +1046,7 @@ void CvCascadeBoostTree::split_node_data( CvDTreeNode* node )
    int newBufIdx = data->get_child_buf_idx( node );
    int workVarCount = data->get_work_var_count();
    CvMat* buf = data->buf;
+    size_t length_buf_row = data->get_length_subbuf();
    cv::AutoBuffer<uchar> inn_buf(n*(3*sizeof(int)+sizeof(float)));
    int* tempBuf = (int*)(uchar*)inn_buf;
    bool splitInputData;
@@ -1070,7 +1090,7 @@ void CvCascadeBoostTree::split_node_data( CvDTreeNode* node )
        if (data->is_buf_16u)
        {
            ushort *ldst, *rdst;
-            ldst = (ushort*)(buf->data.s + left->buf_idx*buf->cols +
+            ldst = (ushort*)(buf->data.s + left->buf_idx*length_buf_row +
                vi*scount + left->offset);
            rdst = (ushort*)(ldst + nl);

@@ -1096,9 +1116,9 @@ void CvCascadeBoostTree::split_node_data( CvDTreeNode* node )
        else
        {
            int *ldst, *rdst;
-            ldst = buf->data.i + left->buf_idx*buf->cols +
+            ldst = buf->data.i + left->buf_idx*length_buf_row +
                vi*scount + left->offset;
-            rdst = buf->data.i + right->buf_idx*buf->cols +
+            rdst = buf->data.i + right->buf_idx*length_buf_row +
                vi*scount + right->offset;

            // split sorted
@@ -1131,9 +1151,9 @@ void CvCascadeBoostTree::split_node_data( CvDTreeNode* node )

    if (data->is_buf_16u)
    {
-        unsigned short *ldst = (unsigned short *)(buf->data.s + left->buf_idx*buf->cols +
+        unsigned short *ldst = (unsigned short *)(buf->data.s + left->buf_idx*length_buf_row +
            (workVarCount-1)*scount + left->offset);
-        unsigned short *rdst = (unsigned short *)(buf->data.s + right->buf_idx*buf->cols +
+        unsigned short *rdst = (unsigned short *)(buf->data.s + right->buf_idx*length_buf_row +
            (workVarCount-1)*scount + right->offset);

        for( int i = 0; i < n; i++ )
@@ -1154,9 +1174,9 @@ void CvCascadeBoostTree::split_node_data( CvDTreeNode* node )
    }
    else
    {
-        int *ldst = buf->data.i + left->buf_idx*buf->cols +
+        int *ldst = buf->data.i + left->buf_idx*length_buf_row +
            (workVarCount-1)*scount + left->offset;
-        int *rdst = buf->data.i + right->buf_idx*buf->cols +
+        int *rdst = buf->data.i + right->buf_idx*length_buf_row +
            (workVarCount-1)*scount + right->offset;

        for( int i = 0; i < n; i++ )
@@ -1184,9 +1204,9 @@ void CvCascadeBoostTree::split_node_data( CvDTreeNode* node )

    if (data->is_buf_16u)
    {
-        unsigned short* ldst = (unsigned short*)(buf->data.s + left->buf_idx*buf->cols +
+        unsigned short* ldst = (unsigned short*)(buf->data.s + left->buf_idx*length_buf_row +
            workVarCount*scount + left->offset);
-        unsigned short* rdst = (unsigned short*)(buf->data.s + right->buf_idx*buf->cols +
+        unsigned short* rdst = (unsigned short*)(buf->data.s + right->buf_idx*length_buf_row +
            workVarCount*scount + right->offset);
        for (int i = 0; i < n; i++)
        {
@@ -1205,9 +1225,9 @@ void CvCascadeBoostTree::split_node_data( CvDTreeNode* node )
    }
    else
    {
-        int* ldst = buf->data.i + left->buf_idx*buf->cols +
+        int* ldst = buf->data.i + left->buf_idx*length_buf_row +
            workVarCount*scount + left->offset;
-        int* rdst = buf->data.i + right->buf_idx*buf->cols +
+        int* rdst = buf->data.i + right->buf_idx*length_buf_row +
            workVarCount*scount + right->offset;
        for (int i = 0; i < n; i++)
        {
@@ -1352,6 +1372,7 @@ void CvCascadeBoost::update_weights( CvBoostTree* tree )
        sampleIdx = data->get_sample_indices( data->data_root, sampleIdxBuf );
    }
    CvMat* buf = data->buf;
+    size_t length_buf_row = data->get_length_subbuf();
    if( !tree ) // before training the first tree, initialize weights and other parameters
    {
        int* classLabelsBuf = (int*)cur_inn_buf_pos; cur_inn_buf_pos = (uchar*)(classLabelsBuf + n);
@@ -1375,7 +1396,7 @@ void CvCascadeBoost::update_weights( CvBoostTree* tree )

        if (data->is_buf_16u)
        {
-            unsigned short* labels = (unsigned short*)(buf->data.s + data->data_root->buf_idx*buf->cols +
+            unsigned short* labels = (unsigned short*)(buf->data.s + data->data_root->buf_idx*length_buf_row +
                data->data_root->offset + (data->work_var_count-1)*data->sample_count);
            for( int i = 0; i < n; i++ )
            {
@@ -1393,7 +1414,7 @@ void CvCascadeBoost::update_weights( CvBoostTree* tree )
        }
        else
        {
-            int* labels = buf->data.i + data->data_root->buf_idx*buf->cols +
+            int* labels = buf->data.i + data->data_root->buf_idx*length_buf_row +
                data->data_root->offset + (data->work_var_count-1)*data->sample_count;

            for( int i = 0; i < n; i++ )
@@ -302,7 +302,7 @@ macro(add_android_project target path)
         COMMAND ${CMAKE_COMMAND} -E touch "${android_proj_bin_dir}/bin/${target}-debug.apk" # needed because ant does not update the timestamp of updated apk
         WORKING_DIRECTORY "${android_proj_bin_dir}"
         MAIN_DEPENDENCY "${android_proj_bin_dir}/${ANDROID_MANIFEST_FILE}"
-         DEPENDS "${OpenCV_BINARY_DIR}/bin/.classes.jar.dephelper" opencv_java # as we are part of OpenCV we can just force this dependency
+         DEPENDS "${OpenCV_BINARY_DIR}/bin/classes.jar.dephelper" opencv_java # as we are part of OpenCV we can just force this dependency
         DEPENDS ${android_proj_file_deps} ${JNI_LIB_NAME})
    endif()

@@ -3,17 +3,17 @@ if(${CMAKE_VERSION} VERSION_LESS "2.8.3")
  return()
 endif()

-if (WIN32 AND NOT MSVC)
-  message(STATUS "CUDA compilation is disabled (due to only Visual Studio compiler suppoted on your platform).")
+if(WIN32 AND NOT MSVC)
+  message(STATUS "CUDA compilation is disabled (due to only Visual Studio compiler supported on your platform).")
  return()
 endif()

-if (CMAKE_COMPILER_IS_GNUCXX AND NOT APPLE AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-  message(STATUS "CUDA compilation is disabled (due to Clang unsuppoted on your platform).")
+if(CMAKE_COMPILER_IS_GNUCXX AND NOT APPLE AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+  message(STATUS "CUDA compilation is disabled (due to Clang unsupported on your platform).")
  return()
 endif()

-find_package(CUDA 4.1)
+find_package(CUDA 4.2 QUIET)

 if(CUDA_FOUND)
  set(HAVE_CUDA 1)
@@ -26,15 +26,20 @@ if(CUDA_FOUND)
    set(HAVE_CUBLAS 1)
  endif()

-  message(STATUS "CUDA detected: " ${CUDA_VERSION})
-
-  if(${CUDA_VERSION_STRING} VERSION_GREATER "4.1")
-    set(CUDA_ARCH_BIN "1.1 1.2 1.3 2.0 2.1(2.0) 3.0" CACHE STRING "Specify 'real' GPU architectures to build binaries for, BIN(PTX) format is supported")
-  else()
-    set(CUDA_ARCH_BIN "1.1 1.2 1.3 2.0 2.1(2.0)" CACHE STRING "Specify 'real' GPU architectures to build binaries for, BIN(PTX) format is supported")
+  if(WITH_NVCUVID)
+    find_cuda_helper_libs(nvcuvid)
+    set(HAVE_NVCUVID 1)
  endif()

-  set(CUDA_ARCH_PTX "2.0" CACHE STRING "Specify 'virtual' PTX architectures to build PTX intermediate code for")
+  message(STATUS "CUDA detected: " ${CUDA_VERSION})
+
+  if (CARMA)
+    set(CUDA_ARCH_BIN "2.1(2.0) 3.0" CACHE STRING "Specify 'real' GPU architectures to build binaries for, BIN(PTX) format is supported")
+    set(CUDA_ARCH_PTX "3.0" CACHE STRING "Specify 'virtual' PTX architectures to build PTX intermediate code for")
+  else()
+    set(CUDA_ARCH_BIN "1.1 1.2 1.3 2.0 2.1(2.0) 3.0" CACHE STRING "Specify 'real' GPU architectures to build binaries for, BIN(PTX) format is supported")
+    set(CUDA_ARCH_PTX "2.0 3.0" CACHE STRING "Specify 'virtual' PTX architectures to build PTX intermediate code for")
+  endif()

  string(REGEX REPLACE "\\." "" ARCH_BIN_NO_POINTS "${CUDA_ARCH_BIN}")
  string(REGEX REPLACE "\\." "" ARCH_PTX_NO_POINTS "${CUDA_ARCH_PTX}")
@@ -72,11 +77,20 @@ if(CUDA_FOUND)

  # Tell NVCC to add PTX intermediate code for the specified architectures
  string(REGEX MATCHALL "[0-9]+" ARCH_LIST "${ARCH_PTX_NO_POINTS}")
-    foreach(ARCH IN LISTS ARCH_LIST)
-      set(NVCC_FLAGS_EXTRA ${NVCC_FLAGS_EXTRA} -gencode arch=compute_${ARCH},code=compute_${ARCH})
-      set(OPENCV_CUDA_ARCH_PTX "${OPENCV_CUDA_ARCH_PTX} ${ARCH}")
-      set(OPENCV_CUDA_ARCH_FEATURES "${OPENCV_CUDA_ARCH_FEATURES} ${ARCH}")
-    endforeach()
+  foreach(ARCH IN LISTS ARCH_LIST)
+    set(NVCC_FLAGS_EXTRA ${NVCC_FLAGS_EXTRA} -gencode arch=compute_${ARCH},code=compute_${ARCH})
+    set(OPENCV_CUDA_ARCH_PTX "${OPENCV_CUDA_ARCH_PTX} ${ARCH}")
+    set(OPENCV_CUDA_ARCH_FEATURES "${OPENCV_CUDA_ARCH_FEATURES} ${ARCH}")
+  endforeach()
+
+  if(CARMA)
+    set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS} --target-cpu-architecture=ARM" )
+
+    if (CMAKE_VERSION VERSION_LESS 2.8.10)
+      set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS} -ccbin=${CMAKE_CXX_COMPILER}" )
+    endif()
+
+  endif()

  # These vars will be processed in other scripts
  set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} ${NVCC_FLAGS_EXTRA})
@@ -84,7 +98,7 @@ if(CUDA_FOUND)

  message(STATUS "CUDA NVCC target flags: ${CUDA_NVCC_FLAGS}")

-  OCV_OPTION(CUDA_FAST_MATH  "Enable --use_fast_math for CUDA compiler " OFF)
+  OCV_OPTION(CUDA_FAST_MATH "Enable --use_fast_math for CUDA compiler " OFF)

  if(CUDA_FAST_MATH)
    set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} --use_fast_math)
@@ -92,7 +106,6 @@ if(CUDA_FOUND)

  mark_as_advanced(CUDA_BUILD_CUBIN CUDA_BUILD_EMULATION CUDA_VERBOSE_BUILD CUDA_SDK_ROOT_DIR)

-  unset(CUDA_npp_LIBRARY CACHE)
  find_cuda_helper_libs(npp)

  macro(ocv_cuda_compile VAR)
@@ -106,15 +119,15 @@ if(CUDA_FOUND)
      string(REPLACE "-ggdb3" "" ${var} "${${var}}")
    endforeach()

-    if (BUILD_SHARED_LIBS)
+    if(BUILD_SHARED_LIBS)
      set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} -Xcompiler -DCVAPI_EXPORTS)
    endif()

    if(UNIX OR APPLE)
-      set (CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} -Xcompiler -fPIC)
+      set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} -Xcompiler -fPIC)
    endif()
    if(APPLE)
-      set (CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} -Xcompiler -fno-finite-math-only)
+      set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} -Xcompiler -fno-finite-math-only)
    endif()

    # disabled because of multiple warnings during building nvcc auto generated files
@@ -1,78 +1,146 @@
 if(APPLE)
-    set(OPENCL_FOUND YES)
-    set(OPENCL_LIBRARIES "-framework OpenCL")
+  set(OPENCL_FOUND YES)
+  set(OPENCL_LIBRARIES "-framework OpenCL")
 else()
-    #find_package(OpenCL QUIET)
-    if(WITH_OPENCLAMDFFT)
-            find_path(CLAMDFFT_INCLUDE_DIR
-                NAMES clAmdFft.h)
-            find_library(CLAMDFFT_LIBRARIES
-                NAMES clAmdFft.Runtime)
+  find_package(OpenCL QUIET)
+  if(WITH_OPENCLAMDFFT)
+    set(CLAMDFFT_SEARCH_PATH $ENV{CLAMDFFT_PATH})
+    if(NOT CLAMDFFT_SEARCH_PATH)
+      if(WIN32)
+        set( CLAMDFFT_SEARCH_PATH "C:\\Program Files (x86)\\AMD\\clAmdFft" )
+      endif()
    endif()
-    if(WITH_OPENCLAMDBLAS)
-            find_path(CLAMDBLAS_INCLUDE_DIR
-                NAMES clAmdBlas.h)
-            find_library(CLAMDBLAS_LIBRARIES
-                NAMES clAmdBlas)
-    endif()
-    # Try AMD/ATI Stream SDK
-    if (NOT OPENCL_FOUND)
-        set(ENV_AMDSTREAMSDKROOT $ENV{AMDAPPSDKROOT})
-        set(ENV_OPENCLROOT $ENV{OPENCLROOT})
-        set(ENV_CUDA_PATH $ENV{CUDA_PATH})
-        if(ENV_AMDSTREAMSDKROOT)
-            set(OPENCL_INCLUDE_SEARCH_PATH ${ENV_AMDSTREAMSDKROOT}/include)
-            if(CMAKE_SIZEOF_VOID_P EQUAL 4)
-                set(OPENCL_LIB_SEARCH_PATH ${OPENCL_LIB_SEARCH_PATH} ${ENV_AMDSTREAMSDKROOT}/lib/x86)
-            else()
-                set(OPENCL_LIB_SEARCH_PATH ${OPENCL_LIB_SEARCH_PATH} ${ENV_AMDSTREAMSDKROOT}/lib/x86_64)
-            endif()
-        elseif(ENV_CUDAPATH AND WIN32)
-            set(OPENCL_INCLUDE_SEARCH_PATH ${ENV_CUDA_PATH}/include)
-            if(CMAKE_SIZEOF_VOID_P EQUAL 4)
-                set(OPENCL_LIB_SEARCH_PATH ${OPENCL_LIB_SEARCH_PATH} ${ENV_CUDA_PATH}/lib/Win32)
-            else()
-                set(OPENCL_LIB_SEARCH_PATH ${OPENCL_LIB_SEARCH_PATH} ${ENV_CUDA_PATH}/lib/x64)
-            endif()
-        elseif(ENV_OPENCLROOT AND UNIX)
-            set(OPENCL_INCLUDE_SEARCH_PATH ${ENV_OPENCLROOT}/inc)
-            if(CMAKE_SIZEOF_VOID_P EQUAL 4)
-                set(OPENCL_LIB_SEARCH_PATH ${OPENCL_LIB_SEARCH_PATH} /usr/lib)
-            else()
-                set(OPENCL_LIB_SEARCH_PATH ${OPENCL_LIB_SEARCH_PATH} /usr/lib64)
-            endif()
-        endif()
-
-        if(OPENCL_INCLUDE_SEARCH_PATH)
-            find_path(OPENCL_INCLUDE_DIR
-                NAMES CL/cl.h OpenCL/cl.h
-                PATHS ${OPENCL_INCLUDE_SEARCH_PATH}
-                NO_DEFAULT_PATH)
-        else()
-            find_path(OPENCL_INCLUDE_DIR
-                NAMES CL/cl.h OpenCL/cl.h)
-        endif()
-
-        if(OPENCL_LIB_SEARCH_PATH)
-            find_library(OPENCL_LIBRARY NAMES OpenCL PATHS ${OPENCL_LIB_SEARCH_PATH} NO_DEFAULT_PATH)
-        else()
-            find_library(OPENCL_LIBRARY NAMES OpenCL)
-        endif()
-
-        include(FindPackageHandleStandardArgs)
-        find_package_handle_standard_args(
-          OPENCL
-          DEFAULT_MSG
-          OPENCL_LIBRARY OPENCL_INCLUDE_DIR
-          )
-
-        if(OPENCL_FOUND)
-            set(OPENCL_LIBRARIES ${OPENCL_LIBRARY})
-            set(HAVE_OPENCL 1)
-        else()
-            set(OPENCL_LIBRARIES)
-        endif()
+    set( CLAMDFFT_INCLUDE_SEARCH_PATH ${CLAMDFFT_SEARCH_PATH}/include )
+    if(UNIX)
+      if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+        set(CLAMDFFT_LIB_SEARCH_PATH /usr/lib)
+      else()
+        set(CLAMDFFT_LIB_SEARCH_PATH /usr/lib64)
+      endif()
    else()
-        set(HAVE_OPENCL 1)
+      if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+        set(CLAMDFFT_LIB_SEARCH_PATH ${CLAMDFFT_SEARCH_PATH}\\lib32\\import)
+      else()
+        set(CLAMDFFT_LIB_SEARCH_PATH ${CLAMDFFT_SEARCH_PATH}\\lib64\\import)
+      endif()
    endif()
+    find_path(CLAMDFFT_INCLUDE_DIR
+      NAMES clAmdFft.h
+      PATHS ${CLAMDFFT_INCLUDE_SEARCH_PATH}
+      PATH_SUFFIXES clAmdFft
+      NO_DEFAULT_PATH)
+    find_library(CLAMDFFT_LIBRARY
+      NAMES clAmdFft.Runtime
+      PATHS ${CLAMDFFT_LIB_SEARCH_PATH}
+      NO_DEFAULT_PATH)
+    if(CLAMDFFT_LIBRARY)
+      set(CLAMDFFT_LIBRARIES ${CLAMDFFT_LIBRARY})
+    else()
+      set(CLAMDFFT_LIBRARIES "")
+    endif()
+  endif()
+  if(WITH_OPENCLAMDBLAS)
+    set(CLAMDBLAS_SEARCH_PATH $ENV{CLAMDBLAS_PATH})
+    if(NOT CLAMDBLAS_SEARCH_PATH)
+      if(WIN32)
+        set( CLAMDBLAS_SEARCH_PATH "C:\\Program Files (x86)\\AMD\\clAmdBlas" )
+      endif()
+    endif()
+    set( CLAMDBLAS_INCLUDE_SEARCH_PATH ${CLAMDBLAS_SEARCH_PATH}/include )
+    if(UNIX)
+      if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+        set(CLAMDBLAS_LIB_SEARCH_PATH /usr/lib)
+      else()
+        set(CLAMDBLAS_LIB_SEARCH_PATH /usr/lib64)
+      endif()
+    else()
+      if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+        set(CLAMDBLAS_LIB_SEARCH_PATH ${CLAMDBLAS_SEARCH_PATH}\\lib32\\import)
+      else()
+        set(CLAMDBLAS_LIB_SEARCH_PATH ${CLAMDBLAS_SEARCH_PATH}\\lib64\\import)
+      endif()
+    endif()
+    find_path(CLAMDBLAS_INCLUDE_DIR
+      NAMES clAmdBlas.h
+      PATHS ${CLAMDBLAS_INCLUDE_SEARCH_PATH}
+      PATH_SUFFIXES clAmdBlas
+      NO_DEFAULT_PATH)
+    find_library(CLAMDBLAS_LIBRARY
+      NAMES clAmdBlas
+      PATHS ${CLAMDBLAS_LIB_SEARCH_PATH}
+      NO_DEFAULT_PATH)
+    if(CLAMDBLAS_LIBRARY)
+      set(CLAMDBLAS_LIBRARIES ${CLAMDBLAS_LIBRARY})
+    else()
+      set(CLAMDBLAS_LIBRARIES "")
+    endif()
+  endif()
+  # Try AMD/ATI Stream SDK
+  if (NOT OPENCL_FOUND)
+    set(ENV_AMDSTREAMSDKROOT $ENV{AMDAPPSDKROOT})
+    set(ENV_AMDAPPSDKROOT $ENV{AMDAPPSDKROOT})
+    set(ENV_OPENCLROOT $ENV{OPENCLROOT})
+    set(ENV_CUDA_PATH $ENV{CUDA_PATH})
+    if(ENV_AMDSTREAMSDKROOT)
+      set(OPENCL_INCLUDE_SEARCH_PATH ${ENV_AMDAPPSDKROOT}/include)
+      if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+        set(OPENCL_LIB_SEARCH_PATH ${OPENCL_LIB_SEARCH_PATH} ${ENV_AMDAPPSDKROOT}/lib/x86)
+      else()
+        set(OPENCL_LIB_SEARCH_PATH ${OPENCL_LIB_SEARCH_PATH} ${ENV_AMDAPPSDKROOT}/lib/x86_64)
+      endif()
+    elseif(ENV_AMDSTREAMSDKROOT)
+      set(OPENCL_INCLUDE_SEARCH_PATH ${ENV_AMDSTREAMSDKROOT}/include)
+      if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+        set(OPENCL_LIB_SEARCH_PATH ${OPENCL_LIB_SEARCH_PATH} ${ENV_AMDSTREAMSDKROOT}/lib/x86)
+      else()
+        set(OPENCL_LIB_SEARCH_PATH ${OPENCL_LIB_SEARCH_PATH} ${ENV_AMDSTREAMSDKROOT}/lib/x86_64)
+      endif()
+    elseif(ENV_CUDA_PATH AND WIN32)
+      set(OPENCL_INCLUDE_SEARCH_PATH ${ENV_CUDA_PATH}/include)
+      if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+        set(OPENCL_LIB_SEARCH_PATH ${OPENCL_LIB_SEARCH_PATH} ${ENV_CUDA_PATH}/lib/Win32)
+      else()
+        set(OPENCL_LIB_SEARCH_PATH ${OPENCL_LIB_SEARCH_PATH} ${ENV_CUDA_PATH}/lib/x64)
+      endif()
+    elseif(ENV_OPENCLROOT AND UNIX)
+      set(OPENCL_INCLUDE_SEARCH_PATH ${ENV_OPENCLROOT}/inc)
+      if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+        set(OPENCL_LIB_SEARCH_PATH ${OPENCL_LIB_SEARCH_PATH} /usr/lib)
+      else()
+        set(OPENCL_LIB_SEARCH_PATH ${OPENCL_LIB_SEARCH_PATH} /usr/lib64)
+      endif()
+    endif()
+
+    if(OPENCL_INCLUDE_SEARCH_PATH)
+      find_path(OPENCL_INCLUDE_DIR
+        NAMES CL/cl.h OpenCL/cl.h
+        PATHS ${OPENCL_INCLUDE_SEARCH_PATH}
+        NO_DEFAULT_PATH)
+    else()
+      find_path(OPENCL_INCLUDE_DIR
+        NAMES CL/cl.h OpenCL/cl.h)
+    endif()
+
+    if(OPENCL_LIB_SEARCH_PATH)
+      find_library(OPENCL_LIBRARY NAMES OpenCL PATHS ${OPENCL_LIB_SEARCH_PATH} NO_DEFAULT_PATH)
+    else()
+      find_library(OPENCL_LIBRARY NAMES OpenCL)
+    endif()
+
+    include(FindPackageHandleStandardArgs)
+    find_package_handle_standard_args(
+      OPENCL
+      DEFAULT_MSG
+      OPENCL_LIBRARY OPENCL_INCLUDE_DIR
+      )
+
+    if(OPENCL_FOUND)
+      set(OPENCL_LIBRARIES ${OPENCL_LIBRARY})
+      set(HAVE_OPENCL 1)
+    else()
+      set(OPENCL_LIBRARIES)
+    endif()
+  else()
+    set(HAVE_OPENCL 1)
+  endif()
 endif()
@@ -1,4 +1,4 @@
-if(ANDROID AND NOT MIPS)
+if(BUILD_TBB)
  add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/tbb")
  include_directories(SYSTEM ${TBB_INCLUDE_DIRS})
  set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} tbb)
@@ -22,7 +22,7 @@ endif()

 if(NOT HAVE_TBB)
  set(TBB_DEFAULT_INCLUDE_DIRS
-    "/opt/intel/tbb" "/usr/local/include" "/usr/include"
+    "/opt/intel/tbb/include" "/usr/local/include" "/usr/include"
    "C:/Program Files/Intel/TBB" "C:/Program Files (x86)/Intel/TBB"
    "C:/Program Files (x86)/tbb/include"
    "C:/Program Files (x86)/tbb/include"
@@ -16,7 +16,7 @@ endif()
 # Source package, for "make package_source"
 # ----------------------------------------------------------------------------
 if(BUILD_PACKAGE)
-  set(TARBALL_NAME "${CMAKE_PROJECT_NAME}-${OPENCV_VERSION_MAJOR}.${OPENCV_VERSION_MINOR}.${OPENCV_VERSION_PATCH}")
+  set(TARBALL_NAME "${CMAKE_PROJECT_NAME}-${OPENCV_VERSION}")
  if (NOT WIN32)
    if(APPLE)
      set(TAR_CMD gnutar)
@@ -85,11 +85,12 @@ if(WITH_XINE)
 endif(WITH_XINE)

 # --- V4L ---
-ocv_clear_vars(HAVE_LIBV4L HAVE_CAMV4L HAVE_CAMV4L2)
+ocv_clear_vars(HAVE_LIBV4L HAVE_CAMV4L HAVE_CAMV4L2 HAVE_VIDEOIO)
 if(WITH_V4L)
  CHECK_MODULE(libv4l1 HAVE_LIBV4L)
  CHECK_INCLUDE_FILE(linux/videodev.h HAVE_CAMV4L)
  CHECK_INCLUDE_FILE(linux/videodev2.h HAVE_CAMV4L2)
+  CHECK_INCLUDE_FILE(sys/videoio.h HAVE_VIDEOIO)
 endif(WITH_V4L)

 # --- OpenNI ---
@@ -164,6 +164,9 @@ macro(ocv_module_disable module)
  set(HAVE_${__modname} OFF CACHE INTERNAL "Module ${__modname} can not be built in current configuration")
  set(OPENCV_MODULE_${__modname}_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}" CACHE INTERNAL "Location of ${__modname} module sources")
  set(OPENCV_MODULES_DISABLED_FORCE "${OPENCV_MODULES_DISABLED_FORCE}" CACHE INTERNAL "List of OpenCV modules which can not be build in current configuration")
+  if(BUILD_${__modname})
+    # touch variable controlling build of the module to suppress "unused variable" CMake warning
+  endif()
  unset(__modname)
  return() # leave the current folder
 endmacro()
@@ -171,6 +174,7 @@ endmacro()

 # Internal macro; partly disables OpenCV module
 macro(__ocv_module_turn_off the_module)
+  list(REMOVE_ITEM OPENCV_MODULES_DISABLED_AUTO "${the_module}")
  list(APPEND OPENCV_MODULES_DISABLED_AUTO "${the_module}")
  list(REMOVE_ITEM OPENCV_MODULES_BUILD "${the_module}")
  list(REMOVE_ITEM OPENCV_MODULES_PUBLIC "${the_module}")
@@ -190,7 +194,7 @@ macro(__ocv_flatten_module_required_dependencies the_module)
      break()
    elseif(";${OPENCV_MODULES_DISABLED_USER};${OPENCV_MODULES_DISABLED_AUTO};" MATCHES ";${__dep};")
      __ocv_module_turn_off(${the_module}) # depends on disabled module
-      break()
+      list(APPEND __flattened_deps "${__dep}")
    elseif(";${OPENCV_MODULES_BUILD};" MATCHES ";${__dep};")
      if(";${__resolved_deps};" MATCHES ";${__dep};")
        list(APPEND __flattened_deps "${__dep}") # all dependencies of this module are already resolved
@@ -259,6 +263,7 @@ macro(__ocv_flatten_module_dependencies)
  foreach(m ${OPENCV_MODULES_BUILD})
    set(HAVE_${m} ON CACHE INTERNAL "Module ${m} will be built in current configuration")
    __ocv_flatten_module_required_dependencies(${m})
+    set(OPENCV_MODULE_${m}_DEPS ${OPENCV_MODULE_${m}_DEPS} CACHE INTERNAL "Flattened required dependencies of ${m} module")
  endforeach()

  foreach(m ${OPENCV_MODULES_BUILD})
@@ -283,7 +288,7 @@ macro(__ocv_flatten_module_dependencies)
  ocv_list_unique(OPENCV_MODULES_BUILD_)

  set(OPENCV_MODULES_PUBLIC        ${OPENCV_MODULES_PUBLIC}        CACHE INTERNAL "List of OpenCV modules marked for export")
-  set(OPENCV_MODULES_BUILD         ${OPENCV_MODULES_BUILD_}         CACHE INTERNAL "List of OpenCV modules included into the build")
+  set(OPENCV_MODULES_BUILD         ${OPENCV_MODULES_BUILD_}        CACHE INTERNAL "List of OpenCV modules included into the build")
  set(OPENCV_MODULES_DISABLED_AUTO ${OPENCV_MODULES_DISABLED_AUTO} CACHE INTERNAL "List of OpenCV modules implicitly disabled due to dependencies")
 endmacro()

@@ -456,6 +461,7 @@ macro(ocv_create_module)
    OUTPUT_NAME "${the_module}${OPENCV_DLLVERSION}"
    DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
    ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
+    LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
    RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
    INSTALL_NAME_DIR lib
  )
@@ -465,7 +471,7 @@ macro(ocv_create_module)
    # Android SDK build scripts can include only .so files into final .apk
    # As result we should not set version properties for Android
    set_target_properties(${the_module} PROPERTIES
-      VERSION ${OPENCV_VERSION}
+      VERSION ${OPENCV_LIBVERSION}
      SOVERSION ${OPENCV_SOVERSION}
    )
  endif()
@@ -19,7 +19,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
        ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
        OUTPUT_VARIABLE gcc_compiler_version)
    #MESSAGE("GCC Version: ${gcc_compiler_version}")
-    IF(gcc_compiler_version MATCHES "4\\.[0,2-9]\\.[0-9x]")
+    IF(gcc_compiler_version VERSION_GREATER "4.2.-1")
        SET(PCHSupport_FOUND TRUE)
    ENDIF()

@@ -64,6 +64,13 @@ MACRO(ocv_check_compiler_flag LANG FLAG RESULT)
      else()
        FILE(WRITE "${_fname}" "#pragma\nint main(void) { return 0; }\n")
      endif()
+    elseif("_${LANG}_" MATCHES "_OBJCXX_")
+      set(_fname "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.mm")
+      if("${CMAKE_CXX_FLAGS} ${FLAG} " MATCHES "-Werror " OR "${CMAKE_CXX_FLAGS} ${FLAG} " MATCHES "-Werror=unknown-pragmas ")
+        FILE(WRITE "${_fname}" "int main() { return 0; }\n")
+      else()
+        FILE(WRITE "${_fname}" "#pragma\nint main() { return 0; }\n")
+      endif()
    else()
      unset(_fname)
    endif()
@@ -100,6 +107,8 @@ macro(ocv_check_flag_support lang flag varname)
    set(_lang CXX)
  elseif("_${lang}_" MATCHES "_C_")
    set(_lang C)
+  elseif("_${lang}_" MATCHES "_OBJCXX_")
+    set(_lang OBJCXX)
  else()
    set(_lang ${lang})
  endif()
@@ -1,12 +1,18 @@
 SET(OPENCV_VERSION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/modules/core/include/opencv2/core/version.hpp")
-FILE(STRINGS "${OPENCV_VERSION_FILE}" OPENCV_VERSION_PARTS REGEX "#define CV_.+OR_VERSION[ ]+[0-9]+" )
+FILE(STRINGS "${OPENCV_VERSION_FILE}" OPENCV_VERSION_PARTS REGEX "#define CV_VERSION_[A-Z]+[ ]+[0-9]+" )

-string(REGEX REPLACE ".+CV_MAJOR_VERSION[ ]+([0-9]+).*" "\\1" OPENCV_VERSION_MAJOR "${OPENCV_VERSION_PARTS}")
-string(REGEX REPLACE ".+CV_MINOR_VERSION[ ]+([0-9]+).*" "\\1" OPENCV_VERSION_MINOR "${OPENCV_VERSION_PARTS}")
-string(REGEX REPLACE ".+CV_SUBMINOR_VERSION[ ]+([0-9]+).*" "\\1" OPENCV_VERSION_PATCH "${OPENCV_VERSION_PARTS}")
+string(REGEX REPLACE ".+CV_VERSION_EPOCH[ ]+([0-9]+).*" "\\1" OPENCV_VERSION_MAJOR "${OPENCV_VERSION_PARTS}")
+string(REGEX REPLACE ".+CV_VERSION_MAJOR[ ]+([0-9]+).*" "\\1" OPENCV_VERSION_MINOR "${OPENCV_VERSION_PARTS}")
+string(REGEX REPLACE ".+CV_VERSION_MINOR[ ]+([0-9]+).*" "\\1" OPENCV_VERSION_PATCH "${OPENCV_VERSION_PARTS}")
+string(REGEX REPLACE ".+CV_VERSION_REVISION[ ]+([0-9]+).*" "\\1" OPENCV_VERSION_TWEAK "${OPENCV_VERSION_PARTS}")
+
+set(OPENCV_VERSION "${OPENCV_VERSION_MAJOR}.${OPENCV_VERSION_MINOR}.${OPENCV_VERSION_PATCH}")
+if(OPENCV_VERSION_TWEAK GREATER 0)
+  set(OPENCV_VERSION "${OPENCV_VERSION}.${OPENCV_VERSION_TWEAK}")
+endif()

-set(OPENCV_VERSION "${OPENCV_VERSION_MAJOR}.${OPENCV_VERSION_MINOR}.${OPENCV_VERSION_PATCH}.1")
 set(OPENCV_SOVERSION "${OPENCV_VERSION_MAJOR}.${OPENCV_VERSION_MINOR}")
+set(OPENCV_LIBVERSION "${OPENCV_VERSION_MAJOR}.${OPENCV_VERSION_MINOR}.${OPENCV_VERSION_PATCH}")

 # create a dependency on version file
 # we never use output of the following command but cmake will rerun automatically if the version file changes
@@ -89,14 +89,20 @@ define add_opencv_camera_module
    include $(PREBUILT_SHARED_LIBRARY)
 endef

-ifeq ($(OPENCV_INSTALL_MODULES),on)
-$(foreach module,$(OPENCV_LIBS),$(eval $(call add_opencv_module,$(module))))
-endif
-$(foreach module,$(OPENCV_3RDPARTY_COMPONENTS),$(eval $(call add_opencv_3rdparty_component,$(module))))
-$(foreach module,$(OPENCV_CAMERA_MODULES),$(eval $(call add_opencv_camera_module,$(module))))
+ifeq ($(OPENCV_MK_ALREADY_INCLUDED),)
+    ifeq ($(OPENCV_INSTALL_MODULES),on)
+        $(foreach module,$(OPENCV_LIBS),$(eval $(call add_opencv_module,$(module))))
+    endif

-ifneq ($(OPENCV_BASEDIR),)
-    OPENCV_LOCAL_C_INCLUDES += $(foreach mod, $(OPENCV_MODULES), $(OPENCV_BASEDIR)/modules/$(mod)/include)
+    $(foreach module,$(OPENCV_3RDPARTY_COMPONENTS),$(eval $(call add_opencv_3rdparty_component,$(module))))
+    $(foreach module,$(OPENCV_CAMERA_MODULES),$(eval $(call add_opencv_camera_module,$(module))))
+
+    ifneq ($(OPENCV_BASEDIR),)
+        OPENCV_LOCAL_C_INCLUDES += $(foreach mod, $(OPENCV_MODULES), $(OPENCV_BASEDIR)/modules/$(mod)/include)
+    endif
+
+    #turn off module installation to prevent their redefinition
+    OPENCV_MK_ALREADY_INCLUDED:=on
 endif

 ifeq ($(OPENCV_LOCAL_CFLAGS),)
@@ -22,10 +22,11 @@
 #      - OpenCV_INCLUDE_DIRS             : The OpenCV include directories.
 #      - OpenCV_COMPUTE_CAPABILITIES     : The version of compute capability
 #      - OpenCV_ANDROID_NATIVE_API_LEVEL : Minimum required level of Android API
-#      - OpenCV_VERSION                  : The version of this OpenCV build. Example: "@OPENCV_VERSION@"
-#      - OpenCV_VERSION_MAJOR            : Major version part of OpenCV_VERSION. Example: "@OPENCV_VERSION_MAJOR@"
-#      - OpenCV_VERSION_MINOR            : Minor version part of OpenCV_VERSION. Example: "@OPENCV_VERSION_MINOR@"
-#      - OpenCV_VERSION_PATCH            : Patch version part of OpenCV_VERSION. Example: "@OPENCV_VERSION_PATCH@"
+#      - OpenCV_VERSION                  : The version of this OpenCV build: "@OPENCV_VERSION@"
+#      - OpenCV_VERSION_MAJOR            : Major version part of OpenCV_VERSION: "@OPENCV_VERSION_MAJOR@"
+#      - OpenCV_VERSION_MINOR            : Minor version part of OpenCV_VERSION: "@OPENCV_VERSION_MINOR@"
+#      - OpenCV_VERSION_PATCH            : Patch version part of OpenCV_VERSION: "@OPENCV_VERSION_PATCH@"
+#      - OpenCV_VERSION_TWEAK            : Tweak version part of OpenCV_VERSION: "@OPENCV_VERSION_TWEAK@"
 #
 #    Advanced variables:
 #      - OpenCV_SHARED
@@ -41,8 +42,9 @@
 set(OpenCV_COMPUTE_CAPABILITIES @OpenCV_CUDA_CC_CONFIGCMAKE@)

 set(OpenCV_CUDA_VERSION @OpenCV_CUDA_VERSION@)
-set(OpenCV_USE_CUBLAS @HAVE_CUBLAS@)
-set(OpenCV_USE_CUFFT  @HAVE_CUFFT@)
+set(OpenCV_USE_CUBLAS   @HAVE_CUBLAS@)
+set(OpenCV_USE_CUFFT    @HAVE_CUFFT@)
+set(OpenCV_USE_NVCUVID  @HAVE_NVCUVID@)

 # Android API level from which OpenCV has been compiled is remembered
 set(OpenCV_ANDROID_NATIVE_API_LEVEL @OpenCV_ANDROID_NATIVE_API_LEVEL_CONFIGCMAKE@)
@@ -99,6 +101,7 @@ SET(OpenCV_VERSION @OPENCV_VERSION@)
 SET(OpenCV_VERSION_MAJOR  @OPENCV_VERSION_MAJOR@)
 SET(OpenCV_VERSION_MINOR  @OPENCV_VERSION_MINOR@)
 SET(OpenCV_VERSION_PATCH  @OPENCV_VERSION_PATCH@)
+SET(OpenCV_VERSION_TWEAK  @OPENCV_VERSION_TWEAK@)

 # ====================================================================
 # Link libraries: e.g.   libopencv_core.so, opencv_imgproc220d.lib, etc...
@@ -183,7 +186,7 @@ set(OpenCV_FIND_COMPONENTS ${OpenCV_FIND_COMPONENTS_})
 #  Resolve dependencies
 # ==============================================================
 if(OpenCV_USE_MANGLED_PATHS)
-  set(OpenCV_LIB_SUFFIX ".${OpenCV_VERSION}")
+  set(OpenCV_LIB_SUFFIX ".${OpenCV_VERSION_MAJOR}.${OpenCV_VERSION_MINOR}.${OpenCV_VERSION_PATCH}")
 else()
  set(OpenCV_LIB_SUFFIX "")
 endif()
@@ -216,17 +219,22 @@ foreach(__opttype OPT DBG)
  else()
    #TODO: duplicates are annoying but they should not be the problem
  endif()
-  # fix hard coded paths for CUDA libraries under Windows
-  if(WIN32 AND OpenCV_CUDA_VERSION AND NOT OpenCV_SHARED)
+  
+  # CUDA
+  if(OpenCV_CUDA_VERSION AND (CARMA OR (WIN32 AND NOT OpenCV_SHARED)))
    if(NOT CUDA_FOUND)
      find_package(CUDA ${OpenCV_CUDA_VERSION} EXACT REQUIRED)
    else()
      if(NOT CUDA_VERSION_STRING VERSION_EQUAL OpenCV_CUDA_VERSION)
-        message(FATAL_ERROR "OpenCV static library compiled with CUDA ${OpenCV_CUDA_VERSION} support. Please, use the same version or rebuild OpenCV with CUDA ${CUDA_VERSION_STRING}")
+        if(WIN32)
+          message(FATAL_ERROR "OpenCV static library was compiled with CUDA ${OpenCV_CUDA_VERSION} support. Please, use the same version or rebuild OpenCV with CUDA ${CUDA_VERSION_STRING}")
+        else()
+          message(FATAL_ERROR "OpenCV library for CARMA was compiled with CUDA ${OpenCV_CUDA_VERSION} support. Please, use the same version or rebuild OpenCV with CUDA ${CUDA_VERSION_STRING}")
+        endif()
      endif()
    endif()

-    list(APPEND OpenCV_EXTRA_LIBS_${__opttype} ${CUDA_LIBRARIES} ${CUDA_npp_LIBRARY} ${CUDA_nvcuvid_LIBRARY} ${CUDA_nvcuvenc_LIBRARY})
+    list(APPEND OpenCV_EXTRA_LIBS_${__opttype} ${CUDA_LIBRARIES} ${CUDA_npp_LIBRARY})

    if(OpenCV_USE_CUBLAS)
      list(APPEND OpenCV_EXTRA_LIBS_${__opttype} ${CUDA_CUBLAS_LIBRARIES})
@@ -236,6 +244,13 @@ foreach(__opttype OPT DBG)
      list(APPEND OpenCV_EXTRA_LIBS_${__opttype} ${CUDA_CUFFT_LIBRARIES})
    endif()

+    if(OpenCV_USE_NVCUVID)
+      list(APPEND OpenCV_EXTRA_LIBS_${__opttype} ${CUDA_nvcuvid_LIBRARIES})
+    endif()
+
+    if(WIN32)
+      list(APPEND OpenCV_EXTRA_LIBS_${__opttype} ${CUDA_nvcuvenc_LIBRARIES})
+    endif()
  endif()
 endforeach()

@@ -19,6 +19,9 @@
 /* V4L2 capturing support */
 #cmakedefine HAVE_CAMV4L2

+/* V4L2 capturing support in videoio.h */
+#cmakedefine HAVE_VIDEOIO
+
 /* V4L/V4L2 capturing support via libv4l */
 #cmakedefine HAVE_LIBV4L

@@ -175,21 +178,15 @@
 /* NVidia Cuda Runtime API*/
 #cmakedefine HAVE_CUDA

-/* OpenCL Support */
-#cmakedefine HAVE_OPENCL
-
-/* AMD's OpenCL Fast Fourier Transform Library*/
-#cmakedefine HAVE_CLAMDFFT
-
-/* AMD's Basic Linear Algebra Subprograms Library*/
-#cmakedefine HAVE_CLAMDBLAS
-
 /* NVidia Cuda Fast Fourier Transform (FFT) API*/
 #cmakedefine HAVE_CUFFT

 /* NVidia Cuda Basic Linear Algebra Subprograms (BLAS) API*/
 #cmakedefine HAVE_CUBLAS

+/* NVidia Video Decoding API*/
+#cmakedefine HAVE_NVCUVID
+
 /* Compile for 'real' NVIDIA GPU architectures */
 #define CUDA_ARCH_BIN "${OPENCV_CUDA_ARCH_BIN}"

@@ -202,6 +199,15 @@
 /* Create PTX or BIN for 1.0 compute capability */
 #cmakedefine CUDA_ARCH_BIN_OR_PTX_10

+/* OpenCL Support */
+#cmakedefine HAVE_OPENCL
+
+/* AMD's OpenCL Fast Fourier Transform Library*/
+#cmakedefine HAVE_CLAMDFFT
+
+/* AMD's Basic Linear Algebra Subprograms Library*/
+#cmakedefine HAVE_CLAMDBLAS
+
 /* VideoInput library */
 #cmakedefine HAVE_VIDEOINPUT

@@ -2,8 +2,6 @@
 #  CMake file for OpenCV docs
 #

-file(GLOB FILES_DOC *.htm *.txt *.jpg *.png *.pdf)
-file(GLOB FILES_DOC_VS vidsurv/*.doc)
 file(GLOB FILES_TEX *.tex *.sty *.bib)
 file(GLOB FILES_TEX_PICS pics/*.png pics/*.jpg)

@@ -11,6 +9,14 @@ if(BUILD_DOCS AND HAVE_SPHINX)

  project(opencv_docs)

+  set(DOC_LIST "${OpenCV_SOURCE_DIR}/doc/opencv-logo.png" "${OpenCV_SOURCE_DIR}/doc/opencv-logo2.png"
+               "${OpenCV_SOURCE_DIR}/doc/opencv-logo-white.png" "${OpenCV_SOURCE_DIR}/doc/opencv.ico"
+               "${OpenCV_SOURCE_DIR}/doc/haartraining.htm" "${OpenCV_SOURCE_DIR}/doc/license.txt"
+               "${OpenCV_SOURCE_DIR}/doc/pattern.png" "${OpenCV_SOURCE_DIR}/doc/acircles_pattern.png")
+
+  set(OPTIONAL_DOC_LIST "")
+
+
  set(OPENCV2_BASE_MODULES core imgproc highgui video calib3d features2d objdetect ml flann gpu photo stitching nonfree contrib legacy)

  # build lists of modules to be documented
@@ -54,7 +60,7 @@ if(BUILD_DOCS AND HAVE_SPHINX)

  configure_file("${OpenCV_SOURCE_DIR}/modules/refman.rst.in" "${OpenCV_SOURCE_DIR}/modules/refman.rst" IMMEDIATE @ONLY)

-  file(GLOB_RECURSE OPENCV_FILES_UG user_guide/*.rst)
+  file(GLOB_RECURSE OPENCV_FILES_UG  user_guide/*.rst)
  file(GLOB_RECURSE OPENCV_FILES_TUT tutorials/*.rst)
  file(GLOB_RECURSE OPENCV_FILES_TUT_PICT tutorials/*.png tutorials/*.jpg)

@@ -68,19 +74,29 @@ if(BUILD_DOCS AND HAVE_SPHINX)
      COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/mymath.sty ${CMAKE_CURRENT_BINARY_DIR}
      COMMAND ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/patch_refman_latex.py" opencv2refman.tex
      COMMAND ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/patch_refman_latex.py" opencv2manager.tex
-      COMMAND ${PDFLATEX_COMPILER} opencv2refman.tex
-      COMMAND ${PDFLATEX_COMPILER} opencv2refman.tex
-      COMMAND ${PDFLATEX_COMPILER} opencv2manager.tex
-      COMMAND ${PDFLATEX_COMPILER} opencv2manager.tex
-      COMMAND ${PDFLATEX_COMPILER} opencv_user.tex
-      COMMAND ${PDFLATEX_COMPILER} opencv_user.tex
-      COMMAND ${PDFLATEX_COMPILER} opencv_tutorials.tex
-      COMMAND ${PDFLATEX_COMPILER} opencv_tutorials.tex
+      COMMAND ${CMAKE_COMMAND} -E echo "Generating opencv2refman.pdf"
+      COMMAND ${PDFLATEX_COMPILER} -interaction=batchmode opencv2refman.tex
+      COMMAND ${PDFLATEX_COMPILER} -interaction=batchmode opencv2refman.tex
+      COMMAND ${CMAKE_COMMAND} -E echo "Generating opencv2manager.pdf"
+      COMMAND ${PDFLATEX_COMPILER} -interaction=batchmode opencv2manager.tex
+      COMMAND ${PDFLATEX_COMPILER} -interaction=batchmode opencv2manager.tex
+      COMMAND ${CMAKE_COMMAND} -E echo "Generating opencv_user.pdf"
+      COMMAND ${PDFLATEX_COMPILER} -interaction=batchmode opencv_user.tex
+      COMMAND ${PDFLATEX_COMPILER} -interaction=batchmode opencv_user.tex
+      COMMAND ${CMAKE_COMMAND} -E echo "Generating opencv_tutorials.pdf"
+      COMMAND ${PDFLATEX_COMPILER} -interaction=batchmode opencv_tutorials.tex
+      COMMAND ${PDFLATEX_COMPILER} -interaction=batchmode opencv_tutorials.tex
+      COMMAND ${CMAKE_COMMAND} -E echo "Generating opencv_cheatsheet.pdf"
+      COMMAND ${PDFLATEX_COMPILER} -interaction=batchmode "${CMAKE_CURRENT_SOURCE_DIR}/opencv_cheatsheet.tex"
+      COMMAND ${PDFLATEX_COMPILER} -interaction=batchmode "${CMAKE_CURRENT_SOURCE_DIR}/opencv_cheatsheet.tex"
      DEPENDS ${OPENCV_DOC_DEPS}
      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
      COMMENT "Generating the PDF Manuals"
      )

+    LIST(APPEND OPTIONAL_DOC_LIST "${CMAKE_BINARY_DIR}/doc/opencv2refman.pdf" "${CMAKE_BINARY_DIR}/doc/opencv2manager.pdf"
+          "${CMAKE_BINARY_DIR}/doc/opencv_user.pdf" "${CMAKE_BINARY_DIR}/doc/opencv_tutorials.pdf" "${CMAKE_BINARY_DIR}/doc/opencv_cheatsheet.pdf")
+
    if(ENABLE_SOLUTION_FOLDERS)
      set_target_properties(docs PROPERTIES FOLDER "documentation")
    endif()
@@ -97,7 +113,13 @@ if(BUILD_DOCS AND HAVE_SPHINX)
  if(ENABLE_SOLUTION_FOLDERS)
    set_target_properties(html_docs PROPERTIES FOLDER "documentation")
  endif()
-endif()

-install(FILES ${FILES_DOC} DESTINATION "${OPENCV_DOC_INSTALL_PATH}" COMPONENT main)
-install(FILES ${FILES_DOC_VS} DESTINATION "${OPENCV_DOC_INSTALL_PATH}/vidsurv" COMPONENT main)
+  foreach(f ${DOC_LIST})
+    install(FILES "${f}" DESTINATION "${OPENCV_DOC_INSTALL_PATH}" COMPONENT main)
+  endforeach()
+
+  foreach(f ${OPTIONAL_DOC_LIST})
+    install(FILES "${f}" DESTINATION "${OPENCV_DOC_INSTALL_PATH}" OPTIONAL)
+  endforeach()
+
+endif()
@@ -394,4 +394,12 @@ div.body ul.search li {
 div.linenodiv {
    min-width: 1em;
    text-align: right;
+}
+
+div.sphinxsidebar #searchbox input[type="text"] {
+    width:auto;
+}
+
+div.sphinxsidebar #searchbox input[type="submit"] {
+    width:auto;
 }
@@ -116,6 +116,8 @@ def compareSignatures(f, s):
        sarg = arg[1]
        ftype = re.sub(r"\b(cv|std)::", "", (farg[0] or ""))
        stype = re.sub(r"\b(cv|std)::", "", (sarg[0] or ""))
+        ftype = re.sub(r"\s+(\*|&)$", "\\1", ftype)
+        stype = re.sub(r"\s+(\*|&)$", "\\1", stype)
        if ftype != stype:
            return False, "type of argument #" + str(idx+1) + " mismatch"
        fname = farg[1] or "arg" + str(idx)
@@ -151,6 +153,7 @@ def formatSignature(s):
            if idx > 0:
                _str += ", "
            argtype = re.sub(r"\bcv::", "", arg[0])
+            argtype = re.sub(r"\s+(\*|&)$", "\\1", arg[0])
            bidx = argtype.find('[')
            if bidx < 0:
                _str += argtype + " "
@@ -44,21 +44,24 @@ master_doc = 'index'

 # General information about the project.
 project = u'OpenCV'
-copyright = u'2011-2012, opencv dev team'
+copyright = u'2011-2013, opencv dev team'

 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.

 version_file = open("../modules/core/include/opencv2/core/version.hpp", "rt").read()
-version_major = re.search("^W*#\W*define\W+CV_MAJOR_VERSION\W+(\d+)\W*$", version_file, re.MULTILINE).group(1)
-version_minor = re.search("^W*#\W*define\W+CV_MINOR_VERSION\W+(\d+)\W*$", version_file, re.MULTILINE).group(1)
-version_patch = re.search("^W*#\W*define\W+CV_SUBMINOR_VERSION\W+(\d+)\W*$", version_file, re.MULTILINE).group(1)
+version_epoch = re.search("^W*#\W*define\W+CV_VERSION_EPOCH\W+(\d+)\W*$", version_file, re.MULTILINE).group(1)
+version_major = re.search("^W*#\W*define\W+CV_VERSION_MAJOR\W+(\d+)\W*$", version_file, re.MULTILINE).group(1)
+version_minor = re.search("^W*#\W*define\W+CV_VERSION_MINOR\W+(\d+)\W*$", version_file, re.MULTILINE).group(1)
+version_patch = re.search("^W*#\W*define\W+CV_VERSION_REVISION\W+(\d+)\W*$", version_file, re.MULTILINE).group(1)

 # The short X.Y version.
-version = version_major + '.' + version_minor
+version = version_epoch + '.' + version_major
 # The full version, including alpha/beta/rc tags.
-release = version_major + '.' + version_minor + '.' + version_patch
+release = version_epoch + '.' + version_major + '.' + version_minor
+if version_patch:
+    release = release + '.' + version_patch

 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -67,6 +67,7 @@
 \usepackage[pdftex]{color,graphicx}
 \usepackage[landscape]{geometry}
 \usepackage{hyperref}
+\usepackage[T1]{fontenc}
 \hypersetup{colorlinks=true, filecolor=black, linkcolor=black, urlcolor=blue, citecolor=black}
 \graphicspath{{./images/}}

@@ -214,7 +215,7 @@
 \> \texttt{for(int y = 1; y < image.rows-1; y++) \{}\\
 \> \> \texttt{Vec3b* prevRow = image.ptr<Vec3b>(y-1);}\\
 \> \> \texttt{Vec3b* nextRow = image.ptr<Vec3b>(y+1);}\\
-\> \> \texttt{for(int x = 0; y < image.cols; x++)}\\
+\> \> \texttt{for(int x = 0; x < image.cols; x++)}\\
 \> \> \> \texttt{for(int c = 0; c < 3; c++)}\\
 \> \> \> \texttt{  dyImage.at<Vec3b>(y,x)[c] =}\\
 \> \> \> \texttt{    saturate\_cast<uchar>(}\\
@@ -6,26 +6,28 @@ Mat - The Basic Image Container
 Goal
 ====

-We have multiple ways to acquire digital images from the real world: digital cameras, scanners, computed tomography or magnetic resonance imaging to just name a few. In every case what we (humans) see are images. However, when transforming this to our digital devices what we record are numerical values for each of the points of the image.
+We have multiple ways to acquire digital images from the real world: digital cameras, scanners, computed tomography, and magnetic resonance imaging to name a few. In every case what we (humans) see are images. However, when transforming this to our digital devices what we record are numerical values for each of the points of the image.

 .. image:: images/MatBasicImageForComputer.jpg
   :alt: A matrix of the mirror of a car
   :align: center

-For example in the above image you can see that the mirror of the care is nothing more than a matrix containing all the intensity values of the pixel points. Now, how we get and store the pixels values may vary according to what fits best our need, in the end all images inside a computer world may be reduced to numerical matrices and some other information's describing the matric itself. *OpenCV* is a computer vision library whose main focus is to process and manipulate these information to find out further ones. Therefore, the first thing you need to learn and get accommodated with is how OpenCV stores and handles images.
+For example in the above image you can see that the mirror of the car is nothing more than a matrix containing all the intensity values of the pixel points. How we get and store the pixels values may vary according to our needs, but in the end all images inside a computer world may be reduced to numerical matrices and other information describing the matrix itself. *OpenCV* is a computer vision library whose main focus is to process and manipulate this information. Therefore, the first thing you need to be familiar with is how OpenCV stores and handles images.

 *Mat*
 =====

-OpenCV has been around ever since 2001. In those days the library was built around a *C* interface. In those days to store the image in the memory they used a C structure entitled *IplImage*. This is the one you'll see in most of the older tutorials and educational materials. The problem with this is that it brings to the table all the minuses of the C language. The biggest issue is the manual management. It builds on the assumption that the user is responsible for taking care of memory allocation and deallocation. While this is no issue in case of smaller programs once your code base start to grove larger and larger it will be more and more a struggle to handle all this rather than focusing on actually solving your development goal.
+OpenCV has been around since 2001. In those days the library was built around a *C* interface and to store the image in the memory they used a C structure called *IplImage*. This is the one you'll see in most of the older tutorials and educational materials. The problem with this is that it brings to the table all the minuses of the C language. The biggest issue is the manual memory management. It builds on the assumption that the user is responsible for taking care of memory allocation and deallocation. While this is not a problem with smaller programs, once your code base grows it will be more of a struggle to handle all this rather than focusing on solving your development goal.

-Luckily C++ came around and introduced the concept of classes making possible to build another road for the user: automatic memory management (more or less). The good news is that C++ if fully compatible with C so no compatibility issues can arise from making the change. Therefore, OpenCV with its 2.0 version introduced a new C++ interface that by taking advantage of these offers a new way of doing things. A way, in which you do not need to fiddle with memory management; making your code concise (less to write, to achieve more). The only main downside of the C++ interface is that many embedded development systems at the moment support only C. Therefore, unless you are targeting this platform, there's no point on using the *old* methods (unless you're a masochist programmer and you're asking for trouble). 
+Luckily C++ came around and introduced the concept of classes making easier for the user through automatic memory management (more or less). The good news is that C++ is fully compatible with C so no compatibility issues can arise from making the change. Therefore, OpenCV 2.0 introduced a new C++ interface which offered a new way of doing things which means you do not need to fiddle with memory management, making your code concise (less to write, to achieve more). The main downside of the C++ interface is that many embedded development systems at the moment support only C. Therefore, unless you are targeting embedded platforms, there's no point to using the *old* methods (unless you're a masochist programmer and you're asking for trouble). 

-The first thing you need to know about *Mat* is that you no longer need to manually allocate its size and release it as soon as you do not need it. While doing this is still a possibility, most of the OpenCV functions will allocate its output data manually. As a nice bonus if you pass on an already existing *Mat* object, what already has allocated the required space for the matrix, this will be reused. In other words we use at all times only as much memory as much we must to perform the task.
+The first thing you need to know about *Mat* is that you no longer need to manually allocate its memory and release it as soon as you do not need it. While doing this is still a possibility, most of the OpenCV functions will allocate its output data manually. As a nice bonus if you pass on an already existing *Mat* object, which has already  allocated the required space for the matrix, this will be reused. In other words we use at all times only as much memory as we need to perform the task.

-*Mat* is basically a class having two data parts: the matrix header (containing information such as the size of the matrix, the method used for storing, at which address is the matrix stored and so on) and a pointer to the matrix containing the pixel values (may take any dimensionality depending on the method chosen for storing) . The matrix header size is constant. However, the size of the matrix itself may vary from image to image and usually is larger by order of magnitudes. Therefore, when you're passing on images in your program and at some point you need to create a copy of the image the big price you will need to build is for the matrix itself rather than its header. OpenCV is an image processing library. It contains a large collection of image processing functions. To solve a computational challenge most of the time you will end up using multiple functions of the library. Due to this passing on images to functions is a common practice. We should not forget that we are talking about image processing algorithms, which tend to be quite computational heavy. The last thing we want to do is to further decrease the speed of your program by making unnecessary copies of potentially *large* images.
+*Mat* is basically a class with two data parts: the matrix header (containing information such as the size of the matrix, the method used for storing, at which address is the matrix stored, and so on) and a pointer to the matrix containing the pixel values (taking any dimensionality depending on the method chosen for storing) . The matrix header size is constant, however the size of the matrix itself may vary from image to image and usually is larger by orders of magnitude. 

-To tackle this issue OpenCV uses a reference counting system. The idea is that each *Mat* object has its own header, however the matrix may be shared between two instance of them by having their matrix pointer point to the same address. Moreover, the copy operators **will only copy the headers**, and as also copy the pointer to the large matrix too, however not the matrix itself. 
+OpenCV is an image processing library. It contains a large collection of image processing functions. To solve a computational challenge, most of the time you will end up using multiple functions of the library. Because of this, passing images to functions is a common practice. We should not forget that we are talking about image processing algorithms, which tend to be quite computational heavy. The last thing we want to do is  further decrease the speed of your program by making unnecessary copies of potentially *large* images.
+
+To tackle this issue OpenCV uses a reference counting system. The idea is that each *Mat* object has its own header, however the matrix may be shared between two instance of them by having their matrix pointers point to the same address. Moreover, the copy operators **will only copy the headers** and the pointer to the large matrix, not the data itself. 

 .. code-block:: cpp
   :linenos:
@@ -37,7 +39,7 @@ To tackle this issue OpenCV uses a reference counting system. The idea is that e

   C = A;                                    // Assignment operator

-All the above objects, in the end point to the same single data matrix. Their headers are different, however making any modification using either one of them will affect all the other ones too. In practice the different objects just provide different access method to the same underlying data. Nevertheless, their header parts are different. The real interesting part comes that you can create headers that refer only to a subsection of the full data. For example, to create a region of interest (*ROI*) in an image you just create a new header with the new boundaries: 
+All the above objects, in the end, point to the same single data matrix. Their headers are different, however, and making a modification using any of them will affect all the other ones as well. In practice the different objects just provide different access method to the same underlying data. Nevertheless, their header parts are different. The real interesting part is that you can create headers which refer to only a subsection of the full data. For example, to create a region of interest (*ROI*) in an image you just create a new header with the new boundaries: 

 .. code-block:: cpp
   :linenos:
@@ -45,7 +47,7 @@ All the above objects, in the end point to the same single data matrix. Their he
   Mat D (A, Rect(10, 10, 100, 100) ); // using a rectangle
   Mat E = A(Range:all(), Range(1,3)); // using row and column boundaries 

-Now you may ask if the matrix itself may belong to multiple *Mat* objects who will take responsibility for its cleaning when it's no longer needed. The short answer is: the last object that used it. For this a reference counting mechanism is used. Whenever somebody copies a header of a *Mat* object a counter is increased for the matrix. Whenever a header is cleaned this counter is decreased. When the counter reaches zero the matrix too is freed. Because, sometimes you will still want to copy the matrix itself too, there exists the :basicstructures:`clone() <mat-clone>` or the :basicstructures:`copyTo() <mat-copyto>` function.
+Now you may ask if the matrix itself may belong to multiple *Mat* objects who takes responsibility for cleaning it up when it's no longer needed. The short answer is: the last object that used it. This is handled by using a reference counting mechanism. Whenever somebody copies a header of a *Mat* object, a counter is increased for the matrix. Whenever a header is cleaned this counter is decreased. When the counter reaches zero the matrix too is freed. Sometimes you will want to copy the matrix itself too, so OpenCV provides the :basicstructures:`clone() <mat-clone>` and :basicstructures:`copyTo() <mat-copyto>` functions.

 .. code-block:: cpp
   :linenos:
@@ -59,34 +61,34 @@ Now modifying *F* or *G* will not affect the matrix pointed by the *Mat* header.
 .. container:: enumeratevisibleitemswithsquare

   * Output image allocation for OpenCV functions is automatic (unless specified otherwise).
-   * No need to think about memory freeing with OpenCVs C++ interface.
-   * The assignment operator and the copy constructor (*ctor*)copies only the header.
-   * Use the :basicstructures:`clone()<mat-clone>` or the :basicstructures:`copyTo() <mat-copyto>` function to copy the underlying matrix of an image.
+   * You do not need to think about memory management with OpenCVs C++ interface.
+   * The assignment operator and the copy constructor only copies the header.
+   * The underlying matrix of an image may be copied using the :basicstructures:`clone()<mat-clone>` and :basicstructures:`copyTo() <mat-copyto>` functions.

 *Storing* methods
 ================= 

-This is about how you store the pixel values. You can select the color space and the data type used. The color space refers to how we combine color components in order to code a given color. The simplest one is the gray scale. Here the colors at our disposal are black and white. The combination of these allows us to create many shades of gray. 
+This is about how you store the pixel values. You can select the color space and the data type used. The color space refers to how we combine color components in order to code a given color. The simplest one is the gray scale where the colors at our disposal are black and white. The combination of these allows us to create many shades of gray. 

-For *colorful* ways we have a lot more of methods to choose from. However, every one of them breaks it down to three or four basic components and the combination of this will give all others. The most popular one of this is RGB, mainly because this is also how our eye builds up colors in our eyes. Its base colors are red, green and blue. To code the transparency of a color sometimes a fourth element: alpha (A) is added. 
+For *colorful* ways we have a lot more methods to choose from. Each of them breaks it down to three or four basic components and we can use the combination of these to create the others. The most popular one is RGB, mainly because this is also how our eye builds up colors. Its base colors are red, green and blue. To code the transparency of a color sometimes a fourth element: alpha (A) is added. 

-However, they are many color systems each with their own advantages:
+There are, however, many other color systems each with their own advantages:

 .. container:: enumeratevisibleitemswithsquare

   * RGB is the most common as our eyes use something similar, our display systems also compose colors using these.
-   * The HSV and HLS decompose colors into their hue, saturation and value/luminance components, which is a more natural way for us to describe colors. Using you may for example dismiss the last component, making your algorithm less sensible to light conditions of the input image. 
+   * The HSV and HLS decompose colors into their hue, saturation and value/luminance components, which is a more natural way for us to describe colors.  You might, for example, dismiss the last component, making your algorithm less sensible to the light conditions of the input image. 
   * YCrCb is used by the popular JPEG image format. 
   * CIE L*a*b* is a perceptually uniform color space, which comes handy if you need to measure the *distance* of a given color to another color.

-Now each of the building components has their own valid domains. This leads to the data type used. How we store a component defines just how fine control we have over its domain. The smallest data type possible is *char*, which means one byte or 8 bits. This may be unsigned (so can store values from 0 to 255) or signed (values from -127 to +127). Although in case of three components this already gives 16 million possible colors to represent (like in case of RGB) we may acquire an even finer control by using the float (4 byte = 32 bit) or double (8 byte = 64 bit) data types for each component. Nevertheless, remember that increasing the size of a component also increases the size of the whole picture in the memory.
+Each of the building components has their own valid domains. This leads to the data type used. How we store a component defines the control we have over its domain. The smallest data type possible is *char*, which means one byte or 8 bits. This may be unsigned (so can store values from 0 to 255) or signed (values from -127 to +127). Although in case of three components this already gives 16 million possible colors to represent (like in case of RGB) we may acquire an even finer control by using the float (4 byte = 32 bit) or double (8 byte = 64 bit) data types for each component. Nevertheless, remember that increasing the size of a component also increases the size of the whole picture in the memory.

-Creating explicitly a *Mat* object
+Creating a *Mat* object explicitly
 ==================================

-In the :ref:`Load_Save_Image` tutorial you could already see how to write a matrix to an image file by using the :readWriteImageVideo:` imwrite() <imwrite>` function. However, for debugging purposes it's much more convenient to see the actual values. You can achieve this via the << operator of *Mat*. However, be aware that this only works for two dimensional matrices. 
+In the :ref:`Load_Save_Image` tutorial you have already learned how to write a matrix to an image file by using the :readWriteImageVideo:` imwrite() <imwrite>` function. However, for debugging purposes it's much more convenient to see the actual values. You can do this using the << operator of *Mat*. Be aware that this only works for two dimensional matrices. 

-Although *Mat* is a great class as image container it is also a general matrix class. Therefore, it is possible to create and manipulate multidimensional matrices. You can create a Mat object in multiple ways:
+Although *Mat* works really well as an image container, it is also a general matrix class. Therefore, it is possible to create and manipulate multidimensional matrices. You can create a Mat object in multiple ways:

 .. container:: enumeratevisibleitemswithsquare

@@ -103,13 +105,13 @@ Although *Mat* is a great class as image container it is also a general matrix c

    For two dimensional and multichannel images we first define their size: row and column count wise.

-    Then we need to specify the data type to use for storing the elements and the number of channels per matrix point. To do this we have multiple definitions made according to the following convention: 
+    Then we need to specify the data type to use for storing the elements and the number of channels per matrix point. To do this we have multiple definitions constructed according to the following convention: 

    .. code-block:: cpp

       CV_[The number of bits per item][Signed or Unsigned][Type Prefix]C[The channel number]

-    For instance, *CV_8UC3* means we use unsigned char types that are 8 bit long and each pixel has three items of this to form the three channels. This are predefined for up to four channel numbers. The :basicstructures:`Scalar <scalar>` is four element short vector. Specify this and you can initialize all matrix points with a custom value. However if you need more you can create the type with the upper macro and putting the channel number in parenthesis as you can see below.
+    For instance, *CV_8UC3* means we use unsigned char types that are 8 bit long and each pixel has three of these to form the three channels. This are predefined for up to four channel numbers. The :basicstructures:`Scalar <scalar>` is four element short vector. Specify this and you can initialize all matrix points with a custom value. If you need more you can create the type with the upper macro, setting the channel number in parenthesis as you can see below.

   + Use C\\C++ arrays and initialize via constructor

@@ -118,7 +120,7 @@ Although *Mat* is a great class as image container it is also a general matrix c
        :tab-width: 4
        :lines:  35-36

-     The upper example shows how to create a matrix with more than two dimensions. Specify its dimension, then pass a pointer containing the size for each dimension and the rest remains the same.      
+     The upper example shows how to create a matrix with more than two dimensions. Specify its dimension, then pass a pointer containing the size for each dimension and the rest remains the same.


   + Create a header for an already existing IplImage pointer:
@@ -176,7 +178,7 @@ Although *Mat* is a great class as image container it is also a general matrix c

 .. note:: 

-   You can fill out a matrix with random values using the :operationsOnArrays:`randu() <randu>` function. You need to give the lower and upper value between what you want the random values:
+   You can fill out a matrix with random values using the :operationsOnArrays:`randu() <randu>` function. You need to give the lower and upper value for the random values:

   .. literalinclude:: ../../../../samples/cpp/tutorial_code/core/mat_the_basic_image_container/mat_the_basic_image_container.cpp
      :language: cpp
@@ -184,10 +186,10 @@ Although *Mat* is a great class as image container it is also a general matrix c
      :lines:  57-58


-Print out formatting
-====================
+Output formatting
+=================

-In the above examples you could see the default formatting option. Nevertheless, OpenCV allows you to format your matrix output format to fit the rules of: 
+In the above examples you could see the default formatting option. OpenCV, however, allows you to format your matrix output: 

 .. container:: enumeratevisibleitemswithsquare

@@ -246,10 +248,10 @@ In the above examples you could see the default formatting option. Nevertheless,
        :alt: Default Output
        :align: center

-Print for other common items
+Output of other common items
 ============================

-OpenCV offers support for print of other common OpenCV data structures too via the << operator like:
+OpenCV offers support for output of other common OpenCV data structures too via the << operator:

 .. container:: enumeratevisibleitemswithsquare

@@ -298,9 +300,9 @@ OpenCV offers support for print of other common OpenCV data structures too via t
        :alt: Default Output
        :align: center

-Most of the samples here have been included into a small console application. You can download it from :download:`here <../../../../samples/cpp/tutorial_code/core/mat_the_basic_image_container/mat_the_basic_image_container.cpp>` or in the core section of the cpp samples.
+Most of the samples here have been included in a small console application. You can download it from :download:`here <../../../../samples/cpp/tutorial_code/core/mat_the_basic_image_container/mat_the_basic_image_container.cpp>` or in the core section of the cpp samples.

-A quick video demonstration of this you can find on `YouTube <https://www.youtube.com/watch?v=1tibU7vGWpk>`_.
+You can also find a quick video demonstration of this on `YouTube <https://www.youtube.com/watch?v=1tibU7vGWpk>`_.

 .. raw:: html

@@ -32,6 +32,7 @@ This tutorial code's is shown lines below. You can also download it from `here <
   #include "opencv2/core/core.hpp"
   #include "opencv2/features2d/features2d.hpp"
   #include "opencv2/highgui/highgui.hpp"
+   #include "opencv2/nonfree/features2d.hpp"

   using namespace cv;

@@ -22,127 +22,8 @@ Code

 This tutorial code's is shown lines below. You can also download it from `here <http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/tutorial_code/TrackingMotion/cornerDetector_Demo.cpp>`_

-.. code-block:: cpp
-
-   #include "opencv2/highgui/highgui.hpp"
-   #include "opencv2/imgproc/imgproc.hpp"
-   #include <iostream>
-   #include <stdio.h>
-   #include <stdlib.h>
-
-   using namespace cv;
-   using namespace std;
-
-   /// Global variables
-   Mat src, src_gray;
-   Mat myHarris_dst; Mat myHarris_copy; Mat Mc;
-   Mat myShiTomasi_dst; Mat myShiTomasi_copy;
-
-   int myShiTomasi_qualityLevel = 50;
-   int myHarris_qualityLevel = 50;
-   int max_qualityLevel = 100;
-
-   double myHarris_minVal; double myHarris_maxVal;
-   double myShiTomasi_minVal; double myShiTomasi_maxVal;
-
-   RNG rng(12345);
-
-   char* myHarris_window = "My Harris corner detector";
-   char* myShiTomasi_window = "My Shi Tomasi corner detector";
-
-   /// Function headers
-   void myShiTomasi_function( int, void* );
-   void myHarris_function( int, void* );
-
-   /** @function main */
-   int main( int argc, char** argv )
-   {
-     /// Load source image and convert it to gray
-     src = imread( argv[1], 1 );
-     cvtColor( src, src_gray, CV_BGR2GRAY );
-
-     /// Set some parameters
-     int blockSize = 3; int apertureSize = 3;
-
-     /// My Harris matrix -- Using cornerEigenValsAndVecs
-     myHarris_dst = Mat::zeros( src_gray.size(), CV_32FC(6) );
-     Mc = Mat::zeros( src_gray.size(), CV_32FC1 );
-
-     cornerEigenValsAndVecs( src_gray, myHarris_dst, blockSize, apertureSize, BORDER_DEFAULT );
-
-     /* calculate Mc */
-     for( int j = 0; j < src_gray.rows; j++ )
-        { for( int i = 0; i < src_gray.cols; i++ )
-             {
-               float lambda_1 = myHarris_dst.at<float>( j, i, 0 );
-               float lambda_2 = myHarris_dst.at<float>( j, i, 1 );
-               Mc.at<float>(j,i) = lambda_1*lambda_2 - 0.04*pow( ( lambda_1 + lambda_2 ), 2 );
-             }
-        }
-
-     minMaxLoc( Mc, &myHarris_minVal, &myHarris_maxVal, 0, 0, Mat() );
-
-     /* Create Window and Trackbar */
-     namedWindow( myHarris_window, CV_WINDOW_AUTOSIZE );
-     createTrackbar( " Quality Level:", myHarris_window, &myHarris_qualityLevel, max_qualityLevel,
-                       myHarris_function );
-     myHarris_function( 0, 0 );
-
-     /// My Shi-Tomasi -- Using cornerMinEigenVal
-     myShiTomasi_dst = Mat::zeros( src_gray.size(), CV_32FC1 );
-     cornerMinEigenVal( src_gray, myShiTomasi_dst, blockSize, apertureSize, BORDER_DEFAULT );
-
-     minMaxLoc( myShiTomasi_dst, &myShiTomasi_minVal, &myShiTomasi_maxVal, 0, 0, Mat() );
-
-     /* Create Window and Trackbar */
-     namedWindow( myShiTomasi_window, CV_WINDOW_AUTOSIZE );
-     createTrackbar( " Quality Level:", myShiTomasi_window, &myShiTomasi_qualityLevel, max_qualityLevel,
-                        myShiTomasi_function );
-     myShiTomasi_function( 0, 0 );
-
-     waitKey(0);
-     return(0);
-   }
-
-   /** @function myShiTomasi_function  */
-   void myShiTomasi_function( int, void* )
-   {
-     myShiTomasi_copy = src.clone();
-
-     if( myShiTomasi_qualityLevel < 1 ) { myShiTomasi_qualityLevel = 1; }
-
-     for( int j = 0; j < src_gray.rows; j++ )
-        { for( int i = 0; i < src_gray.cols; i++ )
-             {
-               if( myShiTomasi_dst.at<float>(j,i) > myShiTomasi_minVal + ( myShiTomasi_maxVal -
-                        myShiTomasi_minVal )*myShiTomasi_qualityLevel/max_qualityLevel )
-                 { circle( myShiTomasi_copy, Point(i,j), 4, Scalar( rng.uniform(0,255),
-                            rng.uniform(0,255), rng.uniform(0,255) ), -1, 8, 0 ); }
-             }
-        }
-     imshow( myShiTomasi_window, myShiTomasi_copy );
-   }
-
-   /** @function myHarris_function */
-   void myHarris_function( int, void* )
-   {
-     myHarris_copy = src.clone();
-
-     if( myHarris_qualityLevel < 1 ) { myHarris_qualityLevel = 1; }
-
-     for( int j = 0; j < src_gray.rows; j++ )
-        { for( int i = 0; i < src_gray.cols; i++ )
-             {
-               if( Mc.at<float>(j,i) > myHarris_minVal + ( myHarris_maxVal - myHarris_minVal )
-                                                            *myHarris_qualityLevel/max_qualityLevel )
-                 { circle( myHarris_copy, Point(i,j), 4, Scalar( rng.uniform(0,255), rng.uniform(0,255),
-                           rng.uniform(0,255) ), -1, 8, 0 ); }
-             }
-        }
-     imshow( myHarris_window, myHarris_copy );
-   }
-
-
+.. literalinclude:: ../../../../../samples/cpp/tutorial_code/TrackingMotion/cornerDetector_Demo.cpp
+   :language: cpp

 Explanation
 ============
@@ -16,7 +16,7 @@ Today it is common to have a digital video recording system at your disposal. Th
 The source code
 ===============

-As a test case where to show off these using OpenCV I've created a small program that reads in two video files and performs a similarity check between them. This is something you could use to check just how well a new video compressing algorithms works. Let there be a reference (original) video like :download:`this small Megamind clip <../../../../samples/cpp/tutorial_code/highgui/video-input-psnr-ssim/video/Megamind.avi>` and :download:`a compressed version of it <../../../../samples/cpp/tutorial_code/highgui/video-input-psnr-ssim/video/Megamind_bugy.avi>`. You may also find the source code and these video file in the :file:`samples/cpp/tutorial_code/highgui/video-input-psnr-ssim/` folder of the OpenCV source library.
+As a test case where to show off these using OpenCV I've created a small program that reads in two video files and performs a similarity check between them. This is something you could use to check just how well a new video compressing algorithms works. Let there be a reference (original) video like :download:`this small Megamind clip <../../../../samples/cpp/tutorial_code/HighGUI/video-input-psnr-ssim/video/Megamind.avi>` and :download:`a compressed version of it <../../../../samples/cpp/tutorial_code/HighGUI/video-input-psnr-ssim/video/Megamind_bugy.avi>`. You may also find the source code and these video file in the :file:`samples/cpp/tutorial_code/HighGUI/video-input-psnr-ssim/` folder of the OpenCV source library.

 .. literalinclude:: ../../../../samples/cpp/tutorial_code/HighGUI/video-input-psnr-ssim/video-input-psnr-ssim.cpp
   :language: cpp
@@ -36,7 +36,6 @@ You may also find the source code and these video file in the :file:`samples/cpp
   :language: cpp
   :linenos:
   :tab-width: 4
-   :lines: 1-8, 21-22, 24-97

 The structure of a video
 ========================
@@ -85,7 +85,7 @@ This tutorial code's is shown lines below. You can also download it from `here <
     for( int i = 0; i < contours.size(); i++ )
        { approxPolyDP( Mat(contours[i]), contours_poly[i], 3, true );
          boundRect[i] = boundingRect( Mat(contours_poly[i]) );
-          minEnclosingCircle( contours_poly[i], center[i], radius[i] );
+          minEnclosingCircle( (Mat)contours_poly[i], center[i], radius[i] );
        }


@@ -50,8 +50,8 @@ The structure of package contents looks as follows:

    OpenCV-2.4.3-android-sdk
    |_ apk
-    |   |_ OpenCV_2.4.3_binary_pack_XXX.apk
-    |   |_ OpenCV_2.4.3_Manager.apk
+    |   |_ OpenCV_2.4.3_binary_pack_armv7a.apk
+    |   |_ OpenCV_2.4.3_Manager_2.0_XXX.apk
    |
    |_ doc
    |_ samples
@@ -85,8 +85,8 @@ The structure of package contents looks as follows:
  On production devices that have access to Google Play Market (and Internet) these packages will be
  installed from Market on the first start of an application using OpenCV Manager API.
  But devkits without Market or Internet connection require this packages to be installed manually.
-  Install the `Manager.apk` and the corresponding `binary_pack.apk` depending on the device CPU,
-  the Manager GUI provides this info. Below you'll see exact commands on how to do this.
+  Install the `Manager.apk` and optional `binary_pack.apk` if it needed.
+  See :ref:`manager_selection` for details.

  .. note:: Installation from Internet is the preferable way since OpenCV team may publish updated
            versions of this packages on the Market.
@@ -159,8 +159,8 @@ Get the OpenCV4Android SDK

      unzip ~/Downloads/OpenCV-2.4.3-android-sdk.zip

-.. |opencv_android_bin_pack| replace:: OpenCV-2.4.3-android-sdk.zip
-.. _opencv_android_bin_pack_url: http://sourceforge.net/projects/opencvlibrary/files/opencv-android/2.4.3/OpenCV-2.4.3-android-sdk.zip/download
+.. |opencv_android_bin_pack| replace:: OpenCV-2.4.3.2-android-sdk.zip
+.. _opencv_android_bin_pack_url: http://sourceforge.net/projects/opencvlibrary/files/opencv-android/2.4.3/OpenCV-2.4.3.2-android-sdk.zip/download
 .. |opencv_android_bin_pack_url| replace:: |opencv_android_bin_pack|
 .. |seven_zip| replace:: 7-Zip
 .. _seven_zip: http://www.7-zip.org/
@@ -186,6 +186,8 @@ Import OpenCV library and samples to the Eclipse
   Each sample included into the |opencv_android_bin_pack| is a regular Android project that already
   references OpenCV library.Follow the steps below to import OpenCV and samples into the workspace:

+   .. note:: OpenCV samples are indeed **dependent** on OpenCV library project so don't forget to import it to your workspace as well.
+
   * Right click on the :guilabel:`Package Explorer` window and choose :guilabel:`Import...` option
     from the context menu:

@@ -213,13 +215,21 @@ Import OpenCV library and samples to the Eclipse
   and you have to wait some time while it is building OpenCV samples. Just give a minute to
   Eclipse to complete initialization.

-   .. note :: After the initial import, on a non-Windows (Linux and Mac OS) operating system Eclipse
+   .. warning :: After the initial import, on a non-Windows (Linux and Mac OS) operating system Eclipse
              will still show build errors for applications with native C++ code. To resolve the
              issues, please do the following:

              Open :guilabel:`Project Properties -> C/C++ Build`, and replace "Build command" text
              to ``"${NDKROOT}/ndk-build"`` (remove .cmd at the end).

+   .. note :: In some cases the build errors don't disappear, then try the following actions:
+
+              * right click on ``OpenCV Library`` project -> :guilabel:`Android Tools -> Fix Project Properties`,
+                then menu :guilabel:`Project -> Clean... -> Clean all`
+              * right click on the project with errors -> :guilabel:`Properties -> Android`, make sure the
+                ``Target`` is selected and is ``Android 3.0`` or higher
+              * check the build errors in the :guilabel:`Problems` view window and try to resolve them by yourselves
+
   .. image:: images/eclipse_cdt_cfg4.png
      :alt: Configure CDT
      :align: center
@@ -235,14 +245,14 @@ Import OpenCV library and samples to the Eclipse
 Running OpenCV Samples
 ----------------------

-At this point you should be able to build and run the samples. Keep in mind, that ``face-detection``,
-``Tutorial 3`` and ``Tutorial 4`` include some native code and require Android NDK and CDT plugin
-for Eclipse to build working applications. If you haven't installed these tools see the corresponding
-section of :ref:`Android_Dev_Intro`.
+At this point you should be able to build and run the samples. Keep in mind, that
+``face-detection``, ``Tutorial 3` and ``Tutorial 4`` include some native code and
+require Android NDK and CDT plugin for Eclipse to build working applications. If you haven't
+installed these tools, see the corresponding section of :ref:`Android_Dev_Intro`.

-Also, please consider that ``Tutorial 0`` and ``Tutorial 1`` samples use Java Camera API that
-definitelly accessible on emulator from the Android SDK.
-Other samples use OpenCV Native Camera which may not work with emulator.
+.. warning:: Please consider that some samples use Android Java Camera API, which is accessible
+             with an AVD. But most of samples use OpenCV Native Camera which **may not work** with
+             an emulator.

 .. note:: Recent *Android SDK tools, revision 19+* can run ARM v7a OS images but they available not
          for all Android versions.
@@ -280,19 +290,39 @@ Well, running samples from Eclipse is very simple:
  To get rid of the message you will need to install `OpenCV Manager` and the appropriate `OpenCV binary pack`.
  Simply tap :menuselection:`Yes` if you have *Google Play Market* installed on your device/emulator. It will redirect you to the corresponding page on *Google Play Market*.

-  If you have no access to the *Market*, which is often the case with emulators - you will need to install the packages from OpenCV4Android SDK folder manually. Open the console/terminal and type in the following two commands:
+  If you have no access to the *Market*, which is often the case with emulators - you will need to install the packages from OpenCV4Android SDK folder manually. See :ref:`manager_selection` for details.

  .. code-block:: sh
    :linenos:

-    <Android SDK path>/platform-tools/adb install <OpenCV4Android SDK path>/apk/OpenCV_2.4.3_Manager.apk
-    <Android SDK path>/platform-tools/adb install <OpenCV4Android SDK path>/apk/OpenCV_2.4.3_binary_pack_armv7a.apk
+    <Android SDK path>/platform-tools/adb install <OpenCV4Android SDK path>/apk/OpenCV_2.4.3_Manager_armv7a-neon.apk

-  If you're running Windows, that will probably look like this:
+  .. note:: ``armeabi``, ``armv7a-neon``, ``arm7a-neon-android8``, ``mips`` and ``x86`` stand for
+            platform targets:
+
+            * ``armeabi`` is for ARM v5 and ARM v6 architectures with Android API 8+,
+
+            * ``armv7a-neon`` is for NEON-optimized ARM v7 with Android API 9+,
+
+            * ``arm7a-neon-android8`` is for NEON-optimized ARM v7 with Android API 8,
+
+            * ``mips`` is for MIPS architecture with Android API 9+,
+
+            * ``x86`` is for Intel x86 CPUs with Android API 9+.
+
+            If using hardware device for testing/debugging, run the following command to learn
+            its CPU architecture:
+
+            .. code-block:: sh
+
+               adb shell getprop ro.product.cpu.abi
+
+            If you're using an AVD emulator, go :menuselection:`Window > AVD Manager` to see the
+            list of availible devices. Click :menuselection:`Edit` in the context menu of the
+            selected device. In the window, which then pop-ups, find the CPU field.
+
+            You may also see section :ref:`manager_selection` for details.

-  .. image:: images/install_opencv_manager_with_adb.png
-     :alt: Run these commands in the console to install OpenCV Manager
-     :align: center

  When done, you will be able to run OpenCV samples on your device/emulator seamlessly.

@@ -303,6 +333,7 @@ Well, running samples from Eclipse is very simple:
     :alt: Tutorial 1 Basic - 1. Add OpenCV - running Canny
     :align: center

+
 What's next
 ===========

@@ -78,7 +78,7 @@ Development in Java

 You need the following software to be installed in order to develop for Android in Java:

-#. **Sun JDK 6**
+#. **Sun JDK 6** (Sun JDK 7 is also possible)

   Visit `Java SE Downloads page <http://www.oracle.com/technetwork/java/javase/downloads/>`_
   and download an installer for your OS.
@@ -103,9 +103,10 @@ You need the following software to be installed in order to develop for Android

   Here is Google's `install guide <http://developer.android.com/sdk/installing.html>`_ for the SDK.

-   .. note:: If you choose SDK packed into a Windows installer, then you should have 32-bit JRE
-             installed. It is not a prerequisite for Android development, but installer is a x86
-             application and requires 32-bit Java runtime.
+   .. note:: You can choose downloading ``ADT Bundle package`` that in addition to Android SDK Tools includes
+             Eclipse + ADT + CDT plugins, Android Platform-tools, the latest Android platform and the latest
+             Android system image for the emulator - this is the best choice for those who is setting up Android
+             development environment the first time!

   .. note:: If you are running x64 version of Ubuntu Linux, then you need ia32 shared libraries
             for use on amd64 and ia64 systems to be installed. You can install them with the
@@ -215,45 +216,11 @@ You need the following software to be installed in order to develop for Android

 #. **CDT plugin for Eclipse**

+   If you selected for installation the ``NDK plugins`` component of Eclipse ADT plugin (see the picture above) your Eclipse IDE
+   should already have ``CDT plugin`` (that means ``C/C++ Development Tooling``).
   There are several possible ways to integrate compilation of C++ code by Android NDK into Eclipse
   compilation process. We recommend the approach based on Eclipse
   :abbr:`CDT(C/C++ Development Tooling)` Builder.
-   Make sure your Eclipse IDE has the :abbr:`CDT(C/C++ Development Tooling)` plugin
-   installed. Menu :guilabel:`Help -> About Eclipse SDK -> Installation Details`.
-
-       .. image:: images/eclipse_about_cdt_0.png
-         :alt: CDT in Eclipse About
-         :align: center
-
-   ..
-
-       .. image:: images/eclipse_about_cdt_1.png
-         :alt: CDT in Eclipse About
-         :align: center
-
-   .. note:: If you're using the latest ADT plugin for Eclipse (version 20 and above), most likely
-             you already have the CDT plugin and don't need to install it.
-
-   .. image:: images/eclipse_about_cdt_1.png
-     :alt: CDT in Eclipse About
-     :align: center
-
-   To install the `CDT plugin <http://eclipse.org/cdt/>`_ use menu
-   :guilabel:`Help -> Install New Software...`, then paste the CDT 8.0 repository URL
-   http://download.eclipse.org/tools/cdt/releases/indigo as shown in the picture below and click
-   :guilabel:`Add...`, name it *CDT* and click :guilabel:`OK`.
-
-   .. image:: images/eclipse_inst_cdt.png
-     :alt: Configure builders
-     :align: center
-
-   ``CDT Main Features`` should be enough:
-
-   .. image:: images/eclipse_inst_cdt_2.png
-     :alt: Configure builders
-     :align: center
-
-   That's it. Compilation of C++ code is fully integrated into Eclipse building process now.


 Android application structure
@@ -336,9 +303,9 @@ and exceptions are used in C++, it also should be created. Example of the file :
   APP_CPPFLAGS := -frtti -fexceptions
   APP_ABI := all

-.. note:: We recommend setting ``APP_ABI := all`` for all targets. If you want to specify the 
-          target explicitly, use ``armeabi`` for ARMv5/ARMv6, ``armeabi-v7a`` for ARMv7, ``x86`` 
-          for Intel Atom or ``mips`` for MIPS. 
+.. note:: We recommend setting ``APP_ABI := all`` for all targets. If you want to specify the
+          target explicitly, use ``armeabi`` for ARMv5/ARMv6, ``armeabi-v7a`` for ARMv7, ``x86``
+          for Intel Atom or ``mips`` for MIPS.


 .. _NDK_build_cli:
@@ -348,6 +315,11 @@ Building application native part from command line

 Here is the standard way to compile C++ part of an Android application:

+.. warning:: We strongly reccomend using ``cmd.exe`` (standard Windows console) instead of Cygwin on
+             **Windows**. Use the latter if only you're absolutely sure about, what you're doing. Cygwin
+             is not really supported and we are unlikely to help you in case you encounter some
+             problems with it. So, use it only if you're capable of handling the consequences yourself.
+
 #. Open console and go to the root folder of an Android application

   .. code-block:: bash
@@ -361,7 +333,7 @@ Here is the standard way to compile C++ part of an Android application:
        <path_where_NDK_is_placed>/ndk-build

   .. note:: On Windows we recommend to use ``ndk-build.cmd`` in standard Windows console (``cmd.exe``)
-            rather than the similar ``bash`` script in ``Cygwin`` shell.
+             rather than the similar ``bash`` script in ``Cygwin`` shell.

   .. image:: images/ndk_build.png
      :alt: NDK build
@@ -401,12 +373,19 @@ Eclipse build process. We recommend the approach based on Eclipse
   (e.g. ``"X:\\Apps\\android-ndk-r8"`` or ``"/opt/android-ndk-r8"``).

   **On Windows** an environment variable can be set via
-   :guilabel:`My Computer -> Properties -> Advanced -> Environment variables` and restarting Eclipse.
+   :guilabel:`My Computer -> Properties -> Advanced -> Environment variables`.
   On Windows 7 it's also possible to use `setx <http://ss64.com/nt/setx.html>`_ command in a console session.

   **On Linux** and **MacOS** an environment variable can be set via appending a
   ``"export VAR_NAME=VAR_VALUE"`` line to the :file:`"~/.bashrc"` file and logging off and then on.

+   .. note:: It's also possible to define the ``NDKROOT`` environment variable within Eclipse IDE,
+             but it should be done for every new workspace you create. If you prefer this option better than setting system
+             environment variable, open Eclipse menu :guilabel:`Window -> Preferences -> C/C++ -> Build -> Environment`,
+             press the :guilabel:`Add...` button and set variable name to ``NDKROOT`` and value to local Android NDK path.
+
+#. After that you need to **restart Eclipse** to apply the changes.
+
 #. Open Eclipse and load the Android app project to configure.

 #. Add C/C++ Nature to the project via Eclipse menu :guilabel:`New -> Other -> C/C++ -> Convert to a C/C++ Project`.
@@ -463,11 +442,20 @@ Eclipse build process. We recommend the approach based on Eclipse

   ::

+        # for NDK r8 and prior:
        ${NDKROOT}/platforms/android-9/arch-arm/usr/include
        ${NDKROOT}/sources/cxx-stl/gnu-libstdc++/include
        ${NDKROOT}/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include
        ${ProjDirPath}/../../sdk/native/jni/include

+   ::
+
+        # for NDK r8b and later:
+        ${NDKROOT}/platforms/android-9/arch-arm/usr/include
+        ${NDKROOT}/sources/cxx-stl/gnu-libstdc++/4.6/include
+        ${NDKROOT}/sources/cxx-stl/gnu-libstdc++/4.6/libs/armeabi-v7a/include
+        ${ProjDirPath}/../../sdk/native/jni/include
+
   The last path should be changed to the correct absolute or relative path to OpenCV4Android SDK location.

   This should clear the syntax error notifications in Eclipse C++ editor.
@@ -476,16 +464,6 @@ Eclipse build process. We recommend the approach based on Eclipse
      :alt: Configure CDT
      :align: center

-   .. note:: The latest Android NDK **r8b** uses different STL headers path. So if you use this NDK
-             release add the following **Include** paths list instead:
-
-   ::
-
-        ${NDKROOT}/platforms/android-9/arch-arm/usr/include
-        ${NDKROOT}/sources/cxx-stl/gnu-libstdc++/4.6/include
-        ${NDKROOT}/sources/cxx-stl/gnu-libstdc++/4.6/libs/armeabi-v7a/include
-        ${ProjDirPath}/../../sdk/native/jni/include
-

 Debugging and Testing
 =====================
@@ -666,8 +644,8 @@ execute :command:`adb devices` command. You will see the list of attached device
   :alt: List of attached devices
   :align: center

-MacOS host computer
-^^^^^^^^^^^^^^^^^^^
+Mac OS host computer
+^^^^^^^^^^^^^^^^^^^^
 No actions are required, just connect your device via USB and run ``adb devices`` to check connection.

 What's next
@@ -1,13 +1,13 @@

 .. _dev_with_OCV_on_Android:

-
-Android development with OpenCV
+Android Development with OpenCV
 *******************************

-This tutorial is created to help you use OpenCV library within your Android project.
+This tutorial has been created to help you use OpenCV library within your Android project.

-This guide was written with Windows 7 in mind, though it should work with any other OS supported by OpenCV4Android SDK.
+This guide was written with Windows 7 in mind, though it should work with any other OS supported by 
+OpenCV4Android SDK.

 This tutorial assumes you have the following installed and configured:

@@ -23,121 +23,132 @@ This tutorial assumes you have the following installed and configured:

 If you need help with anything of the above, you may refer to our :ref:`android_dev_intro` guide.

-This tutorial also assumes you have OpenCV4Android SDK already installed on your development machine and OpenCV Manager on your testing device correspondingly. If you need help with any of these, you may consult our :ref:`O4A_SDK` tutorial.
+This tutorial also assumes you have OpenCV4Android SDK already installed on your development 
+machine and OpenCV Manager on your testing device correspondingly. If you need help with any of 
+these, you may consult our :ref:`O4A_SDK` tutorial.

-If you encounter any error after thoroughly following these steps, feel free to contact us via `OpenCV4Android <https://groups.google.com/group/android-opencv/>`_ discussion group or OpenCV `Q&A forum <http://answers.opencv.org>`_ . We'll do our best to help you out.
+If you encounter any error after thoroughly following these steps, feel free to contact us via 
+`OpenCV4Android <https://groups.google.com/group/android-opencv/>`_ discussion group or OpenCV 
+`Q&A forum <http://answers.opencv.org>`_ . We'll do our best to help you out.

-Using OpenCV library within your Android project
+
+Using OpenCV Library Within Your Android Project
 ================================================

-In this section we will explain how to make some existing project to use OpenCV.
-Starting with 2.4.2 release for Android, *OpenCV Manager* is used to provide apps with the best available version of OpenCV.
-You can get more information here: :ref:`Android_OpenCV_Manager` and in these `slides <https://docs.google.com/a/itseez.com/presentation/d/1EO_1kijgBg_BsjNp2ymk-aarg-0K279_1VZRcPplSuk/present#slide=id.p>`_.
+In this section we will explain how to make some existing project to use OpenCV. 
+Starting with 2.4.2 release for Android, *OpenCV Manager* is used to provide apps with the best 
+available version of OpenCV. 
+You can get more information here: :ref:`Android_OpenCV_Manager` and in these 
+`slides <https://docs.google.com/a/itseez.com/presentation/d/1EO_1kijgBg_BsjNp2ymk-aarg-0K279_1VZRcPplSuk/present#slide=id.p>`_.
+

 Java
 ----
-Application development with async initialization
+
+Application Development with Async Initialization
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-Using async initialization is a **recommended** way for application development. It uses the OpenCV Manager to access OpenCV libraries externally installed in the target system.
+Using async initialization is a **recommended** way for application development. It uses the OpenCV 
+Manager to access OpenCV libraries externally installed in the target system.

-#. Add OpenCV library project to your workspace. Use menu :guilabel:`File -> Import -> Existing project in your workspace`,
-   press :guilabel:`Browse`  button and locate OpenCV4Android SDK (:file:`OpenCV-2.4.3-android-sdk/sdk`).
+#. Add OpenCV library project to your workspace. Use menu 
+   :guilabel:`File -> Import -> Existing project in your workspace`.
+
+   Press :guilabel:`Browse`  button and locate OpenCV4Android SDK 
+   (:file:`OpenCV-2.4.3-android-sdk/sdk`).

   .. image:: images/eclipse_opencv_dependency0.png
        :alt: Add dependency from OpenCV library
        :align: center

-#. In application project add a reference to the OpenCV Java SDK in :guilabel:`Project -> Properties -> Android -> Library -> Add` select ``OpenCV Library - 2.4.3``.
+#. In application project add a reference to the OpenCV Java SDK in 
+   :guilabel:`Project -> Properties -> Android -> Library -> Add` select ``OpenCV Library - 2.4.3``.

   .. image:: images/eclipse_opencv_dependency1.png
        :alt: Add dependency from OpenCV library
        :align: center

-To run OpenCV Manager-based application for the first time you need to install package with the `OpenCV Manager` for your platform. Armeabi, Armeabi-v7a with NEON, x86 and MIPS achitectures supported.
-You can do it using Google Play Market or manually with ``adb`` tool:
+In most cases OpenCV Manager may be installed automatically from Google Play. For the case, when 
+Google Play is not available, i.e. emulator, developer board, etc, you can install it manually 
+using adb tool. See :ref:`manager_selection` for details.

-.. code-block:: sh
-    :linenos:
-
-    <Android SDK path>/platform-tools/adb install <OpenCV4Android SDK path>/apk/OpenCV_2.4.3_Manager.apk
-
-For rare cases if NEON instruction set is not supported you need to install aditional OpenCV Library package:
-
-.. code-block:: sh
-    :linenos:
-
-    <Android SDK path>/platform-tools/adb install <OpenCV4Android SDK path>/apk/OpenCV_2.4.3_binary_pack_armv7a.apk
-
-There is a very base code snippet implementing the async initialization. It shows basic principles. See the "15-puzzle" OpenCV sample for details.
+There is a very base code snippet implementing the async initialization. It shows basic principles. 
+See the "15-puzzle" OpenCV sample for details.

 .. code-block:: java
    :linenos:

-    public class MyActivity extends Activity implements HelperCallbackInterface
-    {
-    private BaseLoaderCallback mOpenCVCallBack = new BaseLoaderCallback(this) {
-       @Override
-       public void onManagerConnected(int status) {
-         switch (status) {
-           case LoaderCallbackInterface.SUCCESS:
-           {
-              Log.i(TAG, "OpenCV loaded successfully");
-              // Create and set View
-              mView = new puzzle15View(mAppContext);
-              setContentView(mView);
-           } break;
-           default:
-           {
-              super.onManagerConnected(status);
-           } break;
-         }
-       }
-    };
+    public class Sample1Java extends Activity implements CvCameraViewListener {

-    /** Call on every application resume **/
-    @Override
-    protected void onResume()
-    {
-        Log.i(TAG, "called onResume");
-        super.onResume();
+        private BaseLoaderCallback mLoaderCallback = new BaseLoaderCallback(this) {
+            @Override
+            public void onManagerConnected(int status) {
+                switch (status) {
+                    case LoaderCallbackInterface.SUCCESS:
+                    {
+                        Log.i(TAG, "OpenCV loaded successfully");
+                        mOpenCvCameraView.enableView();
+                    } break;
+                    default:
+                    {
+                        super.onManagerConnected(status);
+                    } break;
+                }
+            }
+        };

-        Log.i(TAG, "Trying to load OpenCV library");
-        if (!OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_2, this, mOpenCVCallBack))
+        @Override
+        public void onResume()
        {
-            Log.e(TAG, "Cannot connect to OpenCV Manager");
+            super.onResume();
+            OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_3, this, mLoaderCallback);
        }
+
+        ...
    }

-It this case application works with OpenCV Manager in asynchronous fashion. ``OnManagerConnected`` callback will be called in UI thread, when initialization finishes.
-Please note, that it is not allowed to use OpenCV calls or load OpenCV-dependent native libs before invoking this callback.
-Load your own native libraries that depend on OpenCV after the successful OpenCV initialization.
-Default BaseLoaderCallback implementation treat application context as Activity and calls Activity.finish() method to exit in case of initialization failure.
-To override this behavior you need to override finish() method of BaseLoaderCallback class and implement your own finalization method.
+It this case application works with OpenCV Manager in asynchronous fashion. ``OnManagerConnected`` 
+callback will be called in UI thread, when initialization finishes. Please note, that it is not 
+allowed to use OpenCV calls or load OpenCV-dependent native libs before invoking this callback. 
+Load your own native libraries that depend on OpenCV after the successful OpenCV initialization. 
+Default ``BaseLoaderCallback`` implementation treat application context as Activity and calls 
+``Activity.finish()`` method to exit in case of initialization failure. To override this behavior 
+you need to override ``finish()`` method of ``BaseLoaderCallback`` class and implement your own 
+finalization method.

-Application development with static initialization
+
+Application Development with Static Initialization
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-According to this approach all OpenCV binaries are included into your application package. It is designed mostly for development purposes.
-This approach is deprecated for the production code, release package is recommended to communicate with OpenCV Manager via the async initialization described above.
+According to this approach all OpenCV binaries are included into your application package. It is 
+designed mostly for development purposes. This approach is deprecated for the production code, 
+release package is recommended to communicate with OpenCV Manager via the async initialization 
+described above.

-#. Add the OpenCV library project to your workspace the same way as for the async initialization above.
-   Use menu :guilabel:`File -> Import -> Existing project in your workspace`, push :guilabel:`Browse` button and select OpenCV SDK path (:file:`OpenCV-2.4.3-android-sdk/sdk`).
+#. Add the OpenCV library project to your workspace the same way as for the async initialization 
+   above. Use menu :guilabel:`File -> Import -> Existing project in your workspace`, 
+   press :guilabel:`Browse` button and select OpenCV SDK path 
+   (:file:`OpenCV-2.4.3-android-sdk/sdk`).

   .. image:: images/eclipse_opencv_dependency0.png
        :alt: Add dependency from OpenCV library
        :align: center

-#. In the application project add a reference to the OpenCV4Android SDK in :guilabel:`Project -> Properties -> Android -> Library -> Add` select ``OpenCV Library - 2.4.3``;
+#. In the application project add a reference to the OpenCV4Android SDK in 
+   :guilabel:`Project -> Properties -> Android -> Library -> Add` select ``OpenCV Library - 2.4.3``;

   .. image:: images/eclipse_opencv_dependency1.png
       :alt: Add dependency from OpenCV library
       :align: center

-#. If your application project **doesn't have a JNI part**, just copy the corresponding OpenCV native libs from :file:`<OpenCV-2.4.3-android-sdk>/sdk/native/libs/<target_arch>` to your project directory to folder :file:`libs/<target_arch>`.
+#. If your application project **doesn't have a JNI part**, just copy the corresponding OpenCV 
+   native libs from :file:`<OpenCV-2.4.3-android-sdk>/sdk/native/libs/<target_arch>` to your 
+   project directory to folder :file:`libs/<target_arch>`.

-   In case of the application project **with a JNI part**, instead of manual libraries copying you need to modify your ``Android.mk`` file:
-   add the following two code lines after the ``"include $(CLEAR_VARS)"`` and before ``"include path_to_OpenCV-2.4.3-android-sdk/sdk/native/jni/OpenCV.mk"``
+   In case of the application project **with a JNI part**, instead of manual libraries copying you 
+   need to modify your ``Android.mk`` file:
+   add the following two code lines after the ``"include $(CLEAR_VARS)"`` and before 
+   ``"include path_to_OpenCV-2.4.3-android-sdk/sdk/native/jni/OpenCV.mk"``

   .. code-block:: make
      :linenos:
@@ -157,12 +168,14 @@ This approach is deprecated for the production code, release package is recommen
      OPENCV_INSTALL_MODULES:=on
      include ../../sdk/native/jni/OpenCV.mk

-   After that the OpenCV libraries will be copied to your application :file:`libs` folder during the JNI part build.
+   After that the OpenCV libraries will be copied to your application :file:`libs` folder during 
+   the JNI build.v

-   Eclipse will automatically include all the libraries from the :file:`libs` folder to the application package (APK).
+   Eclipse will automatically include all the libraries from the :file:`libs` folder to the 
+   application package (APK). 

-#. The last step of enabling OpenCV in your application is Java initialization code before call to OpenCV API.
-   It can be done, for example, in the static section of the ``Activity`` class:
+#. The last step of enabling OpenCV in your application is Java initialization code before calling 
+   OpenCV API. It can be done, for example, in the static section of the ``Activity`` class:

   .. code-block:: java
      :linenos:
@@ -173,7 +186,8 @@ This approach is deprecated for the production code, release package is recommen
          }
      }

-   If you application includes other OpenCV-dependent native libraries you should load them **after** OpenCV initialization:
+   If you application includes other OpenCV-dependent native libraries you should load them 
+   **after** OpenCV initialization:

   .. code-block:: java
      :linenos:
@@ -187,39 +201,45 @@ This approach is deprecated for the production code, release package is recommen
          }
      }

+
 Native/C++
 ----------

-To build your own Android application, which uses OpenCV from native part, the following steps should be done:
+To build your own Android application, using OpenCV as native part, the following steps should be 
+taken:

-#. You can use an environment variable to specify the location of OpenCV package or just hardcode absolute or relative path in the :file:`jni/Android.mk` of your projects.
+#. You can use an environment variable to specify the location of OpenCV package or just hardcode 
+   absolute or relative path in the :file:`jni/Android.mk` of your projects.

-#.  The file :file:`jni/Android.mk` should be written for the current application using the common rules for this file.
+#.  The file :file:`jni/Android.mk` should be written for the current application using the common 
+    rules for this file.

-    For detailed information see the Android NDK documentation from the Android NDK archive, in the file
-    :file:`<path_where_NDK_is_placed>/docs/ANDROID-MK.html`
+    For detailed information see the Android NDK documentation from the Android NDK archive, in the 
+    file :file:`<path_where_NDK_is_placed>/docs/ANDROID-MK.html`.

-#. The line
+#. The following line:

   .. code-block:: make

      include C:\Work\OpenCV4Android\OpenCV-2.4.3-android-sdk\sdk\native\jni\OpenCV.mk

-   should be inserted into the :file:`jni/Android.mk` file **after** the line
+   Should be inserted into the :file:`jni/Android.mk` file **after** this line:

   .. code-block:: make

      include $(CLEAR_VARS)

-#. Several variables can be used to customize OpenCV stuff, but you **don't need** to use them when your application uses the `async initialization` via the `OpenCV Manager` API.
+#. Several variables can be used to customize OpenCV stuff, but you **don't need** to use them when 
+   your application uses the `async initialization` via the `OpenCV Manager` API.

-   Note: these variables should be set **before**  the ``"include .../OpenCV.mk"`` line:
+   .. note:: These variables should be set **before**  the ``"include .../OpenCV.mk"`` line:

-   .. code-block:: make
+             .. code-block:: make

-      OPENCV_INSTALL_MODULES:=on
+                OPENCV_INSTALL_MODULES:=on

-   Copies necessary OpenCV dynamic libs to the project ``libs`` folder in order to include them into the APK.
+   Copies necessary OpenCV dynamic libs to the project ``libs`` folder in order to include them 
+   into the APK.

   .. code-block:: make

@@ -231,7 +251,8 @@ To build your own Android application, which uses OpenCV from native part, the f

      OPENCV_LIB_TYPE:=STATIC

-   Perform static link with OpenCV. By default dynamic link is used and the project JNI lib depends on ``libopencv_java.so``.
+   Perform static linking with OpenCV. By default dynamic link is used and the project JNI lib 
+   depends on ``libopencv_java.so``.

 #. The file :file:`Application.mk` should exist and should contain lines:

@@ -240,145 +261,46 @@ To build your own Android application, which uses OpenCV from native part, the f
      APP_STL := gnustl_static
      APP_CPPFLAGS := -frtti -fexceptions

-   Also the line like this one:
+   Also, the line like this one:

   .. code-block:: make

      APP_ABI := armeabi-v7a

-   should specify the application target platforms.
+   Should specify the application target platforms.

-   In some cases a linkage error (like ``"In function 'cv::toUtf16(std::basic_string<...>... undefined reference to 'mbstowcs'"``) happens
-   when building an application JNI library depending on OpenCV.
-   The following line in the :file:`Application.mk` usually fixes it:
+   In some cases a linkage error (like ``"In function 'cv::toUtf16(std::basic_string<...>... 
+   undefined reference to 'mbstowcs'"``) happens when building an application JNI library, 
+   depending on OpenCV. The following line in the :file:`Application.mk` usually fixes it:

   .. code-block:: make

      APP_PLATFORM := android-9


-#. Either use :ref:`manual <NDK_build_cli>` ``ndk-build`` invocation or :ref:`setup Eclipse CDT Builder <CDT_Builder>` to build native JNI lib before Java part [re]build and APK creation.
+#. Either use :ref:`manual <NDK_build_cli>` ``ndk-build`` invocation or 
+   :ref:`setup Eclipse CDT Builder <CDT_Builder>` to build native JNI lib before (re)building the Java 
+   part and creating an APK.


 Hello OpenCV Sample
 ===================

-Here are basic steps to guide you trough the process of creating a simple OpenCV-centric application.
-It will be capable of accessing camera output, processing it and displaying the result.
+Here are basic steps to guide you trough the process of creating a simple OpenCV-centric 
+application. It will be capable of accessing camera output, processing it and displaying the 
+result.

-#. Open Eclipse IDE, create a new clean workspace, create a new Android project (*File -> New -> Android Project*).
+#. Open Eclipse IDE, create a new clean workspace, create a new Android project 
+   :menuselection:`File --> New --> Android Project`

-#. Set name, target, package and minSDKVersion accordingly.
+#. Set name, target, package and ``minSDKVersion`` accordingly. The minimal SDK version for build
+   with OpenCV4Android SDK is 11. Minimal device API Level (for application manifest) is 8.

-#. Create a new class (*File -> New -> Class*). Name it for example: *HelloOpenCVView*.
+#. Allow Eclipse to create default activity. Lets name the activity ``HelloOpenCvActivity``.

-   .. image:: images/dev_OCV_new_class.png
-        :alt: Add a new class.
-        :align: center
+#. Choose Blank Activity with full screen layout. Lets name the layout ``HelloOpenCvLayout``.

-   * It should extend *SurfaceView* class.
-   * It also should implement *SurfaceHolder.Callback*, *Runnable*.
-
-#. Edit *HelloOpenCVView* class.
-
-   * Add an *import* line for *android.content.context*.
-
-   * Modify autogenerated stubs: *HelloOpenCVView*, *surfaceCreated*, *surfaceDestroyed* and *surfaceChanged*.
-
-     .. code-block:: java
-        :linenos:
-
-        package com.hello.opencv.test;
-
-        import android.content.Context;
-
-        public class HelloOpenCVView extends SurfaceView implements Callback, Runnable {
-
-        public HelloOpenCVView(Context context) {
-            super(context);
-            getHolder().addCallback(this);
-        }
-
-        public void surfaceCreated(SurfaceHolder holder) {
-            (new Thread(this)).start();
-        }
-
-        public void surfaceDestroyed(SurfaceHolder holder) {
-            cameraRelease();
-        }
-
-        public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
-            cameraSetup(width, height);
-        }
-
-        //...
-
-   * Add *cameraOpen*, *cameraRelease* and *cameraSetup* voids as shown below.
-
-   * Also, don't forget to add the public void *run()* as follows:
-
-     .. code-block:: java
-        :linenos:
-
-        public void run() {
-            // TODO: loop { getFrame(), processFrame(), drawFrame() }
-        }
-
-        public boolean cameraOpen() {
-            return false; //TODO: open camera
-        }
-
-        private void cameraRelease() {
-            // TODO release camera
-        }
-
-        private void cameraSetup(int width, int height) {
-            // TODO setup camera
-        }
-
-#. Create a new *Activity* (*New -> Other -> Android -> Android Activity*) and name it, for example: *HelloOpenCVActivity*. For this activity define *onCreate*, *onResume* and *onPause* voids.
-
-   .. code-block:: java
-      :linenos:
-
-       public void onCreate (Bundle savedInstanceState) {
-           super.onCreate(savedInstanceState);
-           mView = new HelloOpenCVView(this);
-           setContentView (mView);
-       }
-
-       protected void onPause() {
-           super.onPause();
-           mView.cameraRelease();
-       }
-
-       protected void onResume() {
-           super.onResume();
-           if( !mView.cameraOpen() ) {
-               // MessageBox and exit app
-               AlertDialog ad = new AlertDialog.Builder(this).create();
-               ad.setCancelable(false); // This blocks the "BACK" button
-               ad.setMessage("Fatal error: can't open camera!");
-               ad.setButton("OK", new DialogInterface.OnClickListener() {
-                   public void onClick(DialogInterface dialog, int which) {
-                       dialog.dismiss();
-                       finish();
-                   }
-               });
-               ad.show();
-           }
-       }
-
-#. Add the following permissions to the AndroidManifest.xml file:
-
-   .. code-block:: xml
-      :linenos:
-
-      </application>
-
-      <uses-permission android:name="android.permission.CAMERA" />
-      <uses-feature android:name="android.hardware.camera" />
-      <uses-feature android:name="android.hardware.camera.autofocus" />
+#. Import OpenCV library project to your workspace.

 #. Reference OpenCV library within your project properties.

@@ -386,98 +308,148 @@ It will be capable of accessing camera output, processing it and displaying the
        :alt: Reference OpenCV library.
        :align: center

-#. We now need some code to handle the camera. Update the *HelloOpenCVView* class as follows:
+#. Edit your layout file as xml file and pass the following layout there:
+
+    .. code-block:: xml
+        :linenos:
+
+        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+            xmlns:tools="http://schemas.android.com/tools"
+            xmlns:opencv="http://schemas.android.com/apk/res-auto"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" >
+
+            <org.opencv.android.JavaCameraView
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:visibility="gone"
+                android:id="@+id/HelloOpenCvView"
+                opencv:show_fps="true"
+                opencv:camera_id="any" />
+
+        </LinearLayout>
+
+#. Add the following permissions to the :file:`AndroidManifest.xml` file:
+
+   .. code-block:: xml
+      :linenos:
+
+      </application>
+
+      <uses-permission android:name="android.permission.CAMERA"/>
+
+      <uses-feature android:name="android.hardware.camera" android:required="false"/>
+      <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
+      <uses-feature android:name="android.hardware.camera.front" android:required="false"/>
+      <uses-feature android:name="android.hardware.camera.front.autofocus" android:required="false"/>
+
+#. Set application theme in AndroidManifest.xml to hide title and system buttons.
+
+   .. code-block:: xml
+      :linenos:
+
+      <application
+          android:icon="@drawable/icon"
+          android:label="@string/app_name"
+          android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
+
+#. Add OpenCV library initialization to your activity. Fix errors by adding requited imports.
+
+    .. code-block:: java
+       :linenos:
+
+       private BaseLoaderCallback mLoaderCallback = new BaseLoaderCallback(this) {
+           @Override
+           public void onManagerConnected(int status) {
+               switch (status) {
+                   case LoaderCallbackInterface.SUCCESS:
+                   {
+                       Log.i(TAG, "OpenCV loaded successfully");
+                       mOpenCvCameraView.enableView();
+                   } break;
+                   default:
+                   {
+                       super.onManagerConnected(status);
+                   } break;
+               }
+           }
+       };
+
+       @Override
+       public void onResume()
+       {
+           super.onResume();
+           OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_3, this, mLoaderCallback);
+       }
+
+#. Defines that your activity implements CvViewFrameListener interface and fix activity related
+   errors by defining missed methods. For this activity define ``onCreate``, ``onDestroy`` and
+   ``onPause`` and implement them according code snippet bellow. Fix errors by adding requited
+   imports.

   .. code-block:: java
      :linenos:

-      private VideoCapture      mCamera;
+       private CameraBridgeViewBase mOpenCvCameraView;

-      public boolean cameraOpen() {
-          synchronized (this) {
-              cameraRelease();
-              mCamera = new VideoCapture(Highgui.CV_CAP_ANDROID);
-              if (!mCamera.isOpened()) {
-                  mCamera.release();
-                  mCamera = null;
-                  Log.e("HelloOpenCVView", "Failed to open native camera");
-                  return false;
-              }
-          }
-          return true;
-      }
+       @Override
+       public void onCreate(Bundle savedInstanceState) {
+           Log.i(TAG, "called onCreate");
+           super.onCreate(savedInstanceState);
+           getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+           setContentView(R.layout.HelloOpenCvLayout);
+           mOpenCvCameraView = (CameraBridgeViewBase) findViewById(R.id.HelloOpenCvView);
+           mOpenCvCameraView.setVisibility(SurfaceView.VISIBLE);
+           mOpenCvCameraView.setCvCameraViewListener(this);
+       }

-      public void cameraRelease() {
-          synchronized(this) {
-              if (mCamera != null) {
-                   mCamera.release();
-                   mCamera = null;
-              }
-          }
-      }
+       @Override
+       public void onPause()
+       {
+           super.onPause();
+           if (mOpenCvCameraView != null)
+               mOpenCvCameraView.disableView();
+       }

-      private void cameraSetup(int width, int height) {
-          synchronized (this) {
-              if (mCamera != null && mCamera.isOpened()) {
-                  List<Size> sizes = mCamera.getSupportedPreviewSizes();
-                  int mFrameWidth = width;
-                  int mFrameHeight = height;
-                  { // selecting optimal camera preview size
-                       double minDiff = Double.MAX_VALUE;
-                       for (Size size : sizes) {
-                           if (Math.abs(size.height - height) < minDiff) {
-                               mFrameWidth = (int) size.width;
-                               mFrameHeight = (int) size.height;
-                               minDiff = Math.abs(size.height - height);
-                           }
-                       }
-                   }
-                   mCamera.set(Highgui.CV_CAP_PROP_FRAME_WIDTH, mFrameWidth);
-                   mCamera.set(Highgui.CV_CAP_PROP_FRAME_HEIGHT, mFrameHeight);
-              }
-          }
-      }
+       public void onDestroy() {
+           super.onDestroy();
+           if (mOpenCvCameraView != null)
+               mOpenCvCameraView.disableView();
+       }

-#. The last step would be to update the *run()* void in *HelloOpenCVView* class as follows:
+       public void onCameraViewStarted(int width, int height) {
+       }

-   .. code-block:: java
-      :linenos:
+       public void onCameraViewStopped() {
+       }

-      public void run() {
-          while (true) {
-              Bitmap bmp = null;
-              synchronized (this) {
-                  if (mCamera == null)
-                      break;
-                  if (!mCamera.grab())
-                      break;
+       public Mat onCameraFrame(Mat inputFrame) {
+           return inputFrame;
+       }

-                  bmp = processFrame(mCamera);
-              }
-              if (bmp != null) {
-                  Canvas canvas = getHolder().lockCanvas();
-                  if (canvas != null) {
-                      canvas.drawBitmap(bmp, (canvas.getWidth()  - bmp.getWidth())  / 2,
-                                             (canvas.getHeight() - bmp.getHeight()) / 2, null);
-                      getHolder().unlockCanvasAndPost(canvas);
+#. Run your application on device or emulator.

-                  }
-                  bmp.recycle();
-              }
-          }
-      }
+Lets discuss some most important steps. Every Android application with UI must implement Activity
+and View. By the first steps we create blank activity and default view layout. The simplest
+OpenCV-centric application must implement OpenCV initialization, create its own view to show
+preview from camera and implements ``CvViewFrameListener`` interface to get frames from camera and
+process it.

-      protected Bitmap processFrame(VideoCapture capture) {
-          Mat mRgba = new Mat();
-          capture.retrieve(mRgba, Highgui.CV_CAP_ANDROID_COLOR_FRAME_RGBA);
-          //process mRgba
-          Bitmap bmp = Bitmap.createBitmap(mRgba.cols(), mRgba.rows(), Bitmap.Config.ARGB_8888);
-          try {
-              Utils.matToBitmap(mRgba, bmp);
-          } catch(Exception e) {
-              Log.e("processFrame", "Utils.matToBitmap() throws an exception: " + e.getMessage());
-              bmp.recycle();
-              bmp = null;
-          }
-          return bmp;
-      }
+First of all we create our application view using xml layout. Our layout consists of the only
+one full screen component of class ``org.opencv.android.JavaCameraView``. This class is
+implemented inside OpenCV library. It is inherited from ``CameraBridgeViewBase``, that extends
+``SurfaceView`` and uses standard Android camera API. Alternatively you can use
+``org.opencv.android.NativeCameraView`` class, that implements the same interface, but uses
+``VideoCapture`` class as camera access back-end. ``opencv:show_fps="true"`` and
+``opencv:camera_id="any"`` options enable FPS message and allow to use any camera on device.
+Application tries to use back camera first.
+
+After creating layout we need to implement ``Activity`` class. OpenCV initialization process has
+been already discussed above. In this sample we use asynchronous initialization. Implementation of
+``CvCameraViewListener`` interface allows you to add processing steps after frame grabbing from
+camera and before its rendering on screen. The most important function is ``onCameraFrame``. It is
+callback function and it is called on retrieving frame from camera. The callback input is frame
+from camera. RGBA format is used by default. You can change this behavior by ``SetCaptureFormat``
+method of ``View`` class. ``Highgui.CV_CAP_ANDROID_COLOR_FRAME_RGBA`` and
+``Highgui.CV_CAP_ANDROID_GREY_FRAME`` are supported. It expects that function returns RGBA frame
+that will be drawn on the screen.
@@ -25,8 +25,8 @@ Let's use a simple program such as DisplayImage.cpp shown below.

 .. code-block:: cpp

-   #include <cv.h>
-   #include <highgui.h>
+   #include <stdio.h>
+   #include <opencv2/opencv.hpp>

   using namespace cv;

@@ -55,9 +55,10 @@ Now you have to create your CMakeLists.txt file. It should look like this:

 .. code-block:: cmake

+   cmake_minimum_required(VERSION 2.8)
   project( DisplayImage )
   find_package( OpenCV REQUIRED )
-   add_executable( DisplayImage DisplayImage )
+   add_executable( DisplayImage DisplayImage.cpp )
   target_link_libraries( DisplayImage ${OpenCV_LIBS} )

 Generate the executable
@@ -15,7 +15,7 @@ In this tutorial you will learn how to:
 .. container:: enumeratevisibleitemswithsquare

   * Load an image using :imread:`imread <>`
-   * Transform an image from RGB to Grayscale format by using :cvt_color:`cvtColor <>`
+   * Transform an image from BGR to Grayscale format by using :cvt_color:`cvtColor <>`
   * Save your transformed image in a file on disk (using :imwrite:`imwrite <>`)

 Code
@@ -45,7 +45,7 @@ Here it is:
    }

    Mat gray_image;
-    cvtColor( image, gray_image, CV_RGB2GRAY );
+    cvtColor( image, gray_image, CV_BGR2GRAY );

    imwrite( "../../images/Gray_Image.jpg", gray_image );

@@ -68,11 +68,11 @@ Explanation
   * Creating a Mat object to store the image information
   * Load an image using :imread:`imread <>`, located in the path given by *imageName*. Fort this example, assume you are loading a RGB image.
   
-#. Now we are going to convert our image from RGB to Grayscale format. OpenCV has a really nice function to do this kind of transformations: 
+#. Now we are going to convert our image from BGR to Grayscale format. OpenCV has a really nice function to do this kind of transformations: 

   .. code-block:: cpp
     
-      cvtColor( image, gray_image, CV_RGB2GRAY );
+      cvtColor( image, gray_image, CV_BGR2GRAY );

   As you can see, :cvt_color:`cvtColor <>` takes as arguments:

@@ -80,7 +80,7 @@ Explanation

      * a source image (*image*) 
      * a destination image (*gray_image*), in which we will save the converted image.
-      * an additional parameter that indicates what kind of transformation will be performed. In this case we use **CV_RGB2GRAY** (self-explanatory).
+      * an additional parameter that indicates what kind of transformation will be performed. In this case we use **CV_BGR2GRAY** (because of :imread:`imread <>` has BGR default channel order in case of color images).

 #. So now we have our new *gray_image* and want to save it on disk (otherwise it will get lost after the program ends). To save it, we will use a function analagous to :imread:`imread <>`: :imwrite:`imwrite <>`

@@ -137,7 +137,7 @@ Here you can read tutorials about how to set up your computer to work with the O
  ================ =================================================
  |AndroidLogo|    **Title:** :ref:`dev_with_OCV_on_Android`

-                   *Compatibility:* > OpenCV 2.4.2
+                   *Compatibility:* > OpenCV 2.4.3

                   *Author:* |Author_VsevolodG|

@@ -20,11 +20,7 @@ Installation by Using the Pre-built Libraries

   .. If you downloaded the source files present here see :ref:`CppTutWindowsMakeOwn`.

-#. Make sure you have admin rights. Start the setup and follow the wizard.
-
-#. While adding the OpenCV library to the system path is a good decision for a better control, we will do it manually for the sake of this tutorial. Make sure you do not set this option.
-
-#. Most of the time it is a good idea to install the source files too, as this will allow for you to debug into the OpenCV library, if it is necessary. Follow the default settings of the wizard and finish the installation.
+#. Make sure you have admin rights. Unpack the self-extracting archive.

 #. You can check the installation at the chosen path as you can see below.

@@ -294,15 +290,7 @@ Building the library
      :alt: The Install Project
      :align: center

-   This will create an *install* directory inside the *Build* one collecting all the built binaries into a single place. Use this only after you built both the *Release* and *Debug* versions.
-
-   .. note::
-
-      To create an installer you need to install `NSIS <http://nsis.sourceforge.net/Download>`_. Then just build the *Package* project to build the installer into the :file:`Build/_CPack_Packages/{win32}/NSIS` folder. You can then use this to distribute OpenCV with your build settings on other systems.
-
-      .. image:: images/WindowsOpenCVInstaller.png
-         :alt: The Installer directory
-         :align: center
+   This will create an *Install* directory inside the *Build* one collecting all the built binaries into a single place. Use this only after you built both the *Release* and *Debug* versions.

   To test your build just go into the :file:`Build/bin/Debug` or :file:`Build/bin/Release` directory and start a couple of applications like the *contours.exe*. If they run, you are done. Otherwise, something definitely went awfully wrong. In this case you should contact us via our :opencv_group:`user group <>`.
   If everything is okay the *contours.exe* output should resemble the following image (if built with Qt support):
@@ -320,15 +308,15 @@ Building the library
 Set the OpenCV enviroment variable and add it to the systems path
 =================================================================

-First we set an enviroment variable to make easier our work. This will hold the install directory of our OpenCV library that we use in our projects. Start up a command window and enter:
+First we set an enviroment variable to make easier our work. This will hold the build directory of our OpenCV library that we use in our projects. Start up a command window and enter:

 ::

-   setx -m OPENCV_DIR D:\OpenCV\Build\Install
+   setx -m OPENCV_DIR D:\OpenCV\Build\x86\vc10

-Here the directory is where you have your OpenCV binaries (*installed* or *built*). Inside this you should have folders like *bin* and *include*. The -m should be added if you wish to make the settings computer wise, instead of user wise.
+Here the directory is where you have your OpenCV binaries (*extracted* or *built*). You can have different platform (e.g. x64 instead of x86) or compiler type, so substitute appropriate value. Inside this you should have folders like *bin* and *include*. The -m should be added if you wish to make the settings computer wise, instead of user wise.

-If you built static libraries then you are done. Otherwise, you need to add the *bin* folders path to the systems path.This is cause you will use the OpenCV library in form of *\"Dynamic-link libraries\"* (also known as **DLL**). Inside these are stored all the algorithms and information the OpenCV library contains. The operating system will load them only on demand, during runtime. However, to do this he needs to know where they are. The systems **PATH** contains a list of folders where DLLs can be found. Add the OpenCV library path to this and the OS will know where to look if he ever needs the OpenCV binaries. Otherwise, you will need to copy the used DLLs right beside the applications executable file (*exe*) for the OS to find it, which is highly unpleasent if you work on many projects. To do this start up again the |PathEditor|_ and add the following new entry (right click in the application to bring up the menu):
+If you built static libraries then you are done. Otherwise, you need to add the *bin* folders path to the systems path. This is cause you will use the OpenCV library in form of *\"Dynamic-link libraries\"* (also known as **DLL**). Inside these are stored all the algorithms and information the OpenCV library contains. The operating system will load them only on demand, during runtime. However, to do this he needs to know where they are. The systems **PATH** contains a list of folders where DLLs can be found. Add the OpenCV library path to this and the OS will know where to look if he ever needs the OpenCV binaries. Otherwise, you will need to copy the used DLLs right beside the applications executable file (*exe*) for the OS to find it, which is highly unpleasent if you work on many projects. To do this start up again the |PathEditor|_ and add the following new entry (right click in the application to bring up the menu):

 ::

@@ -342,6 +330,6 @@ If you built static libraries then you are done. Otherwise, you need to add the
   :alt: Add the entry.
   :align: center

-Save it to the registry and you are done. If you ever change the location of your install directories or want to try out your applicaton with a different build all you will need to do is to update the OPENCV_DIR variable via the *setx* command inside a command window.
+Save it to the registry and you are done. If you ever change the location of your build directories or want to try out your applicaton with a different build all you will need to do is to update the OPENCV_DIR variable via the *setx* command inside a command window.

 Now you can continue reading the tutorials with the :ref:`Windows_Visual_Studio_How_To` section. There you will find out how to use the OpenCV library in your own projects with the help of the Microsoft Visual Studio IDE.
@@ -71,7 +71,9 @@ There are functions in OpenCV, especially from calib3d module, such as ``project
    //... fill the array
    Mat pointsMat = Mat(points);

-One can access a point in this matrix using the same method \texttt{Mat::at}: ::
+One can access a point in this matrix using the same method ``Mat::at`` : 
+
+::

    Point2f point = pointsMat.at<Point2f>(i, 0);

@@ -109,7 +111,7 @@ Selecting a region of interest: ::
    Rect r(10, 10, 100, 100);
    Mat smallImg = img(r);

-A convertion from \texttt{Mat} to C API data structures: ::
+A convertion from ``Mat`` to C API data structures: ::

    Mat img = imread("image.jpg");
    IplImage img1 = img;
@@ -142,7 +144,7 @@ A call to ``waitKey()`` starts a message passing cycle that waits for a key stro

    Mat img = imread("image.jpg");
    Mat grey;
-    cvtColor(img, grey, CV_BGR2GREY);
+    cvtColor(img, grey, CV_BGR2GRAY);

    Mat sobelx;
    Sobel(grey, sobelx, CV_32F, 1, 0);
@@ -150,7 +152,7 @@ A call to ``waitKey()`` starts a message passing cycle that waits for a key stro
    double minVal, maxVal;
    minMaxLoc(sobelx, &minVal, &maxVal); //find minimum and maximum intensities
    Mat draw;
-    sobelx.convertTo(draw, CV_8U, 255.0/(maxVal - minVal), -minVal);
+    sobelx.convertTo(draw, CV_8U, 255.0/(maxVal - minVal), -minVal * 255.0/(maxVal - minVal));

    namedWindow("image", CV_WINDOW_AUTOSIZE);
    imshow("image", draw);
@@ -3,6 +3,7 @@
 #include <sys/stat.h>
 #include <dirent.h>
 #include <android/log.h>
+#include <cctype>
 #include <string>
 #include <vector>
 #include <algorithm>
@@ -268,7 +269,7 @@ void CameraWrapperConnector::fillListWrapperLibs(const string& folderPath, vecto

 std::string CameraWrapperConnector::getDefaultPathLibFolder()
 {
-    #define BIN_PACKAGE_NAME(x) "org.opencv.lib_v" CVAUX_STR(CV_MAJOR_VERSION) CVAUX_STR(CV_MINOR_VERSION) "_" x
+    #define BIN_PACKAGE_NAME(x) "org.opencv.lib_v" CVAUX_STR(CV_VERSION_EPOCH) CVAUX_STR(CV_VERSION_MAJOR) "_" x
    const char* const packageList[] = {BIN_PACKAGE_NAME("armv7a"), OPENCV_ENGINE_PACKAGE};
    for (size_t i = 0; i < sizeof(packageList)/sizeof(packageList[0]); i++)
    {
@@ -303,8 +304,8 @@ std::string CameraWrapperConnector::getPathLibFolder()
        LOGD("Library name: %s", dl_info.dli_fname);
        LOGD("Library base address: %p", dl_info.dli_fbase);

-    const char* libName=dl_info.dli_fname;
-    while( ((*libName)=='/') || ((*libName)=='.') )
+        const char* libName=dl_info.dli_fname;
+        while( ((*libName)=='/') || ((*libName)=='.') )
        libName++;

        char lineBuf[2048];
@@ -312,9 +313,9 @@ std::string CameraWrapperConnector::getPathLibFolder()

        if(file)
        {
-        while (fgets(lineBuf, sizeof lineBuf, file) != NULL)
-        {
-        //verify that line ends with library name
+            while (fgets(lineBuf, sizeof lineBuf, file) != NULL)
+            {
+                //verify that line ends with library name
                int lineLength = strlen(lineBuf);
                int libNameLength = strlen(libName);

@@ -327,7 +328,7 @@ std::string CameraWrapperConnector::getPathLibFolder()

                if (0 != strncmp(lineBuf + lineLength - libNameLength, libName, libNameLength))
                {
-            //the line does not contain the library name
+                //the line does not contain the library name
                    continue;
                }

@@ -346,18 +347,18 @@ std::string CameraWrapperConnector::getPathLibFolder()

                fclose(file);
                return pathBegin;
-        }
-        fclose(file);
-        LOGE("Could not find library path");
+            }
+            fclose(file);
+            LOGE("Could not find library path");
        }
        else
        {
-        LOGE("Could not read /proc/self/smaps");
+            LOGE("Could not read /proc/self/smaps");
        }
    }
    else
    {
-    LOGE("Could not get library name and base address");
+        LOGE("Could not get library name and base address");
    }

    return string();
@@ -1201,7 +1201,7 @@ StereoSGBM::StereoSGBM

    :param speckleWindowSize: Maximum size of smooth disparity regions to consider their noise speckles and invalidate. Set it to 0 to disable speckle filtering. Otherwise, set it somewhere in the 50-200 range.

-    :param speckleRange: Maximum disparity variation within each connected component. If you do speckle filtering, set the parameter to a positive value, multiple of 16. Normally, 16 or 32 is good enough.
+    :param speckleRange: Maximum disparity variation within each connected component. If you do speckle filtering, set the parameter to a positive value, it will be implicitly multiplied by 16. Normally, 1 or 2 is good enough.

    :param fullDP: Set it to  ``true``  to run the full-scale two-pass dynamic programming algorithm. It will consume O(W*H*numDisparities) bytes, which is large for 640x480 stereo and huge for HD-size pictures. By default, it is set to ``false`` .

@@ -16,7 +16,7 @@ typedef perf::TestBaseWithParam<int> PointsNum;

 PERF_TEST_P(PointsNum_Algo, solvePnP,
            testing::Combine(
-                testing::Values(4, 3*9, 7*13),
+                testing::Values(/*4,*/ 3*9, 7*13), //TODO: find why results on 4 points are too unstable
                testing::Values((int)CV_ITERATIVE, (int)CV_EPNP)
                )
            )
@@ -43,9 +43,9 @@
 #ifndef _CV_MODEL_EST_H_
 #define _CV_MODEL_EST_H_

-#include "precomp.hpp"
+#include "opencv2/calib3d/calib3d.hpp"

-class CvModelEstimator2
+class CV_EXPORTS CvModelEstimator2
 {
 public:
    CvModelEstimator2(int _modelPoints, CvSize _modelSize, int _maxBasicSolutions);
@@ -412,7 +412,7 @@ CV_IMPL void cvComposeRT( const CvMat* _rvec1, const CvMat* _tvec1,
    cvRodrigues2( &r1, &R1, &dR1dr1 );
    cvRodrigues2( &r2, &R2, &dR2dr2 );

-    if( _rvec3 || dr3dr1 || dr3dr1 )
+    if( _rvec3 || dr3dr1 || dr3dr2 )
    {
        double _r3[3], _R3[9], _dR3dR1[9*9], _dR3dR2[9*9], _dr3dR3[9*3];
        double _W1[9*3], _W2[3*3];
@@ -2778,17 +2778,13 @@ CV_IMPL int cvStereoRectifyUncalibrated(
    cvPerspectiveTransform( _m1, _m1, &H0 );
    cvPerspectiveTransform( _m2, _m2, &H2 );
    CvMat A = cvMat( 1, npoints, CV_64FC3, lines1 ), BxBy, B;
-    double a[9], atb[3], x[3];
-    CvMat AtA = cvMat( 3, 3, CV_64F, a );
-    CvMat AtB = cvMat( 3, 1, CV_64F, atb );
+    double x[3];
    CvMat X = cvMat( 3, 1, CV_64F, x );
    cvConvertPointsHomogeneous( _m1, &A );
    cvReshape( &A, &A, 1, npoints );
    cvReshape( _m2, &BxBy, 1, npoints );
    cvGetCol( &BxBy, &B, 0 );
-    cvGEMM( &A, &A, 1, 0, 0, &AtA, CV_GEMM_A_T );
-    cvGEMM( &A, &B, 1, 0, 0, &AtB, CV_GEMM_A_T );
-    cvSolve( &AtA, &AtB, &X, CV_SVD_SYM );
+    cvSolve( &A, &B, &X, CV_SVD );

    double ha[] =
    {
@@ -3364,7 +3360,11 @@ void cv::projectPoints( InputArray _opoints,
    CvMat c_cameraMatrix = cameraMatrix;
    CvMat c_rvec = rvec, c_tvec = tvec;

+    double dc0buf[5]={0};
+    Mat dc0(5,1,CV_64F,dc0buf);
    Mat distCoeffs = _distCoeffs.getMat();
+    if( distCoeffs.empty() )
+        distCoeffs = dc0;
    CvMat c_distCoeffs = distCoeffs;
    int ndistCoeffs = distCoeffs.rows + distCoeffs.cols - 1;

@@ -3379,8 +3379,7 @@ void cv::projectPoints( InputArray _opoints,
        pdpddist = &(dpddist = jacobian.colRange(10, 10+ndistCoeffs));
    }

-    cvProjectPoints2( &c_objectPoints, &c_rvec, &c_tvec, &c_cameraMatrix,
-                      (distCoeffs.empty())? 0: &c_distCoeffs,
+    cvProjectPoints2( &c_objectPoints, &c_rvec, &c_tvec, &c_cameraMatrix, &c_distCoeffs,
                      &c_imagePoints, pdpdrot, pdpdt, pdpdf, pdpdc, pdpddist, aspectRatio );
 }

@@ -3739,13 +3738,13 @@ float cv::rectify3Collinear( InputArray _cameraMatrix1, InputArray _distCoeffs1,
                   OutputArray _Rmat1, OutputArray _Rmat2, OutputArray _Rmat3,
                   OutputArray _Pmat1, OutputArray _Pmat2, OutputArray _Pmat3,
                   OutputArray _Qmat,
-                   double alpha, Size /*newImgSize*/,
+                   double alpha, Size newImgSize,
                   Rect* roi1, Rect* roi2, int flags )
 {
    // first, rectify the 1-2 stereo pair
    stereoRectify( _cameraMatrix1, _distCoeffs1, _cameraMatrix2, _distCoeffs2,
                   imageSize, _Rmat12, _Tmat12, _Rmat1, _Rmat2, _Pmat1, _Pmat2, _Qmat,
-                   flags, alpha, imageSize, roi1, roi2 );
+                   flags, alpha, newImgSize, roi1, roi2 );

    Mat R12 = _Rmat12.getMat(), R13 = _Rmat13.getMat(), T12 = _Tmat12.getMat(), T13 = _Tmat13.getMat();

@@ -319,6 +319,9 @@ bool CvModelEstimator2::getSubset( const CvMat* m1, const CvMat* m2,

 bool CvModelEstimator2::checkSubset( const CvMat* m, int count )
 {
+    if( count <= 2 )
+        return true;
+
    int j, k, i, i0, i1;
    CvPoint2D64f* ptr = (CvPoint2D64f*)m->data.ptr;

@@ -351,7 +354,7 @@ bool CvModelEstimator2::checkSubset( const CvMat* m, int count )
            break;
    }

-    return i >= i1;
+    return i > i1;
 }


@@ -457,23 +460,24 @@ int cv::estimateAffine3D(InputArray _from, InputArray _to,
                         double param1, double param2)
 {
    Mat from = _from.getMat(), to = _to.getMat();
-    int count = from.checkVector(3, CV_32F);
+    int count = from.checkVector(3);

-    CV_Assert( count >= 0 && to.checkVector(3, CV_32F) == count );
+    CV_Assert( count >= 0 && to.checkVector(3) == count );

    _out.create(3, 4, CV_64F);
    Mat out = _out.getMat();

-    _inliers.create(count, 1, CV_8U, -1, true);
-    Mat inliers = _inliers.getMat();
+    Mat inliers(1, count, CV_8U);
    inliers = Scalar::all(1);

    Mat dFrom, dTo;
    from.convertTo(dFrom, CV_64F);
    to.convertTo(dTo, CV_64F);
+    dFrom = dFrom.reshape(3, 1);
+    dTo = dTo.reshape(3, 1);

    CvMat F3x4 = out;
-    CvMat mask  = inliers;
+    CvMat mask = inliers;
    CvMat m1 = dFrom;
    CvMat m2 = dTo;

@@ -481,5 +485,9 @@ int cv::estimateAffine3D(InputArray _from, InputArray _to,
    param1 = param1 <= 0 ? 3 : param1;
    param2 = (param2 < epsilon) ? 0.99 : (param2 > 1 - epsilon) ? 0.99 : param2;

-    return Affine3DEstimator().runRANSAC(&m1, &m2, &F3x4, &mask, param1, param2 );
+    int ok = Affine3DEstimator().runRANSAC(&m1, &m2, &F3x4, &mask, param1, param2 );
+    if( _inliers.needed() )
+        transpose(inliers, _inliers);
+
+    return ok;
 }
@@ -119,12 +119,6 @@ static  CvStatus  icvPOSIT( CvPOSITObject *pObject, CvPoint2D32f *imagePoints,
    float diff = (float)criteria.epsilon;
    float inv_focalLength = 1 / focalLength;

-    /* init variables */
-    int N = pObject->N;
-    float *objectVectors = pObject->obj_vecs;
-    float *invMatrix = pObject->inv_matr;
-    float *imgVectors = pObject->img_vecs;
-
    /* Check bad arguments */
    if( imagePoints == NULL )
        return CV_NULLPTR_ERR;
@@ -143,6 +137,12 @@ static  CvStatus  icvPOSIT( CvPOSITObject *pObject, CvPoint2D32f *imagePoints,
    if( (criteria.type & CV_TERMCRIT_ITER) && criteria.max_iter <= 0 )
        return CV_BADFACTOR_ERR;

+    /* init variables */
+    int N = pObject->N;
+    float *objectVectors = pObject->obj_vecs;
+    float *invMatrix = pObject->inv_matr;
+    float *imgVectors = pObject->img_vecs;
+
    while( !converged )
    {
        if( count == 0 )
@@ -857,105 +857,120 @@ Rect getValidDisparityROI( Rect roi1, Rect roi2,

 }

+namespace
+{
+    template <typename T>
+    void filterSpecklesImpl(cv::Mat& img, int newVal, int maxSpeckleSize, int maxDiff, cv::Mat& _buf)
+    {
+        using namespace cv;
+
+        int width = img.cols, height = img.rows, npixels = width*height;
+        size_t bufSize = npixels*(int)(sizeof(Point2s) + sizeof(int) + sizeof(uchar));
+        if( !_buf.isContinuous() || !_buf.data || _buf.cols*_buf.rows*_buf.elemSize() < bufSize )
+            _buf.create(1, (int)bufSize, CV_8U);
+
+        uchar* buf = _buf.data;
+        int i, j, dstep = (int)(img.step/sizeof(T));
+        int* labels = (int*)buf;
+        buf += npixels*sizeof(labels[0]);
+        Point2s* wbuf = (Point2s*)buf;
+        buf += npixels*sizeof(wbuf[0]);
+        uchar* rtype = (uchar*)buf;
+        int curlabel = 0;
+
+        // clear out label assignments
+        memset(labels, 0, npixels*sizeof(labels[0]));
+
+        for( i = 0; i < height; i++ )
+        {
+            T* ds = img.ptr<T>(i);
+            int* ls = labels + width*i;
+
+            for( j = 0; j < width; j++ )
+            {
+                if( ds[j] != newVal )   // not a bad disparity
+                {
+                    if( ls[j] )     // has a label, check for bad label
+                    {
+                        if( rtype[ls[j]] ) // small region, zero out disparity
+                            ds[j] = (T)newVal;
+                    }
+                    // no label, assign and propagate
+                    else
+                    {
+                        Point2s* ws = wbuf; // initialize wavefront
+                        Point2s p((short)j, (short)i);  // current pixel
+                        curlabel++; // next label
+                        int count = 0;  // current region size
+                        ls[j] = curlabel;
+
+                        // wavefront propagation
+                        while( ws >= wbuf ) // wavefront not empty
+                        {
+                            count++;
+                            // put neighbors onto wavefront
+                            T* dpp = &img.at<T>(p.y, p.x);
+                            T dp = *dpp;
+                            int* lpp = labels + width*p.y + p.x;
+
+                            if( p.x < width-1 && !lpp[+1] && dpp[+1] != newVal && std::abs(dp - dpp[+1]) <= maxDiff )
+                            {
+                                lpp[+1] = curlabel;
+                                *ws++ = Point2s(p.x+1, p.y);
+                            }
+
+                            if( p.x > 0 && !lpp[-1] && dpp[-1] != newVal && std::abs(dp - dpp[-1]) <= maxDiff )
+                            {
+                                lpp[-1] = curlabel;
+                                *ws++ = Point2s(p.x-1, p.y);
+                            }
+
+                            if( p.y < height-1 && !lpp[+width] && dpp[+dstep] != newVal && std::abs(dp - dpp[+dstep]) <= maxDiff )
+                            {
+                                lpp[+width] = curlabel;
+                                *ws++ = Point2s(p.x, p.y+1);
+                            }
+
+                            if( p.y > 0 && !lpp[-width] && dpp[-dstep] != newVal && std::abs(dp - dpp[-dstep]) <= maxDiff )
+                            {
+                                lpp[-width] = curlabel;
+                                *ws++ = Point2s(p.x, p.y-1);
+                            }
+
+                            // pop most recent and propagate
+                            // NB: could try least recent, maybe better convergence
+                            p = *--ws;
+                        }
+
+                        // assign label type
+                        if( count <= maxSpeckleSize )   // speckle region
+                        {
+                            rtype[ls[j]] = 1;   // small region label
+                            ds[j] = (T)newVal;
+                        }
+                        else
+                            rtype[ls[j]] = 0;   // large region label
+                    }
+                }
+            }
+        }
+    }
+}
+
 void cv::filterSpeckles( InputOutputArray _img, double _newval, int maxSpeckleSize,
                         double _maxDiff, InputOutputArray __buf )
 {
    Mat img = _img.getMat();
    Mat temp, &_buf = __buf.needed() ? __buf.getMatRef() : temp;
-    CV_Assert( img.type() == CV_16SC1 );
+    CV_Assert( img.type() == CV_8UC1 || img.type() == CV_16SC1 );

    int newVal = cvRound(_newval);
    int maxDiff = cvRound(_maxDiff);
-    int width = img.cols, height = img.rows, npixels = width*height;
-    size_t bufSize = npixels*(int)(sizeof(Point2s) + sizeof(int) + sizeof(uchar));
-    if( !_buf.isContinuous() || !_buf.data || _buf.cols*_buf.rows*_buf.elemSize() < bufSize )
-        _buf.create(1, (int)bufSize, CV_8U);

-    uchar* buf = _buf.data;
-    int i, j, dstep = (int)(img.step/sizeof(short));
-    int* labels = (int*)buf;
-    buf += npixels*sizeof(labels[0]);
-    Point2s* wbuf = (Point2s*)buf;
-    buf += npixels*sizeof(wbuf[0]);
-    uchar* rtype = (uchar*)buf;
-    int curlabel = 0;
-
-    // clear out label assignments
-    memset(labels, 0, npixels*sizeof(labels[0]));
-
-    for( i = 0; i < height; i++ )
-    {
-        short* ds = img.ptr<short>(i);
-        int* ls = labels + width*i;
-
-        for( j = 0; j < width; j++ )
-        {
-            if( ds[j] != newVal )   // not a bad disparity
-            {
-                if( ls[j] )     // has a label, check for bad label
-                {
-                    if( rtype[ls[j]] ) // small region, zero out disparity
-                        ds[j] = (short)newVal;
-                }
-                // no label, assign and propagate
-                else
-                {
-                    Point2s* ws = wbuf; // initialize wavefront
-                    Point2s p((short)j, (short)i);  // current pixel
-                    curlabel++; // next label
-                    int count = 0;  // current region size
-                    ls[j] = curlabel;
-
-                    // wavefront propagation
-                    while( ws >= wbuf ) // wavefront not empty
-                    {
-                        count++;
-                        // put neighbors onto wavefront
-                        short* dpp = &img.at<short>(p.y, p.x);
-                        short dp = *dpp;
-                        int* lpp = labels + width*p.y + p.x;
-
-                        if( p.x < width-1 && !lpp[+1] && dpp[+1] != newVal && std::abs(dp - dpp[+1]) <= maxDiff )
-                        {
-                            lpp[+1] = curlabel;
-                            *ws++ = Point2s(p.x+1, p.y);
-                        }
-
-                        if( p.x > 0 && !lpp[-1] && dpp[-1] != newVal && std::abs(dp - dpp[-1]) <= maxDiff )
-                        {
-                            lpp[-1] = curlabel;
-                            *ws++ = Point2s(p.x-1, p.y);
-                        }
-
-                        if( p.y < height-1 && !lpp[+width] && dpp[+dstep] != newVal && std::abs(dp - dpp[+dstep]) <= maxDiff )
-                        {
-                            lpp[+width] = curlabel;
-                            *ws++ = Point2s(p.x, p.y+1);
-                        }
-
-                        if( p.y > 0 && !lpp[-width] && dpp[-dstep] != newVal && std::abs(dp - dpp[-dstep]) <= maxDiff )
-                        {
-                            lpp[-width] = curlabel;
-                            *ws++ = Point2s(p.x, p.y-1);
-                        }
-
-                        // pop most recent and propagate
-                        // NB: could try least recent, maybe better convergence
-                        p = *--ws;
-                    }
-
-                    // assign label type
-                    if( count <= maxSpeckleSize )   // speckle region
-                    {
-                        rtype[ls[j]] = 1;   // small region label
-                        ds[j] = (short)newVal;
-                    }
-                    else
-                        rtype[ls[j]] = 0;   // large region label
-                }
-            }
-        }
-    }
+    if (img.type() == CV_8UC1)
+        filterSpecklesImpl<uchar>(img, newVal, maxSpeckleSize, maxDiff, _buf);
+    else
+        filterSpecklesImpl<short>(img, newVal, maxSpeckleSize, maxDiff, _buf);
 }

 void cv::validateDisparity( InputOutputArray _disp, InputArray _cost, int minDisparity,
@@ -0,0 +1,226 @@
+/*M///////////////////////////////////////////////////////////////////////////////////////
+//
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+//  By downloading, copying, installing or using the software you agree to this license.
+//  If you do not agree to this license, do not download, install,
+//  copy or use the software.
+//
+//
+//                        Intel License Agreement
+//                For Open Source Computer Vision Library
+//
+// Copyright (C) 2000, Intel Corporation, all rights reserved.
+// Third party copyrights are property of their respective owners.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+//   * Redistribution's of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//
+//   * Redistribution's in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//   * The name of Intel Corporation may not be used to endorse or promote products
+//     derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is" and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+//M*/
+
+#include "test_precomp.hpp"
+#include "_modelest.h"
+
+using namespace cv;
+
+class BareModelEstimator : public CvModelEstimator2
+{
+public:
+    BareModelEstimator(int modelPoints, CvSize modelSize, int maxBasicSolutions);
+
+    virtual int runKernel( const CvMat*, const CvMat*, CvMat* );
+    virtual void computeReprojError( const CvMat*, const CvMat*,
+                                     const CvMat*, CvMat* );
+
+    bool checkSubsetPublic( const CvMat* ms1, int count, bool checkPartialSubset );
+};
+
+BareModelEstimator::BareModelEstimator(int _modelPoints, CvSize _modelSize, int _maxBasicSolutions)
+    :CvModelEstimator2(_modelPoints, _modelSize, _maxBasicSolutions)
+{
+}
+
+int BareModelEstimator::runKernel( const CvMat*, const CvMat*, CvMat* )
+{
+    return 0;
+}
+
+void BareModelEstimator::computeReprojError( const CvMat*, const CvMat*,
+                                             const CvMat*, CvMat* )
+{
+}
+
+bool BareModelEstimator::checkSubsetPublic( const CvMat* ms1, int count, bool checkPartialSubset )
+{
+    checkPartialSubsets = checkPartialSubset;
+    return checkSubset(ms1, count);
+}
+
+class CV_ModelEstimator2_Test : public cvtest::ArrayTest
+{
+public:
+    CV_ModelEstimator2_Test();
+
+protected:
+    void get_test_array_types_and_sizes( int test_case_idx, vector<vector<Size> >& sizes, vector<vector<int> >& types );
+    void fill_array( int test_case_idx, int i, int j, Mat& arr );
+    double get_success_error_level( int test_case_idx, int i, int j );
+    void run_func();
+    void prepare_to_validation( int test_case_idx );
+
+    bool checkPartialSubsets;
+    int usedPointsCount;
+
+    bool checkSubsetResult;
+    int generalPositionsCount;
+    int maxPointsCount;
+};
+
+CV_ModelEstimator2_Test::CV_ModelEstimator2_Test()
+{
+    generalPositionsCount = get_test_case_count() / 2;
+    maxPointsCount = 100;
+
+    test_array[INPUT].push_back(NULL);
+    test_array[OUTPUT].push_back(NULL);
+    test_array[REF_OUTPUT].push_back(NULL);
+}
+
+void CV_ModelEstimator2_Test::get_test_array_types_and_sizes( int /*test_case_idx*/,
+                                                              vector<vector<Size> > &sizes, vector<vector<int> > &types )
+{
+    RNG &rng = ts->get_rng();
+    checkPartialSubsets = (cvtest::randInt(rng) % 2 == 0);
+
+    int pointsCount = cvtest::randInt(rng) % maxPointsCount;
+    usedPointsCount = pointsCount == 0 ? 0 : cvtest::randInt(rng) % pointsCount;
+
+    sizes[INPUT][0] = cvSize(1, pointsCount);
+    types[INPUT][0] = CV_64FC2;
+
+    sizes[OUTPUT][0] = sizes[REF_OUTPUT][0] = cvSize(1, 1);
+    types[OUTPUT][0] = types[REF_OUTPUT][0] = CV_8UC1;
+}
+
+void CV_ModelEstimator2_Test::fill_array( int test_case_idx, int i, int j, Mat& arr )
+{
+    if( i != INPUT )
+    {
+        cvtest::ArrayTest::fill_array( test_case_idx, i, j, arr );
+        return;
+    }
+
+    if (test_case_idx < generalPositionsCount)
+    {
+        //generate points in a general position (i.e. no three points can lie on the same line.)
+
+        bool isGeneralPosition;
+        do
+        {
+            ArrayTest::fill_array(test_case_idx, i, j, arr);
+
+            //a simple check that the position is general:
+            //  for each line check that all other points don't belong to it
+            isGeneralPosition = true;
+            for (int startPointIndex = 0; startPointIndex < usedPointsCount && isGeneralPosition; startPointIndex++)
+            {
+                for (int endPointIndex = startPointIndex + 1; endPointIndex < usedPointsCount && isGeneralPosition; endPointIndex++)
+                {
+
+                    for (int testPointIndex = 0; testPointIndex < usedPointsCount && isGeneralPosition; testPointIndex++)
+                    {
+                        if (testPointIndex == startPointIndex || testPointIndex == endPointIndex)
+                        {
+                            continue;
+                        }
+
+                        CV_Assert(arr.type() == CV_64FC2);
+                        Point2d tangentVector_1 = arr.at<Point2d>(endPointIndex) - arr.at<Point2d>(startPointIndex);
+                        Point2d tangentVector_2 = arr.at<Point2d>(testPointIndex) - arr.at<Point2d>(startPointIndex);
+
+                        const float eps = 1e-4f;
+                        //TODO: perhaps it is better to normalize the cross product by norms of the tangent vectors
+                        if (fabs(tangentVector_1.cross(tangentVector_2)) < eps)
+                        {
+                            isGeneralPosition = false;
+                        }
+                    }
+                }
+            }
+        }
+        while(!isGeneralPosition);
+    }
+    else
+    {
+        //create points in a degenerate position (there are at least 3 points belonging to the same line)
+
+        ArrayTest::fill_array(test_case_idx, i, j, arr);
+        if (usedPointsCount <= 2)
+        {
+            return;
+        }
+
+        RNG &rng = ts->get_rng();
+        int startPointIndex, endPointIndex, modifiedPointIndex;
+        do
+        {
+            startPointIndex = cvtest::randInt(rng) % usedPointsCount;
+            endPointIndex = cvtest::randInt(rng) % usedPointsCount;
+            modifiedPointIndex = checkPartialSubsets ? usedPointsCount - 1 : cvtest::randInt(rng) % usedPointsCount;
+        }
+        while (startPointIndex == endPointIndex || startPointIndex == modifiedPointIndex || endPointIndex == modifiedPointIndex);
+
+        double startWeight = cvtest::randReal(rng);
+        CV_Assert(arr.type() == CV_64FC2);
+        arr.at<Point2d>(modifiedPointIndex) = startWeight * arr.at<Point2d>(startPointIndex) + (1.0 - startWeight) * arr.at<Point2d>(endPointIndex);
+    }
+}
+
+
+double CV_ModelEstimator2_Test::get_success_error_level( int /*test_case_idx*/, int /*i*/, int /*j*/ )
+{
+    return 0;
+}
+
+void CV_ModelEstimator2_Test::prepare_to_validation( int test_case_idx )
+{
+    test_mat[OUTPUT][0].at<uchar>(0) = checkSubsetResult;
+    test_mat[REF_OUTPUT][0].at<uchar>(0) = test_case_idx < generalPositionsCount || usedPointsCount <= 2;
+}
+
+void CV_ModelEstimator2_Test::run_func()
+{
+    //make the input continuous
+    Mat input = test_mat[INPUT][0].clone();
+    CvMat _input = input;
+
+    RNG &rng = ts->get_rng();
+    int modelPoints = cvtest::randInt(rng);
+    CvSize modelSize = cvSize(2, modelPoints);
+    int maxBasicSolutions = cvtest::randInt(rng);
+    BareModelEstimator modelEstimator(modelPoints, modelSize, maxBasicSolutions);
+    checkSubsetResult = modelEstimator.checkSubsetPublic(&_input, usedPointsCount, checkPartialSubsets);
+}
+
+TEST(Calib3d_ModelEstimator2, accuracy) { CV_ModelEstimator2_Test test; test.safe_run(); }
@@ -325,7 +325,7 @@ Retina::RetinaParameters
 .. ocv:struct:: Retina::RetinaParameters

  This structure merges all the parameters that can be adjusted threw the **Retina::setup()**, **Retina::setupOPLandIPLParvoChannel** and **Retina::setupIPLMagnoChannel** setup methods
-Parameters structure for better clarity, check explenations on the comments of methods : setupOPLandIPLParvoChannel and setupIPLMagnoChannel. ::
+  Parameters structure for better clarity, check explenations on the comments of methods : setupOPLandIPLParvoChannel and setupIPLMagnoChannel. ::

    class RetinaParameters{
        struct OPLandIplParvoParameters{ // Outer Plexiform Layer (OPL) and Inner Plexiform Layer Parvocellular (IplParvo) parameters
@@ -115,7 +115,7 @@ class CV_EXPORTS Retina {
 public:

    // parameters structure for better clarity, check explenations on the comments of methods : setupOPLandIPLParvoChannel and setupIPLMagnoChannel
-        struct RetinaParameters{
+    struct RetinaParameters{
        struct OPLandIplParvoParameters{ // Outer Plexiform Layer (OPL) and Inner Plexiform Layer Parvocellular (IplParvo) parameters
               OPLandIplParvoParameters():colorMode(true),
                                 normaliseOutput(true),
@@ -166,14 +166,14 @@ public:
    virtual ~Retina();

    /**
-        * retreive retina input buffer size
-        */
-        Size inputSize();
+    * retreive retina input buffer size
+    */
+    Size inputSize();

    /**
-        * retreive retina output buffer size
-        */
-        Size outputSize();
+    * retreive retina output buffer size
+    */
+    Size outputSize();

    /**
     * try to open an XML retina parameters file to adjust current retina instance setup
@@ -190,9 +190,9 @@ public:
     * => if the xml file does not exist, then default setup is applied
     * => warning, Exceptions are thrown if read XML file is not valid
     * @param fs : the open Filestorage which contains retina parameters
-         * @param applyDefaultSetupOnFailure : set to true if an error must be thrown on error
+     * @param applyDefaultSetupOnFailure : set to true if an error must be thrown on error
     */
-        void setup(cv::FileStorage &fs, const bool applyDefaultSetupOnFailure=true);
+    void setup(cv::FileStorage &fs, const bool applyDefaultSetupOnFailure=true);

    /**
     * try to open an XML retina parameters file to adjust current retina instance setup
@@ -203,10 +203,10 @@ public:
     */
    void setup(RetinaParameters newParameters);

-        /**
-         * @return the current parameters setup
-         */
-        struct Retina::RetinaParameters getParameters();
+    /**
+     * @return the current parameters setup
+     */
+    Retina::RetinaParameters getParameters();

    /**
     * parameters setup display method
@@ -305,17 +305,17 @@ public:
     */
    void clearBuffers();

-        /**
-        * Activate/desactivate the Magnocellular pathway processing (motion information extraction), by default, it is activated
-        * @param activate: true if Magnocellular output should be activated, false if not
-        */
-        void activateMovingContoursProcessing(const bool activate);
+    /**
+    * Activate/desactivate the Magnocellular pathway processing (motion information extraction), by default, it is activated
+    * @param activate: true if Magnocellular output should be activated, false if not
+    */
+    void activateMovingContoursProcessing(const bool activate);

-        /**
-        * Activate/desactivate the Parvocellular pathway processing (contours information extraction), by default, it is activated
-        * @param activate: true if Parvocellular (contours information extraction) output should be activated, false if not
-        */
-        void activateContoursProcessing(const bool activate);
+    /**
+    * Activate/desactivate the Parvocellular pathway processing (contours information extraction), by default, it is activated
+    * @param activate: true if Parvocellular (contours information extraction) output should be activated, false if not
+    */
+    void activateContoursProcessing(const bool activate);

 protected:
    // Parameteres setup members
@@ -622,7 +622,6 @@ void ChamferMatcher::Matching::followContour(Mat& templ_img, template_coords_t&
 {
    const int dir[][2] = { {-1,-1}, {-1,0}, {-1,1}, {0,1}, {1,1}, {1,0}, {1,-1}, {0,-1} };
    coordinate_t next;
-    coordinate_t next_temp;
    unsigned char ptr;

    assert (direction==-1 || !coords.empty());
@@ -767,8 +766,8 @@ void ChamferMatcher::Matching::findContourOrientations(const template_coords_t&
        }

        // get the middle two angles
-        nth_element(angles.begin(), angles.begin()+M-1,  angles.end());
-        nth_element(angles.begin()+M-1, angles.begin()+M,  angles.end());
+        std::nth_element(angles.begin(), angles.begin()+M-1,  angles.end());
+        std::nth_element(angles.begin()+M-1, angles.begin()+M,  angles.end());
        //        sort(angles.begin(), angles.end());

        // average them to compute tangent
@@ -931,15 +930,13 @@ void ChamferMatcher::Template::show() const
 void ChamferMatcher::Matching::addTemplateFromImage(Mat& templ, float scale)
 {
    Template* cmt = new Template(templ, scale);
-    if(templates.size() > 0)
-        templates.clear();
+    templates.clear();
    templates.push_back(cmt);
    cmt->show();
 }

 void ChamferMatcher::Matching::addTemplate(Template& template_){
-    if(templates.size() > 0)
-        templates.clear();
+    templates.clear();
    templates.push_back(&template_);
 }
 /**
@@ -85,7 +85,7 @@ namespace
    };
    size_t colors_mum = sizeof(colors)/sizeof(colors[0]);

-#if defined __cplusplus  && __cplusplus > 199711L
+#if (defined __cplusplus  && __cplusplus > 199711L) || defined _STLPORT_MAJOR
 #else
 template<class FwIt, class T> void iota(FwIt first, FwIt last, T value) { while(first != last) *first++ = value++; }
 #endif
@@ -10,7 +10,6 @@ if(HAVE_CUDA)
  file(GLOB lib_cuda "src/cuda/*.cu")
  ocv_cuda_compile(cuda_objs ${lib_cuda})

-
  set(cuda_link_libs ${CUDA_LIBRARIES} ${CUDA_npp_LIBRARY})
 else()
  set(lib_cuda "")
@@ -210,16 +210,40 @@ The sample below demonstrates how to use RotatedRect:

 .. seealso::

-    :ocv:cfunc:`CamShift`,
-    :ocv:func:`fitEllipse`,
-    :ocv:func:`minAreaRect`,
+    :ocv:func:`CamShift` ,
+    :ocv:func:`fitEllipse` ,
+    :ocv:func:`minAreaRect` ,
    :ocv:struct:`CvBox2D`

 TermCriteria
 ------------
 .. ocv:class:: TermCriteria

-Template class defining termination criteria for iterative algorithms.
+  The class defining termination criteria for iterative algorithms. You can initialize it by default constructor and then override any parameters, or the structure may be fully initialized using the advanced variant of the constructor.
+
+TermCriteria::TermCriteria
+--------------------------
+The constructors.
+
+.. ocv:function:: TermCriteria::TermCriteria()
+
+.. ocv:function:: TermCriteria::TermCriteria(int type, int maxCount, double epsilon)
+
+.. ocv:function:: TermCriteria::TermCriteria(const CvTermCriteria& criteria)
+
+    :param type: The type of termination criteria: ``TermCriteria::COUNT``, ``TermCriteria::EPS`` or ``TermCriteria::COUNT`` + ``TermCriteria::EPS``.
+
+    :param maxCount: The maximum number of iterations or elements to compute.
+
+    :param epsilon: The desired accuracy or change in parameters at which the iterative algorithm stops.
+
+    :param criteria: Termination criteria in the deprecated ``CvTermCriteria`` format.
+   
+TermCriteria::operator CvTermCriteria
+-------------------------------------
+Converts to the deprecated ``CvTermCriteria`` format.
+
+.. ocv:function:: TermCriteria::operator CvTermCriteria() const

 Matx
 ----
@@ -1303,7 +1327,7 @@ because ``cvtColor`` , as well as the most of OpenCV functions, calls ``Mat::cre


 Mat::addref
---------------
+-----------
 Increments the reference counter.

 .. ocv:function:: void Mat::addref()
@@ -1313,7 +1337,7 @@ The method increments the reference counter associated with the matrix data. If


 Mat::release
----------------
+------------
 Decrements the reference counter and deallocates the matrix if needed.

 .. ocv:function:: void Mat::release()
@@ -1324,7 +1348,7 @@ The method decrements the reference counter associated with the matrix data. Whe
 This method can be called manually to force the matrix data deallocation. But since this method is automatically called in the destructor, or by any other method that changes the data pointer, it is usually not needed. The reference counter decrement and check for 0 is an atomic operation on the platforms that support it. Thus, it is safe to operate on the same matrices asynchronously in different threads.

 Mat::resize
---------------
+-----------
 Changes the number of matrix rows.

 .. ocv:function:: void Mat::resize( size_t sz )
@@ -1337,7 +1361,7 @@ The methods change the number of matrix rows. If the matrix is reallocated, the


 Mat::reserve
---------------
+------------
 Reserves space for the certain number of rows.

 .. ocv:function:: void Mat::reserve( size_t sz )
@@ -1370,7 +1394,7 @@ The method removes one or more rows from the bottom of the matrix.


 Mat::locateROI
------------------
+--------------
 Locates the matrix header within a parent matrix.

 .. ocv:function:: void Mat::locateROI( Size& wholeSize, Point& ofs ) const
@@ -1387,7 +1411,7 @@ After you extracted a submatrix from a matrix using


 Mat::adjustROI
------------------
+--------------
 Adjusts a submatrix size and position within the parent matrix.

 .. ocv:function:: Mat& Mat::adjustROI( int dtop, int dbottom, int dleft, int dright )
@@ -1417,7 +1441,7 @@ The function is used internally by the OpenCV filtering functions, like


 Mat::operator()
-------------------
+---------------
 Extracts a rectangular submatrix.

 .. ocv:function:: Mat Mat::operator()( Range rowRange, Range colRange ) const
@@ -1955,202 +1979,6 @@ SparseMat
 ---------
 .. ocv:class:: SparseMat

-Sparse n-dimensional array. ::
-
-    class SparseMat
-    {
-    public:
-        typedef SparseMatIterator iterator;
-        typedef SparseMatConstIterator const_iterator;
-
-        // internal structure - sparse matrix header
-        struct Hdr
-        {
-            ...
-        };
-
-        // sparse matrix node - element of a hash table
-        struct Node
-        {
-            size_t hashval;
-            size_t next;
-            int idx[CV_MAX_DIM];
-        };
-
-        ////////// constructors and destructor //////////
-        // default constructor
-        SparseMat();
-        // creates matrix of the specified size and type
-        SparseMat(int dims, const int* _sizes, int _type);
-        // copy constructor
-        SparseMat(const SparseMat& m);
-        // converts dense array to the sparse form,
-        // if try1d is true and matrix is a single-column matrix (Nx1),
-        // then the sparse matrix will be 1-dimensional.
-        SparseMat(const Mat& m, bool try1d=false);
-        // converts an old-style sparse matrix to the new style.
-        // all the data is copied so that "m" can be safely
-        // deleted after the conversion
-        SparseMat(const CvSparseMat* m);
-        // destructor
-        ~SparseMat();
-
-        ///////// assignment operations ///////////
-
-        // this is an O(1) operation; no data is copied
-        SparseMat& operator = (const SparseMat& m);
-        // (equivalent to the corresponding constructor with try1d=false)
-        SparseMat& operator = (const Mat& m);
-
-        // creates a full copy of the matrix
-        SparseMat clone() const;
-
-        // copy all the data to the destination matrix.
-        // the destination will be reallocated if needed.
-        void copyTo( SparseMat& m ) const;
-        // converts 1D or 2D sparse matrix to dense 2D matrix.
-        // If the sparse matrix is 1D, the result will
-        // be a single-column matrix.
-        void copyTo( Mat& m ) const;
-        // converts arbitrary sparse matrix to dense matrix.
-        // multiplies all the matrix elements by the specified scalar
-        void convertTo( SparseMat& m, int rtype, double alpha=1 ) const;
-        // converts sparse matrix to dense matrix with optional type conversion and scaling.
-        // When rtype=-1, the destination element type will be the same
-        // as the sparse matrix element type.
-        // Otherwise, rtype will specify the depth and
-        // the number of channels will remain the same as in the sparse matrix
-        void convertTo( Mat& m, int rtype, double alpha=1, double beta=0 ) const;
-
-        // not used now
-        void assignTo( SparseMat& m, int type=-1 ) const;
-
-        // reallocates sparse matrix. If it was already of the proper size and type,
-        // it is simply cleared with clear(), otherwise,
-        // the old matrix is released (using release()) and the new one is allocated.
-        void create(int dims, const int* _sizes, int _type);
-        // sets all the matrix elements to 0, which means clearing the hash table.
-        void clear();
-        // manually increases reference counter to the header.
-        void addref();
-        // decreses the header reference counter when it reaches 0.
-        // the header and all the underlying data are deallocated.
-        void release();
-
-        // converts sparse matrix to the old-style representation.
-        // all the elements are copied.
-        operator CvSparseMat*() const;
-        // size of each element in bytes
-        // (the matrix nodes will be bigger because of
-        //  element indices and other SparseMat::Node elements).
-        size_t elemSize() const;
-        // elemSize()/channels()
-        size_t elemSize1() const;
-
-        // the same is in Mat
-        int type() const;
-        int depth() const;
-        int channels() const;
-
-        // returns the array of sizes and 0 if the matrix is not allocated
-        const int* size() const;
-        // returns i-th size (or 0)
-        int size(int i) const;
-        // returns the matrix dimensionality
-        int dims() const;
-        // returns the number of non-zero elements
-        size_t nzcount() const;
-
-        // compute element hash value from the element indices:
-        // 1D case
-        size_t hash(int i0) const;
-        // 2D case
-        size_t hash(int i0, int i1) const;
-        // 3D case
-        size_t hash(int i0, int i1, int i2) const;
-        // n-D case
-        size_t hash(const int* idx) const;
-
-        // low-level element-access functions,
-        // special variants for 1D, 2D, 3D cases, and the generic one for n-D case.
-        //
-        // return pointer to the matrix element.
-        //  if the element is there (it is non-zero), the pointer to it is returned
-        //  if it is not there and createMissing=false, NULL pointer is returned
-        //  if it is not there and createMissing=true, the new element
-        //    is created and initialized with 0. Pointer to it is returned.
-        //  If the optional hashval pointer is not NULL, the element hash value is
-        //  not computed but *hashval is taken instead.
-        uchar* ptr(int i0, bool createMissing, size_t* hashval=0);
-        uchar* ptr(int i0, int i1, bool createMissing, size_t* hashval=0);
-        uchar* ptr(int i0, int i1, int i2, bool createMissing, size_t* hashval=0);
-        uchar* ptr(const int* idx, bool createMissing, size_t* hashval=0);
-
-        // higher-level element access functions:
-        // ref<_Tp>(i0,...[,hashval]) - equivalent to *(_Tp*)ptr(i0,...true[,hashval]).
-        //    always return valid reference to the element.
-        //    If it does not exist, it is created.
-        // find<_Tp>(i0,...[,hashval]) - equivalent to (_const Tp*)ptr(i0,...false[,hashval]).
-        //    return pointer to the element or NULL pointer if the element is not there.
-        // value<_Tp>(i0,...[,hashval]) - equivalent to
-        //    { const _Tp* p = find<_Tp>(i0,...[,hashval]); return p ? *p : _Tp(); }
-        //    that is, 0 is returned when the element is not there.
-        // note that _Tp must match the actual matrix type -
-        // the functions do not do any on-fly type conversion
-
-        // 1D case
-        template<typename _Tp> _Tp& ref(int i0, size_t* hashval=0);
-        template<typename _Tp> _Tp value(int i0, size_t* hashval=0) const;
-        template<typename _Tp> const _Tp* find(int i0, size_t* hashval=0) const;
-
-        // 2D case
-        template<typename _Tp> _Tp& ref(int i0, int i1, size_t* hashval=0);
-        template<typename _Tp> _Tp value(int i0, int i1, size_t* hashval=0) const;
-        template<typename _Tp> const _Tp* find(int i0, int i1, size_t* hashval=0) const;
-
-        // 3D case
-        template<typename _Tp> _Tp& ref(int i0, int i1, int i2, size_t* hashval=0);
-        template<typename _Tp> _Tp value(int i0, int i1, int i2, size_t* hashval=0) const;
-        template<typename _Tp> const _Tp* find(int i0, int i1, int i2, size_t* hashval=0) const;
-
-        // n-D case
-        template<typename _Tp> _Tp& ref(const int* idx, size_t* hashval=0);
-        template<typename _Tp> _Tp value(const int* idx, size_t* hashval=0) const;
-        template<typename _Tp> const _Tp* find(const int* idx, size_t* hashval=0) const;
-
-        // erase the specified matrix element.
-        // when there is no such an element, the methods do nothing
-        void erase(int i0, int i1, size_t* hashval=0);
-        void erase(int i0, int i1, int i2, size_t* hashval=0);
-        void erase(const int* idx, size_t* hashval=0);
-
-        // return the matrix iterators,
-        //   pointing to the first sparse matrix element,
-        SparseMatIterator begin();
-        SparseMatConstIterator begin() const;
-        //   ... or to the point after the last sparse matrix element
-        SparseMatIterator end();
-        SparseMatConstIterator end() const;
-
-        // and the template forms of the above methods.
-        // _Tp must match the actual matrix type.
-        template<typename _Tp> SparseMatIterator_<_Tp> begin();
-        template<typename _Tp> SparseMatConstIterator_<_Tp> begin() const;
-        template<typename _Tp> SparseMatIterator_<_Tp> end();
-        template<typename _Tp> SparseMatConstIterator_<_Tp> end() const;
-
-        // return value stored in the sparse martix node
-        template<typename _Tp> _Tp& value(Node* n);
-        template<typename _Tp> const _Tp& value(const Node* n) const;
-
-        ////////////// some internally used methods ///////////////
-        ...
-
-        // pointer to the sparse matrix header
-        Hdr* hdr;
-    };
-
-
 The class ``SparseMat`` represents multi-dimensional sparse numerical arrays. Such a sparse array can store elements of any type that
 :ocv:class:`Mat` can store. *Sparse* means that only non-zero elements are stored (though, as a result of operations on a sparse matrix, some of its stored elements can actually become 0. It is up to you to detect such elements and delete them using ``SparseMat::erase`` ). The non-zero elements are stored in a hash table that grows when it is filled so that the search time is O(1) in average (regardless of whether element is there or not). Elements can be accessed using the following methods:

@@ -2231,6 +2059,204 @@ The class ``SparseMat`` represents multi-dimensional sparse numerical arrays. Su

    ..

+SparseMat::SparseMat
+--------------------
+Various SparseMat constructors.
+
+.. ocv:function:: SparseMat::SparseMat()
+.. ocv:function:: SparseMat::SparseMat(int dims, const int* _sizes, int _type)
+.. ocv:function:: SparseMat::SparseMat(const SparseMat& m)
+.. ocv:function:: SparseMat::SparseMat(const Mat& m, bool try1d=false)
+.. ocv:function:: SparseMat::SparseMat(const CvSparseMat* m)
+
+    :param m: Source matrix for copy constructor. If m is dense matrix (ocv:class:`Mat`) then it will be converted to sparse representation.
+    :param dims: Array dimensionality.
+    :param _sizes: Sparce matrix size on all dementions.
+    :param _type: Sparse matrix data type.
+    :param try1d: if try1d is true and matrix is a single-column matrix (Nx1), then the sparse matrix will be 1-dimensional.
+
+SparseMat::~SparseMat
+---------------------
+SparseMat object destructor.
+
+.. ocv:function:: SparseMat::~SparseMat()
+
+SparseMat::operator =
+---------------------
+Provides sparse matrix assignment operators.
+
+.. ocv:function:: SparseMat& SparseMat::operator=(const SparseMat& m)
+.. ocv:function:: SparseMat& SparseMat::operator=(const Mat& m)
+
+The last variant is equivalent to the corresponding constructor with try1d=false.
+
+
+SparseMat::clone
+----------------
+Creates a full copy of the matrix.
+
+.. ocv:function:: SparseMat SparseMat::clone() const
+
+SparseMat::copyTo
+-----------------
+Copy all the data to the destination matrix.The destination will be reallocated if needed.
+
+.. ocv:function:: void SparseMat::copyTo( SparseMat& m ) const
+.. ocv:function:: void SparseMat::copyTo( Mat& m ) const
+
+    :param m: Target for copiing.
+
+The last variant converts 1D or 2D sparse matrix to dense 2D matrix. If the sparse matrix is 1D, the result will be a single-column matrix.
+
+SparceMat::convertTo
+--------------------
+Convert sparse matrix with possible type change and scaling.
+
+.. ocv:function:: void SparseMat::convertTo( SparseMat& m, int rtype, double alpha=1 ) const
+.. ocv:function:: void SparseMat::convertTo( Mat& m, int rtype, double alpha=1, double beta=0 ) const
+
+The first version converts arbitrary sparse matrix to dense matrix and multiplies all the matrix elements by the specified scalar.
+The second versiob converts sparse matrix to dense matrix with optional type conversion and scaling.
+When rtype=-1, the destination element type will be the same as the sparse matrix element type.
+Otherwise, rtype will specify the depth and the number of channels will remain the same as in the sparse matrix.
+
+SparseMat:create
+----------------
+Reallocates sparse matrix. If it was already of the proper size and type, it is simply cleared with clear(), otherwise,
+the old matrix is released (using release()) and the new one is allocated.
+
+.. ocv:function:: void SparseMat::create(int dims, const int* _sizes, int _type)
+
+    :param dims: Array dimensionality.
+    :param _sizes: Sparce matrix size on all dementions.
+    :param _type: Sparse matrix data type.
+
+SparseMat::clear
+----------------
+Sets all the matrix elements to 0, which means clearing the hash table.
+
+.. ocv:function:: void SparseMat::clear()
+
+SparseMat::addref
+-----------------
+Manually increases reference counter to the header.
+
+.. ocv:function:: void SparseMat::addref()
+
+SparseMat::release
+------------------
+Decreses the header reference counter when it reaches 0. The header and all the underlying data are deallocated.
+
+.. ocv:function:: void SparseMat::release()
+
+SparseMat::CvSparseMat *
+------------------------
+Converts sparse matrix to the old-style representation. All the elements are copied.
+
+.. ocv:function:: SparseMat::operator CvSparseMat*() const
+
+SparseMat::elemSize
+-------------------
+Size of each element in bytes (the matrix nodes will be bigger because of element indices and other SparseMat::Node elements).
+
+.. ocv:function:: size_t SparseMat::elemSize() const
+
+SparseMat::elemSize1
+--------------------
+elemSize()/channels().
+
+.. ocv:function::  size_t SparseMat::elemSize() const
+
+SparseMat::type
+---------------
+Returns the type of a matrix element.
+
+.. ocv:function:: int SparseMat::type() const
+
+The method returns a sparse matrix element type. This is an identifier compatible with the ``CvMat`` type system, like ``CV_16SC3`` or 16-bit signed 3-channel array, and so on.
+
+SparseMat::depth
+----------------
+Returns the depth of a sparse matrix element.
+
+.. ocv:function:: int SparseMat::depth() const
+
+The method returns the identifier of the matrix element depth (the type of each individual channel). For example, for a 16-bit signed 3-channel array, the method returns ``CV_16S``
+
+* ``CV_8U``     - 8-bit unsigned integers ( ``0..255``     )
+
+* ``CV_8S``     - 8-bit signed integers ( ``-128..127``     )
+
+* ``CV_16U``     - 16-bit unsigned integers ( ``0..65535``     )
+
+* ``CV_16S``     - 16-bit signed integers ( ``-32768..32767``     )
+
+* ``CV_32S``     - 32-bit signed integers ( ``-2147483648..2147483647``     )
+
+* ``CV_32F``     - 32-bit floating-point numbers ( ``-FLT_MAX..FLT_MAX, INF, NAN``     )
+
+* ``CV_64F``     - 64-bit floating-point numbers ( ``-DBL_MAX..DBL_MAX, INF, NAN``     )
+
+SparseMat::channels
+-------------------
+Returns the number of matrix channels.
+
+.. ocv:function:: int SparseMat::channels() const
+
+The method returns the number of matrix channels.
+
+SparseMat::size
+---------------
+Returns the array of sizes or matrix size by i dimention and 0 if the matrix is not allocated.
+
+.. ocv:function:: const int* SparseMat::size() const
+.. ocv:function:: int SparseMat::size(int i) const
+
+    :param i: Dimention index.
+
+SparseMat::dims
+---------------
+Returns the matrix dimensionality.
+
+.. ocv:function:: int SparseMat::dims() const
+
+SparseMat::nzcount
+------------------
+Returns the number of non-zero elements.
+
+.. ocv:function:: size_t SparseMat::nzcount() const
+
+SparseMat::hash
+---------------
+Compute element hash value from the element indices.
+
+.. ocv:function:: size_t SparseMat::hash(int i0) const
+.. ocv:function:: size_t SparseMat::hash(int i0, int i1) const
+.. ocv:function:: size_t SparseMat::hash(int i0, int i1, int i2) const
+.. ocv:function:: size_t SparseMat::hash(const int* idx) const
+
+SparseMat::ptr
+--------------
+Low-level element-access functions, special variants for 1D, 2D, 3D cases, and the generic one for n-D case.
+
+.. ocv:function:: uchar* SparseMat::ptr(int i0, bool createMissing, size_t* hashval=0)
+.. ocv:function:: uchar* SparseMat::ptr(int i0, int i1, bool createMissing, size_t* hashval=0)
+.. ocv:function:: uchar* SparseMat::ptr(int i0, int i1, int i2, bool createMissing, size_t* hashval=0)
+.. ocv:function:: uchar* SparseMat::ptr(const int* idx, bool createMissing, size_t* hashval=0)
+
+Return pointer to the matrix element. If the element is there (it is non-zero), the pointer to it is returned.
+If it is not there and ``createMissing=false``, NULL pointer is returned. If it is not there and ``createMissing=true``,
+the new elementis created and initialized with 0. Pointer to it is returned. If the optional hashval pointer is not ``NULL``,
+the element hash value is not computed but ``hashval`` is taken instead.
+
+SparseMat::erase
+----------------
+Erase the specified matrix element. When there is no such an element, the methods do nothing.
+
+.. ocv:function:: void SparseMat::erase(int i0, int i1, size_t* hashval=0)
+.. ocv:function:: void SparseMat::erase(int i0, int i1, int i2, size_t* hashval=0)
+.. ocv:function:: void SparseMat::erase(const int* idx, size_t* hashval=0)
+
 SparseMat\_
 -----------
 .. ocv:class:: SparseMat_
@@ -2286,7 +2312,7 @@ Template sparse n-dimensional array class derived from
        SparseMatConstIterator_<_Tp> end() const;
    };

-``SparseMat_`` is a thin wrapper on top of :ocv:class:`SparseMat`  created in the same way as ``Mat_`` .
+``SparseMat_`` is a thin wrapper on top of :ocv:class:`SparseMat` created in the same way as ``Mat_`` .
 It simplifies notation of some operations. ::

    int sz[] = {10, 20, 30};
@@ -2340,6 +2366,11 @@ Here is example of SIFT use in your application via Algorithm interface: ::
    vector<KeyPoint> keypoints;
    (*sift)(image, noArray(), keypoints, descriptors);

+Algorithm::name
+---------------
+Returns the algorithm name
+
+.. ocv:function:: string Algorithm::name() const

 Algorithm::get
 --------------
@@ -245,7 +245,6 @@ Calculates the width and height of a text string.
 The function ``getTextSize`` calculates and returns the size of a box that contains the specified text.
 That is, the following code renders some text, the tight box surrounding it, and the baseline: ::

-    // Use "y" to show that the baseLine is about
    string text = "Funny text inside the box";
    int fontFace = FONT_HERSHEY_SCRIPT_SIMPLEX;
    double fontScale = 2;
@@ -166,6 +166,12 @@ field of the set is the total number of nodes both occupied and free. When an oc

 ``CvSet`` is used to represent graphs (:ocv:struct:`CvGraph`), sparse multi-dimensional arrays (:ocv:struct:`CvSparseMat`), and planar subdivisions (:ocv:struct:`CvSubdiv2D`).

+CvSetElem
+---------
+
+.. ocv:struct:: CvSetElem
+
+The structure is represent single element of :ocv:struct:`CvSet`. It consists of two fields: element data pointer and flags.

 CvGraph
 -------
@@ -174,6 +180,24 @@ CvGraph
 The structure ``CvGraph`` is a base for graphs used in OpenCV 1.x. It inherits from
 :ocv:struct:`CvSet`, that is, it is considered as a set of vertices. Besides, it contains another set as a member, a set of graph edges. Graphs in OpenCV are represented using adjacency lists format.

+CvGraphVtx
+----------
+.. ocv:struct:: CvGraphVtx
+
+The structure represents single vertex in :ocv:struct:`CvGraph`. It consists of two filds: pointer to first edge and flags.
+
+CvGraphEdge
+-----------
+.. ocv:struct:: CvGraphEdge
+
+The structure represents edge in :ocv:struct:`CvGraph`.  Each edge consists of:
+
+- Two pointers to the starting and ending vertices (vtx[0] and vtx[1] respectively);
+- Two pointers to next edges for the starting and ending vertices, where
+  next[0] points to the next edge in the vtx[0] adjacency list and
+  next[1] points to the next edge in the vtx[1] adjacency list;
+- Weight;
+- Flags.

 CvGraphScanner
 --------------
@@ -3243,7 +3243,7 @@ The constructors.

        * **SVD::NO_UV** indicates that only a vector of singular values ``w`` is to be processed, while ``u`` and ``vt`` will be set to empty matrices.

-        * **SVD::FULL_UV** when the matrix is not square, by default the algorithm produces ``u`` and ``vt`` matrices of sufficiently large size for the further ``A`` reconstruction; if, however, ``FULL_UV`` flag is specified, ``u`` and ``vt``will be full-size square orthogonal matrices.
+        * **SVD::FULL_UV** when the matrix is not square, by default the algorithm produces ``u`` and ``vt`` matrices of sufficiently large size for the further ``A`` reconstruction; if, however,   ``FULL_UV`` flag is specified, ``u`` and ``vt`` will be full-size square orthogonal matrices.

 The first constructor initializes an empty ``SVD`` structure. The second constructor initializes an empty ``SVD`` structure and then calls
 :ocv:funcx:`SVD::operator()` .
@@ -2037,10 +2037,10 @@ public:
    //! default constructor
    TermCriteria();
    //! full constructor
-    TermCriteria(int _type, int _maxCount, double _epsilon);
+    TermCriteria(int type, int maxCount, double epsilon);
    //! conversion from CvTermCriteria
    TermCriteria(const CvTermCriteria& criteria);
-    //! conversion from CvTermCriteria
+    //! conversion to CvTermCriteria
    operator CvTermCriteria() const;

    int type; //!< the type of termination criteria: COUNT, EPS or COUNT + EPS
@@ -4655,7 +4655,7 @@ class CV_EXPORTS CommandLineParser
    template<typename _Tp>
    static _Tp getData(const std::string& str)
    {
-        _Tp res;
+        _Tp res = _Tp();
        std::stringstream s1(str);
        s1 >> res;
        return res;
@@ -177,6 +177,20 @@ namespace cv
 //#undef __CV_GPU_DEPR_BEFORE__
 //#undef __CV_GPU_DEPR_AFTER__

+        namespace device
+        {
+            using cv::gpu::PtrSz;
+            using cv::gpu::PtrStep;
+            using cv::gpu::PtrStepSz;
+
+            using cv::gpu::PtrStepSzb;
+            using cv::gpu::PtrStepSzf;
+            using cv::gpu::PtrStepSzi;
+
+            using cv::gpu::PtrStepb;
+            using cv::gpu::PtrStepf;
+            using cv::gpu::PtrStepi;
+        }
    }
 }

@@ -79,6 +79,8 @@ namespace cv { namespace gpu
        WARP_SHUFFLE_FUNCTIONS = FEATURE_SET_COMPUTE_30
    };

+    CV_EXPORTS bool deviceSupports(FeatureSet feature_set);
+
    // Gives information about what GPU archs this OpenCV GPU module was
    // compiled for
    class CV_EXPORTS TargetArchs
@@ -64,8 +64,9 @@
    #endif
  #elif __GNUC__*10 + __GNUC_MINOR__ >= 42

-    #if !defined WIN32 && (defined __i486__ || defined __i586__ || \
-        defined __i686__ || defined __MMX__ || defined __SSE__  || defined __ppc__)
+    #if !(defined WIN32 || defined _WIN32) && (defined __i486__ || defined __i586__ || \
+        defined __i686__ || defined __MMX__ || defined __SSE__  || defined __ppc__) || \
+        (defined __GNUC__ && defined _STLPORT_MAJOR)
      #define CV_XADD __sync_fetch_and_add
    #else
      #include <ext/atomicity.h>
@@ -715,12 +716,12 @@ template<typename _Tp, int m> struct CV_EXPORTS Matx_DetOp
    double operator ()(const Matx<_Tp, m, m>& a) const
    {
        Matx<_Tp, m, m> temp = a;
-        double p = LU(temp.val, m, m, 0, 0, 0);
+        double p = LU(temp.val, m*sizeof(_Tp), m, 0, 0, 0);
        if( p == 0 )
            return p;
        for( int i = 0; i < m; i++ )
            p *= temp(i, i);
-        return p;
+        return 1./p;
    }
 };

@@ -342,9 +342,8 @@ CV_INLINE  int  cvFloor( double value )
    return i - (i > value);
 #else
    int i = cvRound(value);
-    Cv32suf diff;
-    diff.f = (float)(value - i);
-    return i - (diff.i < 0);
+    float diff = (float)(value - i);
+    return i - (diff < 0);
 #endif
 }

@@ -360,9 +359,8 @@ CV_INLINE  int  cvCeil( double value )
    return i + (i < value);
 #else
    int i = cvRound(value);
-    Cv32suf diff;
-    diff.f = (float)(i - value);
-    return i + (diff.i < 0);
+    float diff = (float)(i - value);
+    return i + (diff < 0);
 #endif
 }

@@ -371,31 +369,19 @@ CV_INLINE  int  cvCeil( double value )

 CV_INLINE int cvIsNaN( double value )
 {
-#if 1/*defined _MSC_VER || defined __BORLANDC__
-    return _isnan(value);
-#elif defined __GNUC__
-    return isnan(value);
-#else*/
    Cv64suf ieee754;
    ieee754.f = value;
    return ((unsigned)(ieee754.u >> 32) & 0x7fffffff) +
           ((unsigned)ieee754.u != 0) > 0x7ff00000;
-#endif
 }


 CV_INLINE int cvIsInf( double value )
 {
-#if 1/*defined _MSC_VER || defined __BORLANDC__
-    return !_finite(value);
-#elif defined __GNUC__
-    return isinf(value);
-#else*/
    Cv64suf ieee754;
    ieee754.f = value;
    return ((unsigned)(ieee754.u >> 32) & 0x7fffffff) == 0x7ff00000 &&
           (unsigned)ieee754.u == 0;
-#endif
 }


--- a/Show More
+++ b/Show More