Merge branch master into cuda-dev

2012-12-11 01:12:14 +04:00
parent 50946b59c1 67ce03d7dd
commit a6c3ed5b36
227 changed files with 2510 additions and 149006 deletions
--- a/3rdparty/lib/armeabi-v7a/libnative_camera_r2.3.3.so
+++ b/3rdparty/lib/armeabi-v7a/libnative_camera_r2.3.3.so
--- a/3rdparty/lib/armeabi-v7a/libnative_camera_r4.1.1.so
+++ b/3rdparty/lib/armeabi-v7a/libnative_camera_r4.1.1.so
--- a/3rdparty/lib/armeabi-v7a/libnative_camera_r4.2.0.so
+++ b/3rdparty/lib/armeabi-v7a/libnative_camera_r4.2.0.so
--- a/3rdparty/lib/armeabi/libnative_camera_r4.1.1.so
+++ b/3rdparty/lib/armeabi/libnative_camera_r4.1.1.so
--- a/3rdparty/lib/armeabi/libnative_camera_r4.2.0.so
+++ b/3rdparty/lib/armeabi/libnative_camera_r4.2.0.so
--- a/3rdparty/lib/mips/libnative_camera_r4.0.3.so
+++ b/3rdparty/lib/mips/libnative_camera_r4.0.3.so
--- a/3rdparty/lib/mips/libnative_camera_r4.1.1.so
+++ b/3rdparty/lib/mips/libnative_camera_r4.1.1.so
--- a/3rdparty/lib/mips/libnative_camera_r4.2.0.so
+++ b/3rdparty/lib/mips/libnative_camera_r4.2.0.so
--- a/3rdparty/lib/x86/libnative_camera_r4.1.1.so
+++ b/3rdparty/lib/x86/libnative_camera_r4.1.1.so
--- a/3rdparty/lib/x86/libnative_camera_r4.2.0.so
+++ b/3rdparty/lib/x86/libnative_camera_r4.2.0.so
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,7 +120,6 @@ 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_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)
 OCV_OPTION(WITH_IPP            "Include Intel IPP support"                   OFF  IF (MSVC OR X86 OR X86_64) )
 OCV_OPTION(WITH_JASPER         "Include JPEG2K support"                      ON   IF (NOT IOS) )
 OCV_OPTION(WITH_JPEG           "Include JPEG support"                        ON   IF (NOT IOS) )
@@ -129,7 +128,6 @@ OCV_OPTION(WITH_OPENGL         "Include OpenGL support"                      OFF
 OCV_OPTION(WITH_OPENNI         "Include OpenNI support"                      OFF  IF (NOT ANDROID AND NOT IOS) )
 OCV_OPTION(WITH_PNG            "Include PNG support"                         ON   IF (NOT IOS) )
 OCV_OPTION(WITH_PVAPI          "Include Prosilica GigE support"              ON   IF (NOT ANDROID AND NOT IOS) )
-OCV_OPTION(WITH_GIGEAPI        "Include Smartek GigE support"                ON   IF (NOT ANDROID AND NOT IOS) )
 OCV_OPTION(WITH_QT             "Build with Qt Backend support"               OFF  IF (NOT ANDROID AND NOT IOS) )
 OCV_OPTION(WITH_QUICKTIME      "Use QuickTime for Video I/O insted of QTKit" OFF  IF APPLE )
 OCV_OPTION(WITH_TBB            "Include Intel TBB support"                   OFF  IF (NOT IOS) )
@@ -698,10 +696,6 @@ if(DEFINED WITH_PVAPI)
  status("    PvAPI:"          HAVE_PVAPI          THEN YES                                        ELSE NO)
 endif(DEFINED WITH_PVAPI)

-if(DEFINED WITH_GIGEAPI)
-  status("    GigEVisionSDK:"  HAVE_GIGE_API          THEN YES                                        ELSE NO)
-endif(DEFINED WITH_GIGEAPI)
-
 if(DEFINED WITH_QUICKTIME)
  status("    QuickTime:"      WITH_QUICKTIME      THEN YES                                        ELSE NO)
  status("    QTKit:"          WITH_QUICKTIME      THEN NO                                         ELSE YES)
--- a/android/android.toolchain.cmake
+++ b/android/android.toolchain.cmake
@@ -596,6 +596,9 @@ if( BUILD_WITH_ANDROID_NDK )
 endif()
 if( NOT __availableToolchains )
  file( GLOB __availableToolchains RELATIVE "${ANDROID_NDK}/toolchains" "${ANDROID_NDK}/toolchains/*" )
+  if( __availableToolchains )
+   list(SORT __availableToolchains) # we need clang to go after gcc
+  endif()
  __LIST_FILTER( __availableToolchains "^[.]" )
  __LIST_FILTER( __availableToolchains "llvm" )
  __GLOB_NDK_TOOLCHAINS( __availableToolchains )
--- a/android/scripts/camera_build.conf
+++ b/android/scripts/camera_build.conf
@@ -1,18 +1,23 @@
 # make target;        arch; API level; Android Source Code Root
-native_camera_r2.2.0; armeabi;     8;  /home/alexander/Projects/AndroidSource/2.2.2
-native_camera_r2.2.0; armeabi-v7a; 8;  /home/alexander/Projects/AndroidSource/2.2.2
-native_camera_r2.3.3; armeabi;     9;  /home/alexander/Projects/AndroidSource/2.3.3
-native_camera_r2.3.3; armeabi-v7a; 9;  /home/alexander/Projects/AndroidSource/2.3.3
-native_camera_r2.3.3; x86;         9;  /home/alexander/Projects/AndroidSource/2.3.3
-native_camera_r3.0.1; armeabi;     9;  /home/alexander/Projects/AndroidSource/3.0.1
-native_camera_r3.0.1; armeabi-v7a; 9;  /home/alexander/Projects/AndroidSource/3.0.1
-native_camera_r3.0.1; x86;         9;  /home/alexander/Projects/AndroidSource/3.0.1
-native_camera_r4.0.3; armeabi;     14; /home/alexander/Projects/AndroidSource/4.0.3
-native_camera_r4.0.3; armeabi-v7a; 14; /home/alexander/Projects/AndroidSource/4.0.3
-native_camera_r4.0.3; x86;         14; /home/alexander/Projects/AndroidSource/4.0.3
-native_camera_r4.0.3; mips;        14; /home/alexander/Projects/AndroidSource/4.0.3_mips
-native_camera_r4.0.0; armeabi;     14; /home/alexander/Projects/AndroidSource/4.0.0
-native_camera_r4.0.0; armeabi-v7a; 14; /home/alexander/Projects/AndroidSource/4.0.0
-native_camera_r4.1.1; armeabi;     14; /home/alexander/Projects/AndroidSource/4.1.1
-native_camera_r4.1.1; armeabi-v7a; 14; /home/alexander/Projects/AndroidSource/4.1.1
-native_camera_r4.1.1; x86;         14; /home/alexander/Projects/AndroidSource/4.1.1
+native_camera_r2.2.0; armeabi;     8;  $ANDROID_STUB_ROOT/2.2.2
+native_camera_r2.2.0; armeabi-v7a; 8;  $ANDROID_STUB_ROOT/2.2.2
+native_camera_r2.3.3; armeabi;     9;  $ANDROID_STUB_ROOT/2.3.3
+native_camera_r2.3.3; armeabi-v7a; 9;  $ANDROID_STUB_ROOT/2.3.3
+native_camera_r2.3.3; x86;         9;  $ANDROID_STUB_ROOT/2.3.3
+native_camera_r3.0.1; armeabi;     9;  $ANDROID_STUB_ROOT/3.0.1
+native_camera_r3.0.1; armeabi-v7a; 9;  $ANDROID_STUB_ROOT/3.0.1
+native_camera_r3.0.1; x86;         9;  $ANDROID_STUB_ROOT/3.0.1
+native_camera_r4.0.3; armeabi;     14; $ANDROID_STUB_ROOT/4.0.3
+native_camera_r4.0.3; armeabi-v7a; 14; $ANDROID_STUB_ROOT/4.0.3
+native_camera_r4.0.3; x86;         14; $ANDROID_STUB_ROOT/4.0.3
+native_camera_r4.0.3; mips;        14; $ANDROID_STUB_ROOT/4.0.3_mips
+native_camera_r4.0.0; armeabi;     14; $ANDROID_STUB_ROOT/4.0.0
+native_camera_r4.0.0; armeabi-v7a; 14; $ANDROID_STUB_ROOT/4.0.0
+native_camera_r4.1.1; armeabi;     14; $ANDROID_STUB_ROOT/4.1.1
+native_camera_r4.1.1; armeabi-v7a; 14; $ANDROID_STUB_ROOT/4.1.1
+native_camera_r4.1.1; x86;         14; $ANDROID_STUB_ROOT/4.1.1
+native_camera_r4.1.1; mips;        14; $ANDROID_STUB_ROOT/4.1.1
+native_camera_r4.2.0; armeabi-v7a; 14; $ANDROID_STUB_ROOT/4.2.0
+native_camera_r4.2.0; armeabi;     14; $ANDROID_STUB_ROOT/4.2.0
+native_camera_r4.2.0; x86;         14; $ANDROID_STUB_ROOT/4.2.0
+native_camera_r4.2.0; mips;        14; $ANDROID_STUB_ROOT/4.2.0
--- a/android/scripts/cmake_android_all_cameras.py
+++ b/android/scripts/cmake_android_all_cameras.py
@@ -7,6 +7,16 @@ import shutil
 ScriptHome = os.path.split(sys.argv[0])[0]
 ConfFile = open(os.path.join(ScriptHome, "camera_build.conf"), "rt")
 HomeDir = os.getcwd()
+
+stub = ""
+try:
+    stub = os.environ["ANDROID_STUB_ROOT"]
+except:
+    None
+
+if (stub == ""):
+    print("Warning: ANDROID_STUB_ROOT environment variable is not set")
+
 for s in ConfFile.readlines():
    s = s[0:s.find("#")]
    if (not s):
@@ -20,6 +30,7 @@ for s in ConfFile.readlines():
    NativeApiLevel = str.strip(keys[2])
    AndroidTreeRoot = str.strip(keys[3])
    AndroidTreeRoot = str.strip(AndroidTreeRoot, "\n")
+    AndroidTreeRoot = os.path.expandvars(AndroidTreeRoot)
    print("Building %s for %s" % (MakeTarget, Arch))
    BuildDir = os.path.join(HomeDir, MakeTarget + "_" + Arch)

@@ -33,20 +44,27 @@ for s in ConfFile.readlines():
        continue

    shutil.rmtree(os.path.join(AndroidTreeRoot, "out", "target", "product", "generic", "system"), ignore_errors=True)
+
+    LinkerLibs = os.path.join(AndroidTreeRoot, "bin_arm", "system")
    if (Arch == "x86"):
-        shutil.copytree(os.path.join(AndroidTreeRoot, "bin_x86", "system"), os.path.join(AndroidTreeRoot, "out", "target", "product", "generic", "system"))
+        LinkerLibs = os.path.join(AndroidTreeRoot, "bin_x86", "system")
    elif (Arch == "mips"):
-        shutil.copytree(os.path.join(AndroidTreeRoot, "bin_mips", "system"), os.path.join(AndroidTreeRoot, "out", "target", "product", "generic", "system"))
-    else:
-        shutil.copytree(os.path.join(AndroidTreeRoot, "bin_arm", "system"), os.path.join(AndroidTreeRoot, "out", "target", "product", "generic", "system"))
+        LinkerLibs = os.path.join(AndroidTreeRoot, "bin_mips", "system")
+
+    if (not os.path.exists(LinkerLibs)):
+        print("Error: Paltform libs for linker in path \"%s\" not found" % LinkerLibs)
+        print("Building %s for %s\t[\033[91mFAILED\033[0m]" % (MakeTarget, Arch))
+        continue
+
+    shutil.copytree(LinkerLibs, os.path.join(AndroidTreeRoot, "out", "target", "product", "generic", "system"))

    os.chdir(BuildDir)
    BuildLog = os.path.join(BuildDir, "build.log")
    CmakeCmdLine = "cmake -DCMAKE_TOOLCHAIN_FILE=../android.toolchain.cmake -DANDROID_SOURCE_TREE=\"%s\" -DANDROID_NATIVE_API_LEVEL=\"%s\" -DANDROID_ABI=\"%s\" -DANDROID_STL=stlport_static ../../ > \"%s\" 2>&1" % (AndroidTreeRoot, NativeApiLevel, Arch, BuildLog)
    MakeCmdLine = "make %s >> \"%s\" 2>&1" % (MakeTarget, BuildLog);
-    print(CmakeCmdLine)
+    #print(CmakeCmdLine)
    os.system(CmakeCmdLine)
-    print(MakeCmdLine)
+    #print(MakeCmdLine)
    os.system(MakeCmdLine)
    os.chdir(HomeDir)
    CameraLib = os.path.join(BuildDir, "lib", Arch, "lib" + MakeTarget + ".so")
--- a/android/service/engine/AndroidManifest.xml
+++ b/android/service/engine/AndroidManifest.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="org.opencv.engine"
-    android:versionCode="22@ANDROID_PLATFORM_VERSION_CODE@"
-    android:versionName="2.2" >
+    android:versionCode="23@ANDROID_PLATFORM_VERSION_CODE@"
+    android:versionName="2.3" >

-    <uses-sdk android:minSdkVersion="8" />
+    <uses-sdk android:minSdkVersion="@ANDROID_NATIVE_API_LEVEL@" />
    <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>

    <application
--- a/android/service/engine/CMakeLists.txt
+++ b/android/service/engine/CMakeLists.txt
@@ -2,23 +2,27 @@ 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)
+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")

 if(ARMEABI_V7A)
+  if (ANDROID_NATIVE_API_LEVEL LESS 9)
    set(ANDROID_PLATFORM_VERSION_CODE "2")
-  elseif(ARMEABI_V6)
-    set(ANDROID_PLATFORM_VERSION_CODE "1")
-  elseif(ARMEABI)
-    set(ANDROID_PLATFORM_VERSION_CODE "1")
-  elseif(X86)
-    set(ANDROID_PLATFORM_VERSION_CODE "3")
-  elseif(MIPS)
-    set(ANDROID_PLATFORM_VERSION_CODE "4")
  else()
-    message(WARNING "Can not automatically determine the value for ANDROID_PLATFORM_VERSION_CODE")
+    set(ANDROID_PLATFORM_VERSION_CODE "3")
  endif()
+elseif(ARMEABI_V6)
+  set(ANDROID_PLATFORM_VERSION_CODE "1")
+elseif(ARMEABI)
+  set(ANDROID_PLATFORM_VERSION_CODE "1")
+elseif(X86)
+  set(ANDROID_PLATFORM_VERSION_CODE "4")
+elseif(MIPS)
+  set(ANDROID_PLATFORM_VERSION_CODE "5")
+else()
+  message(WARNING "Can not automatically determine the value for ANDROID_PLATFORM_VERSION_CODE")
+endif()

 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/${ANDROID_MANIFEST_FILE}" "${OpenCV_BINARY_DIR}/android/service/engine/.build/${ANDROID_MANIFEST_FILE}"  @ONLY)

--- a/android/service/engine/build.xml
+++ b/android/service/engine/build.xml
@@ -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
--- a/android/service/engine/jni/Android.mk
+++ b/android/service/engine/jni/Android.mk
@@ -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 \
--- a/android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.cpp
+++ b/android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.cpp
@@ -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)
+{
+    const char* (*info_func)();
+    const char* result;
+    const char* error;
+
+    dlerror();
+    *(void **) (&info_func) = 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)
+{
+    const char* (*info_func)();
+    const char* result;
+    const char* error;
+
+    dlerror();
+    *(void **) (&info_func) = 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)
+{
+    const char* (*info_func)();
+    const char* result;
+    const char* error;
+
+    dlerror();
+    *(void **) (&info_func) = 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);
+}
--- a/android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.h
+++ b/android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.h
@@ -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
--- a/android/service/engine/jni/NativeService/CommonPackageManager.cpp
+++ b/android/service/engine/jni/NativeService/CommonPackageManager.cpp
@@ -78,49 +78,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;
+        std::string OptVersion = "";
+        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");
            }
        }
    }
@@ -171,14 +167,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;
 }
--- a/android/service/engine/jni/NativeService/PackageInfo.cpp
+++ b/android/service/engine/jni/NativeService/PackageInfo.cpp
@@ -197,6 +197,7 @@ InstallPath("")
    #ifndef __SUPPORT_TEGRA3
    Platform = PLATFORM_UNKNOWN;
    #endif
+
    FullName = BasePackageName + "_v" + Version.substr(0, Version.size()-1);
    if (PLATFORM_UNKNOWN != Platform)
    {
@@ -392,7 +393,17 @@ 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
        {
--- a/android/service/engine/jni/include/EngineCommon.h
+++ b/android/service/engine/jni/include/EngineCommon.h
@@ -5,10 +5,16 @@
 #undef LOG_TAG
 #define LOG_TAG "OpenCVEngine"

+// OpenCV Engine API version
 #ifndef OPEN_CV_ENGINE_VERSION
    #define OPEN_CV_ENGINE_VERSION 2
 #endif

 #define LIB_OPENCV_INFO_NAME "libopencv_info.so"

+// OpenCV Manager package name
+#define OPENCV_ENGINE_PACKAGE "org.opencv.engine"
+// Class name of OpenCV engine binder object. Is needned for connection to service
+#define OPECV_ENGINE_CLASSNAME "org.opencv.engine.OpenCVEngineInterface"
+
 #endif
--- a/android/service/engine/jni/include/IOpenCVEngine.h
+++ b/android/service/engine/jni/include/IOpenCVEngine.h
@@ -4,11 +4,7 @@
 #include <binder/IInterface.h>
 #include <binder/Parcel.h>
 #include <utils/String16.h>
-
-// OpenCV Manager package name
-#define OPENCV_ENGINE_PACKAGE "org.opencv.engine"
-// Class name of OpenCV engine binder object. Is needned for connection to service
-#define OPECV_ENGINE_CLASSNAME "org.opencv.engine.OpenCVEngineInterface"
+#include "EngineCommon.h"

 enum EngineMethonID
 {
--- a/android/service/engine/project.properties
+++ b/android/service/engine/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt

 # Project target.
-target=android-8
+target=android-9
--- a/android/service/engine/src/org/opencv/engine/MarketConnector.java
+++ b/android/service/engine/src/org/opencv/engine/MarketConnector.java
@@ -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())
        {
--- a/android/service/engine/src/org/opencv/engine/OpenCVLibraryInfo.java
+++ b/android/service/engine/src/org/opencv/engine/OpenCVLibraryInfo.java
@@ -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);
+}
--- a/android/service/engine/src/org/opencv/engine/manager/ManagerActivity.java
+++ b/android/service/engine/src/org/opencv/engine/manager/ManagerActivity.java
@@ -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,7 +353,7 @@ public class ManagerActivity extends Activity
                    if (start >= 0 && ActivePackagePath.charAt(stop) == '/')
                    {
                        temp.put("Activity", "y");
-                        PublicName += " (in use)";
+                        Tags = "active";
                    }
                    else
                    {
@@ -325,9 +365,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);
            }

--- a/cmake/OpenCVDetectAndroidSDK.cmake
+++ b/cmake/OpenCVDetectAndroidSDK.cmake
@@ -179,7 +179,7 @@ unset(__android_project_chain CACHE)
 #add_android_project(target_name ${path} NATIVE_DEPS opencv_core LIBRARY_DEPS ${OpenCV_BINARY_DIR} SDK_TARGET 11)
 macro(add_android_project target path)
  # parse arguments
-  set(android_proj_arglist NATIVE_DEPS LIBRARY_DEPS SDK_TARGET IGNORE_JAVA)
+  set(android_proj_arglist NATIVE_DEPS LIBRARY_DEPS SDK_TARGET IGNORE_JAVA IGNORE_MANIFEST)
  set(__varname "android_proj_")
  foreach(v ${android_proj_arglist})
    set(${__varname}${v} "")
@@ -220,9 +220,13 @@ macro(add_android_project target path)
    # get project sources
    file(GLOB_RECURSE android_proj_files RELATIVE "${path}" "${path}/res/*" "${path}/src/*")

+    if(NOT android_proj_IGNORE_MANIFEST)
+      list(APPEND android_proj_files ${ANDROID_MANIFEST_FILE})
+    endif()
+
    # copy sources out from the build tree
    set(android_proj_file_deps "")
-    foreach(f ${android_proj_files} ${ANDROID_MANIFEST_FILE})
+    foreach(f ${android_proj_files})
      add_custom_command(
        OUTPUT "${android_proj_bin_dir}/${f}"
        COMMAND ${CMAKE_COMMAND} -E copy "${path}/${f}" "${android_proj_bin_dir}/${f}"
@@ -324,6 +328,7 @@ macro(add_android_project target path)
      install(FILES "${OpenCV_BINARY_DIR}/bin/${target}.apk" DESTINATION "samples" COMPONENT main)
      get_filename_component(sample_dir "${path}" NAME)
      #java part
+      list(REMOVE_ITEM android_proj_files ${ANDROID_MANIFEST_FILE})
      foreach(f ${android_proj_files} ${ANDROID_MANIFEST_FILE})
        get_filename_component(install_subdir "${f}" PATH)
        install(FILES "${android_proj_bin_dir}/${f}" DESTINATION "samples/${sample_dir}/${install_subdir}" COMPONENT main)
--- a/cmake/OpenCVDetectCUDA.cmake
+++ b/cmake/OpenCVDetectCUDA.cmake
@@ -3,8 +3,13 @@ if(${CMAKE_VERSION} VERSION_LESS "2.8.3")
  return()
 endif()

-if (NOT MSVC AND NOT CMAKE_COMPILER_IS_GNUCXX OR MINGW)
-  message(STATUS "CUDA compilation was disabled (due to unsuppoted host compiler).")
+if (WIN32 AND NOT MSVC)
+  message(STATUS "CUDA compilation is disabled (due to only Visual Studio compiler suppoted 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).")
  return()
 endif()

--- a/cmake/OpenCVDetectOpenCL.cmake
+++ b/cmake/OpenCVDetectOpenCL.cmake
@@ -27,7 +27,7 @@ else()
            else()
                set(OPENCL_LIB_SEARCH_PATH ${OPENCL_LIB_SEARCH_PATH} ${ENV_AMDSTREAMSDKROOT}/lib/x86_64)
            endif()
-        elseif(ENV_CUDAPATH AND WIN32)
+        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)
--- a/cmake/OpenCVFindLibsVideo.cmake
+++ b/cmake/OpenCVFindLibsVideo.cmake
@@ -56,19 +56,6 @@ if(WITH_PVAPI)
  endif(PVAPI_INCLUDE_PATH)
 endif(WITH_PVAPI)

-# --- GigEVisionSDK ---
-ocv_clear_vars(HAVE_GIGE_API)
-if(WITH_GIGEAPI)
-  find_path(GIGEAPI_INCLUDE_PATH "GigEVisionSDK.h"
-            PATHS /usr/local /var /opt /usr ENV ProgramFiles ENV ProgramW6432
-            PATH_SUFFIXES include "Smartek Vision Technologies/GigEVisionSDK/gige_cpp" "GigEVisionSDK/gige_cpp" "GigEVisionSDK/gige_c"
-            DOC "The path to Smartek GigEVisionSDK header")
-  FIND_LIBRARY(GIGEAPI_LIBRARIES NAMES GigEVisionSDK)
-  if(GIGEAPI_LIBRARIES AND GIGEAPI_INCLUDE_PATH)
-    set(HAVE_GIGE_API TRUE)
-  endif()
-endif(WITH_GIGEAPI)
-
 # --- Dc1394 ---
 ocv_clear_vars(HAVE_DC1394 HAVE_DC1394_2)
 if(WITH_1394)
--- a/cmake/templates/cvconfig.h.cmake
+++ b/cmake/templates/cvconfig.h.cmake
@@ -58,9 +58,6 @@
 /* OpenEXR codec */
 #cmakedefine  HAVE_ILMIMF

-/* Apple ImageIO Framework */
-#cmakedefine  HAVE_IMAGEIO
-
 /* Define to 1 if you have the <inttypes.h> header file. */
 #cmakedefine  HAVE_INTTYPES_H 1

--- a/doc/check_docs.py
+++ b/doc/check_docs.py
@@ -1,3 +1,5 @@
+#/usr/bin/env python
+
 import sys, glob

 sys.path.append("../modules/python/src2/")
--- a/doc/check_docs2.py
+++ b/doc/check_docs2.py
@@ -1,3 +1,5 @@
+#/usr/bin/env python
+
 import os, sys, fnmatch, re

 sys.path.append("../modules/python/src2/")
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -1,3 +1,5 @@
+#/usr/bin/env python
+
 # -*- coding: utf-8 -*-
 #
 # opencvstd documentation build configuration file, created by
--- a/doc/ocv.py
+++ b/doc/ocv.py
@@ -1,3 +1,4 @@
+#/usr/bin/env python
 # -*- coding: utf-8 -*-
 """
    ocv domain, a modified copy of sphinx.domains.cpp + shpinx.domains.python.
--- a/doc/opencv2manager.pdf
+++ b/doc/opencv2manager.pdf
--- a/doc/opencv2refman.pdf
+++ b/doc/opencv2refman.pdf
--- a/doc/opencv_cheatsheet.pdf
+++ b/doc/opencv_cheatsheet.pdf
--- a/doc/opencv_tutorials.pdf
+++ b/doc/opencv_tutorials.pdf
--- a/doc/opencv_user.pdf
+++ b/doc/opencv_user.pdf
--- a/doc/patch_refman_latex.py
+++ b/doc/patch_refman_latex.py
@@ -1,3 +1,5 @@
+#/usr/bin/env python
+
 import sys

 f=open(sys.argv[1], "rt")
--- a/doc/pattern_tools/gen_pattern.py
+++ b/doc/pattern_tools/gen_pattern.py
@@ -1,3 +1,5 @@
+#/usr/bin/env python
+
 """gen_pattern.py
 To run:
 -c 10 -r 12 -o out.svg
--- a/doc/pattern_tools/svgfig.py
+++ b/doc/pattern_tools/svgfig.py
@@ -1,3 +1,5 @@
+#/usr/bin/env python
+
 # svgfig.py copyright (C) 2008 Jim Pivarski <jpivarski@gmail.com>
 #
 # This program is free software; you can redistribute it and/or
--- a/doc/reformat.py
+++ b/doc/reformat.py
@@ -1,3 +1,5 @@
+#/usr/bin/env python
+
 import os, sys, re

 finput=open(sys.argv[1], "rt")
--- a/doc/tutorials/core/basic_geometric_drawing/basic_geometric_drawing.rst
+++ b/doc/tutorials/core/basic_geometric_drawing/basic_geometric_drawing.rst
@@ -31,15 +31,15 @@ Point

 .. code-block:: cpp

-   Point pt;
-   pt.x = 10;
-   pt.y = 8;
+     Point pt;
+     pt.x = 10;
+     pt.y = 8;

 or

 .. code-block:: cpp

-   Point pt =  Point(10, 8);
+     Point pt =  Point(10, 8);

 Scalar
 -------
@@ -49,7 +49,7 @@ Scalar

  .. code-block:: cpp

-     Scalar( a, b, c )
+       Scalar( a, b, c )

  We would be defining a RGB color such as: *Red = c*, *Green = b* and *Blue = a*

@@ -65,51 +65,51 @@ Explanation

   .. code-block:: cpp

-      /// Windows names
-      char atom_window[] = "Drawing 1: Atom";
-      char rook_window[] = "Drawing 2: Rook";
+          /// Windows names
+          char atom_window[] = "Drawing 1: Atom";
+          char rook_window[] = "Drawing 2: Rook";

-      /// Create black empty images
-      Mat atom_image = Mat::zeros( w, w, CV_8UC3 );
-      Mat rook_image = Mat::zeros( w, w, CV_8UC3 );
+          /// Create black empty images
+          Mat atom_image = Mat::zeros( w, w, CV_8UC3 );
+          Mat rook_image = Mat::zeros( w, w, CV_8UC3 );

 #. We created functions to draw different geometric shapes. For instance, to draw the atom we used *MyEllipse* and *MyFilledCircle*:

   .. code-block:: cpp

-      /// 1. Draw a simple atom:
+          /// 1. Draw a simple atom:

-      /// 1.a. Creating ellipses
-      MyEllipse( atom_image, 90 );
-      MyEllipse( atom_image, 0 );
-      MyEllipse( atom_image, 45 );
-      MyEllipse( atom_image, -45 );
+          /// 1.a. Creating ellipses
+          MyEllipse( atom_image, 90 );
+          MyEllipse( atom_image, 0 );
+          MyEllipse( atom_image, 45 );
+          MyEllipse( atom_image, -45 );

-      /// 1.b. Creating circles
-      MyFilledCircle( atom_image, Point( w/2.0, w/2.0) );
+          /// 1.b. Creating circles
+          MyFilledCircle( atom_image, Point( w/2.0, w/2.0) );

 #. And to draw the rook we employed *MyLine*, *rectangle* and a *MyPolygon*:

   .. code-block:: cpp

-      /// 2. Draw a rook
+          /// 2. Draw a rook

-      /// 2.a. Create a convex polygon
-      MyPolygon( rook_image );
+          /// 2.a. Create a convex polygon
+          MyPolygon( rook_image );

-      /// 2.b. Creating rectangles
-      rectangle( rook_image,
-             Point( 0, 7*w/8.0 ),
-             Point( w, w),
-             Scalar( 0, 255, 255 ),
-             -1,
-             8 );
+          /// 2.b. Creating rectangles
+          rectangle( rook_image,
+                 Point( 0, 7*w/8.0 ),
+                 Point( w, w),
+                 Scalar( 0, 255, 255 ),
+                 -1,
+                 8 );

-      /// 2.c. Create a few lines
-      MyLine( rook_image, Point( 0, 15*w/16 ), Point( w, 15*w/16 ) );
-      MyLine( rook_image, Point( w/4, 7*w/8 ), Point( w/4, w ) );
-      MyLine( rook_image, Point( w/2, 7*w/8 ), Point( w/2, w ) );
-      MyLine( rook_image, Point( 3*w/4, 7*w/8 ), Point( 3*w/4, w ) );
+          /// 2.c. Create a few lines
+          MyLine( rook_image, Point( 0, 15*w/16 ), Point( w, 15*w/16 ) );
+          MyLine( rook_image, Point( w/4, 7*w/8 ), Point( w/4, w ) );
+          MyLine( rook_image, Point( w/2, 7*w/8 ), Point( w/2, w ) );
+          MyLine( rook_image, Point( 3*w/4, 7*w/8 ), Point( 3*w/4, w ) );

 #. Let's check what is inside each of these functions:

@@ -117,17 +117,15 @@ Explanation

     .. code-block:: cpp

-        void MyLine( Mat img, Point start, Point end )
-    {
-      int thickness = 2;
-      int lineType = 8;
-      line( img,
-        start,
-        end,
-        Scalar( 0, 0, 0 ),
-        thickness,
-        lineType );
-    }
+          void MyLine( Mat img, Point start, Point end )
+          {
+              int thickness = 2;
+              int lineType = 8;
+              line( img, start, end,
+                    Scalar( 0, 0, 0 ),
+                    thickness,
+                    lineType );
+          }

     As we can see, *MyLine* just call the function :line:`line <>`, which does the following:

@@ -143,32 +141,32 @@ Explanation

     .. code-block:: cpp

-        void MyEllipse( Mat img, double angle )
-        {
-      int thickness = 2;
-      int lineType = 8;
+          void MyEllipse( Mat img, double angle )
+          {
+              int thickness = 2;
+              int lineType = 8;

-      ellipse( img,
-           Point( w/2.0, w/2.0 ),
-           Size( w/4.0, w/16.0 ),
-           angle,
-           0,
-           360,
-           Scalar( 255, 0, 0 ),
-           thickness,
-           lineType );
-        }
+              ellipse( img,
+                 Point( w/2.0, w/2.0 ),
+                 Size( w/4.0, w/16.0 ),
+                 angle,
+                 0,
+                 360,
+                 Scalar( 255, 0, 0 ),
+                 thickness,
+                 lineType );
+          }

     From the code above, we can observe that the function :ellipse:`ellipse <>` draws an ellipse such that:

     .. container:: enumeratevisibleitemswithsquare

-        * The ellipse is displayed in the image **img**
-        * The ellipse center is located in the point **(w/2.0, w/2.0)** and is enclosed in a box of size **(w/4.0, w/16.0)**
-        * The ellipse is rotated **angle** degrees
-        * The ellipse extends an arc between **0** and **360** degrees
-        * The color of the figure will be **Scalar( 255, 255, 0)** which means blue in RGB value.
-        * The ellipse's **thickness** is 2.
+         * The ellipse is displayed in the image **img**
+         * The ellipse center is located in the point **(w/2.0, w/2.0)** and is enclosed in a box of size **(w/4.0, w/16.0)**
+         * The ellipse is rotated **angle** degrees
+         * The ellipse extends an arc between **0** and **360** degrees
+         * The color of the figure will be **Scalar( 255, 255, 0)** which means blue in RGB value.
+         * The ellipse's **thickness** is 2.


   * *MyFilledCircle*
@@ -176,17 +174,17 @@ Explanation
     .. code-block:: cpp

        void MyFilledCircle( Mat img, Point center )
-    {
-     int thickness = -1;
-     int lineType = 8;
+        {
+            int thickness = -1;
+            int lineType = 8;

-     circle( img,
-         center,
-         w/32.0,
-         Scalar( 0, 0, 255 ),
-         thickness,
-         lineType );
-    }
+            circle( img,
+                center,
+                w/32.0,
+                Scalar( 0, 0, 255 ),
+                thickness,
+                lineType );
+        }

     Similar to the ellipse function, we can observe that *circle* receives as arguments:

@@ -202,43 +200,43 @@ Explanation

     .. code-block:: cpp

-        void MyPolygon( Mat img )
-    {
-      int lineType = 8;
+          void MyPolygon( Mat img )
+          {
+              int lineType = 8;

-      /** Create some points */
-      Point rook_points[1][20];
-      rook_points[0][0] = Point( w/4.0, 7*w/8.0 );
-      rook_points[0][1] = Point( 3*w/4.0, 7*w/8.0 );
-      rook_points[0][2] = Point( 3*w/4.0, 13*w/16.0 );
-      rook_points[0][3] = Point( 11*w/16.0, 13*w/16.0 );
-      rook_points[0][4] = Point( 19*w/32.0, 3*w/8.0 );
-      rook_points[0][5] = Point( 3*w/4.0, 3*w/8.0 );
-      rook_points[0][6] = Point( 3*w/4.0, w/8.0 );
-      rook_points[0][7] = Point( 26*w/40.0, w/8.0 );
-      rook_points[0][8] = Point( 26*w/40.0, w/4.0 );
-      rook_points[0][9] = Point( 22*w/40.0, w/4.0 );
-      rook_points[0][10] = Point( 22*w/40.0, w/8.0 );
-      rook_points[0][11] = Point( 18*w/40.0, w/8.0 );
-      rook_points[0][12] = Point( 18*w/40.0, w/4.0 );
-      rook_points[0][13] = Point( 14*w/40.0, w/4.0 );
-      rook_points[0][14] = Point( 14*w/40.0, w/8.0 );
-      rook_points[0][15] = Point( w/4.0, w/8.0 );
-      rook_points[0][16] = Point( w/4.0, 3*w/8.0 );
-      rook_points[0][17] = Point( 13*w/32.0, 3*w/8.0 );
-      rook_points[0][18] = Point( 5*w/16.0, 13*w/16.0 );
-      rook_points[0][19] = Point( w/4.0, 13*w/16.0) ;
+              /** Create some points */
+              Point rook_points[1][20];
+              rook_points[0][0] = Point( w/4.0, 7*w/8.0 );
+              rook_points[0][1] = Point( 3*w/4.0, 7*w/8.0 );
+              rook_points[0][2] = Point( 3*w/4.0, 13*w/16.0 );
+              rook_points[0][3] = Point( 11*w/16.0, 13*w/16.0 );
+              rook_points[0][4] = Point( 19*w/32.0, 3*w/8.0 );
+              rook_points[0][5] = Point( 3*w/4.0, 3*w/8.0 );
+              rook_points[0][6] = Point( 3*w/4.0, w/8.0 );
+              rook_points[0][7] = Point( 26*w/40.0, w/8.0 );
+              rook_points[0][8] = Point( 26*w/40.0, w/4.0 );
+              rook_points[0][9] = Point( 22*w/40.0, w/4.0 );
+              rook_points[0][10] = Point( 22*w/40.0, w/8.0 );
+              rook_points[0][11] = Point( 18*w/40.0, w/8.0 );
+              rook_points[0][12] = Point( 18*w/40.0, w/4.0 );
+              rook_points[0][13] = Point( 14*w/40.0, w/4.0 );
+              rook_points[0][14] = Point( 14*w/40.0, w/8.0 );
+              rook_points[0][15] = Point( w/4.0, w/8.0 );
+              rook_points[0][16] = Point( w/4.0, 3*w/8.0 );
+              rook_points[0][17] = Point( 13*w/32.0, 3*w/8.0 );
+              rook_points[0][18] = Point( 5*w/16.0, 13*w/16.0 );
+              rook_points[0][19] = Point( w/4.0, 13*w/16.0) ;

-      const Point* ppt[1] = { rook_points[0] };
-      int npt[] = { 20 };
+              const Point* ppt[1] = { rook_points[0] };
+              int npt[] = { 20 };

-      fillPoly( img,
-                ppt,
-                npt,
-                    1,
-                Scalar( 255, 255, 255 ),
-                lineType );
-         }
+              fillPoly( img,
+                        ppt,
+                        npt,
+                            1,
+                        Scalar( 255, 255, 255 ),
+                        lineType );
+          }

     To draw a filled polygon we use the function :fill_poly:`fillPoly <>`. We note that:

@@ -254,12 +252,11 @@ Explanation

     .. code-block:: cpp

-        rectangle( rook_image,
-               Point( 0, 7*w/8.0 ),
-               Point( w, w),
-               Scalar( 0, 255, 255 ),
-               -1,
-               8 );
+          rectangle( rook_image,
+                     Point( 0, 7*w/8.0 ),
+                     Point( w, w),
+                     Scalar( 0, 255, 255 ),
+                     -1, 8 );

     Finally we have the :rectangle:`rectangle <>` function (we did not create a special function for this guy). We note that:

--- a/doc/tutorials/core/basic_linear_transform/basic_linear_transform.rst
+++ b/doc/tutorials/core/basic_linear_transform/basic_linear_transform.rst
@@ -11,17 +11,15 @@ In this tutorial you will learn how to:
 .. container:: enumeratevisibleitemswithsquare

   + Access pixel values
-
   + Initialize a matrix with zeros
-
   + Learn what :saturate_cast:`saturate_cast <>` does and why it is useful
-
   + Get some cool info about pixel transformations

 Theory
 =======

 .. note::
+
   The explanation below belongs to the book `Computer Vision: Algorithms and Applications <http://szeliski.org/Book/>`_  by Richard Szeliski

 Image Processing
@@ -38,7 +36,7 @@ Image Processing


 Pixel Transforms
-^^^^^^^^^^^^^^^^^
+-----------------

 .. container:: enumeratevisibleitemswithsquare

@@ -47,7 +45,7 @@ Pixel Transforms
   * Examples of such operators include *brightness and contrast adjustments* as well as color correction and transformations.

 Brightness and contrast adjustments
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+------------------------------------

 .. container:: enumeratevisibleitemswithsquare

@@ -70,9 +68,7 @@ Brightness and contrast adjustments
 Code
 =====

-.. container:: enumeratevisibleitemswithsquare
-
-   * The following code performs the operation :math:`g(i,j) = \alpha \cdot f(i,j) + \beta` :
+* The following code performs the operation :math:`g(i,j) = \alpha \cdot f(i,j) + \beta` :

 .. code-block:: cpp

@@ -87,38 +83,37 @@ Code

   int main( int argc, char** argv )
   {
-    /// Read image given by user
-    Mat image = imread( argv[1] );
-    Mat new_image = Mat::zeros( image.size(), image.type() );
+       /// Read image given by user
+       Mat image = imread( argv[1] );
+       Mat new_image = Mat::zeros( image.size(), image.type() );

-    /// Initialize values
-    std::cout<<" Basic Linear Transforms "<<std::endl;
-    std::cout<<"-------------------------"<<std::endl;
-    std::cout<<"* Enter the alpha value [1.0-3.0]: ";std::cin>>alpha;
-    std::cout<<"* Enter the beta value [0-100]: "; std::cin>>beta;
+       /// Initialize values
+       std::cout<<" Basic Linear Transforms "<<std::endl;
+       std::cout<<"-------------------------"<<std::endl;
+       std::cout<<"* Enter the alpha value [1.0-3.0]: ";std::cin>>alpha;
+       std::cout<<"* Enter the beta value [0-100]: "; std::cin>>beta;

-    /// Do the operation new_image(i,j) = alpha*image(i,j) + beta
-    for( int y = 0; y < image.rows; y++ )
-       { for( int x = 0; x < image.cols; x++ )
-            { for( int c = 0; c < 3; c++ )
-                 {
-         new_image.at<Vec3b>(y,x)[c] =
-            saturate_cast<uchar>( alpha*( image.at<Vec3b>(y,x)[c] ) + beta );
-                }
-       }
+       /// Do the operation new_image(i,j) = alpha*image(i,j) + beta
+       for( int y = 0; y < image.rows; y++ ) {
+           for( int x = 0; x < image.cols; x++ ) {
+               for( int c = 0; c < 3; c++ ) {
+                   new_image.at<Vec3b>(y,x)[c] =
+                   saturate_cast<uchar>( alpha*( image.at<Vec3b>(y,x)[c] ) + beta );
+               }
+           }
       }

-    /// Create Windows
-    namedWindow("Original Image", 1);
-    namedWindow("New Image", 1);
+       /// Create Windows
+       namedWindow("Original Image", 1);
+       namedWindow("New Image", 1);

-    /// Show stuff
-    imshow("Original Image", image);
-    imshow("New Image", new_image);
+       /// Show stuff
+       imshow("Original Image", image);
+       imshow("New Image", new_image);

-    /// Wait until user press some key
-    waitKey();
-    return 0;
+       /// Wait until user press some key
+       waitKey();
+       return 0;
   }

 Explanation
@@ -155,13 +150,14 @@ Explanation

   .. code-block:: cpp

-      for( int y = 0; y < image.rows; y++ )
-         { for( int x = 0; x < image.cols; x++ )
-              { for( int c = 0; c < 3; c++ )
-                   { new_image.at<Vec3b>(y,x)[c] =
-                               saturate_cast<uchar>( alpha*( image.at<Vec3b>(y,x)[c] ) + beta ); }
-         }
-         }
+      for( int y = 0; y < image.rows; y++ ) {
+          for( int x = 0; x < image.cols; x++ ) {
+              for( int c = 0; c < 3; c++ ) {
+                  new_image.at<Vec3b>(y,x)[c] =
+                    saturate_cast<uchar>( alpha*( image.at<Vec3b>(y,x)[c] ) + beta );
+              }
+          }
+      }

   Notice the following:

@@ -209,6 +205,6 @@ Result

 * We get this:

-.. image:: images/Basic_Linear_Transform_Tutorial_Result_0.jpg
-   :alt: Basic Linear Transform - Final Result
-   :align: center
+  .. image:: images/Basic_Linear_Transform_Tutorial_Result_0.jpg
+     :alt: Basic Linear Transform - Final Result
+     :align: center
--- a/doc/tutorials/imgproc/erosion_dilatation/erosion_dilatation.rst
+++ b/doc/tutorials/imgproc/erosion_dilatation/erosion_dilatation.rst
@@ -39,7 +39,7 @@ Morphological Operations
     :align: center

 Dilation
-^^^^^^^^^
+~~~~~~~~

 * This operations consists of convoluting an image :math:`A` with some kernel (:math:`B`), which can have any shape or size, usually a square or circle.

@@ -54,7 +54,7 @@ Dilation
 The background (bright) dilates around the black regions of the letter.

 Erosion
-^^^^^^^^
+~~~~~~~

 * This operation is the sister of dilation. What this does is to compute a local minimum over the area of the kernel.

@@ -216,17 +216,17 @@ Explanation

        .. code-block:: cpp

-       Mat element = getStructuringElement( erosion_type,
-                                    Size( 2*erosion_size + 1, 2*erosion_size+1 ),
-                                Point( erosion_size, erosion_size ) );
+            Mat element = getStructuringElement( erosion_type,
+                                          Size( 2*erosion_size + 1, 2*erosion_size+1 ),
+                                          Point( erosion_size, erosion_size ) );

       We can choose any of three shapes for our kernel:

       .. container:: enumeratevisibleitemswithsquare

-      + Rectangular box: MORPH_RECT
-      + Cross:  MORPH_CROSS
-      + Ellipse: MORPH_ELLIPSE
+           + Rectangular box: MORPH_RECT
+           + Cross:  MORPH_CROSS
+           + Ellipse: MORPH_ELLIPSE

       Then, we just have to specify the size of our kernel and the *anchor point*. If not specified, it is assumed to be in the center.

--- a/doc/tutorials/introduction/android_binary_package/android_dev_intro.rst
+++ b/doc/tutorials/introduction/android_binary_package/android_dev_intro.rst
@@ -334,7 +334,11 @@ and exceptions are used in C++, it also should be created. Example of the file :

   APP_STL := gnustl_static
   APP_CPPFLAGS := -frtti -fexceptions
-   APP_ABI := armeabi-v7a
+   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. 


 .. _NDK_build_cli:
--- a/modules/androidcamera/CMakeLists.txt
+++ b/modules/androidcamera/CMakeLists.txt
@@ -6,7 +6,7 @@ set(the_description "Auxiliary module for Android native camera support")
 set(OPENCV_MODULE_TYPE STATIC)

 ocv_define_module(androidcamera INTERNAL opencv_core log dl)
-ocv_include_directories("${CMAKE_CURRENT_SOURCE_DIR}/camera_wrapper")
+ocv_include_directories("${CMAKE_CURRENT_SOURCE_DIR}/camera_wrapper" "${OpenCV_SOURCE_DIR}/android/service/engine/jni/include")

 # Android source tree for native camera
 SET (ANDROID_SOURCE_TREE "ANDROID_SOURCE_TREE-NOTFOUND" CACHE PATH
--- a/modules/androidcamera/camera_wrapper/camera_wrapper.cpp
+++ b/modules/androidcamera/camera_wrapper/camera_wrapper.cpp
@@ -1,4 +1,4 @@
-#if !defined(ANDROID_r2_2_0) && !defined(ANDROID_r2_3_3) && !defined(ANDROID_r3_0_1) && !defined(ANDROID_r4_0_0) && !defined(ANDROID_r4_0_3) && !defined(ANDROID_r4_1_1)
+#if !defined(ANDROID_r2_2_0) && !defined(ANDROID_r2_3_3) && !defined(ANDROID_r3_0_1) && !defined(ANDROID_r4_0_0) && !defined(ANDROID_r4_0_3) && !defined(ANDROID_r4_1_1) && !defined(ANDROID_r4_2_0)
 # error Building camera wrapper for your version of Android is not supported by OpenCV. You need to modify OpenCV sources in order to compile camera wrapper for your version of Android.
 #endif

@@ -18,7 +18,7 @@
 # define MAGIC_OPENCV_TEXTURE_ID (0x10)
 #else // defined(ANDROID_r3_0_1) || defined(ANDROID_r4_0_0) || defined(ANDROID_r4_0_3)
 //TODO: This is either 2.2 or 2.3. Include the headers for ISurface.h access
-#if defined(ANDROID_r4_1_1)
+#if defined(ANDROID_r4_1_1) || defined(ANDROID_r4_2_0)
 #include <gui/ISurface.h>
 #include <gui/BufferQueue.h>
 #else
@@ -60,7 +60,7 @@ using namespace android;

 void debugShowFPS();

-#if defined(ANDROID_r4_1_1)
+#if defined(ANDROID_r4_1_1) || defined(ANDROID_r4_2_0)
 class ConsumerListenerStub: public BufferQueue::ConsumerListener
 {
 public:
@@ -280,7 +280,7 @@ public:
    }

    virtual void postData(int32_t msgType, const sp<IMemory>& dataPtr
-#if defined(ANDROID_r4_0_0) || defined(ANDROID_r4_0_3) || defined(ANDROID_r4_1_1)
+    #if defined(ANDROID_r4_0_0) || defined(ANDROID_r4_0_3) || defined(ANDROID_r4_1_1) || defined(ANDROID_r4_2_0)
                          ,camera_frame_metadata_t*
 #endif
                          )
@@ -526,7 +526,7 @@ CameraHandler* CameraHandler::initCameraConnect(const CameraCallback& callback,
    pdstatus = camera->setPreviewTexture(surfaceTexture);
    if (pdstatus != 0)
        LOGE("initCameraConnect: failed setPreviewTexture call; camera migth not work correctly");
-#elif defined(ANDROID_r4_1_1)
+#elif defined(ANDROID_r4_1_1) || defined(ANDROID_r4_2_0)
    sp<BufferQueue> bufferQueue = new BufferQueue();
    sp<BufferQueue::ConsumerListener> queueListener = new ConsumerListenerStub();
    bufferQueue->consumerConnect(queueListener);
--- a/modules/androidcamera/src/camera_activity.cpp
+++ b/modules/androidcamera/src/camera_activity.cpp
@@ -9,6 +9,7 @@
 #include <opencv2/core/version.hpp>
 #include "camera_activity.hpp"
 #include "camera_wrapper.h"
+#include "EngineCommon.h"

 #undef LOG_TAG
 #undef LOGE
@@ -267,12 +268,13 @@ void CameraWrapperConnector::fillListWrapperLibs(const string& folderPath, vecto

 std::string CameraWrapperConnector::getDefaultPathLibFolder()
 {
-    const string packageList[] = {"tegra3", "armv7a_neon", "armv7a", "armv5", "x86"};
-    for (size_t i = 0; i < 5; i++)
+    #define BIN_PACKAGE_NAME(x) "org.opencv.lib_v" CVAUX_STR(CV_MAJOR_VERSION) CVAUX_STR(CV_MINOR_VERSION) "_" x
+    const char* const packageList[] = {BIN_PACKAGE_NAME("armv7a"), OPENCV_ENGINE_PACKAGE};
+    for (size_t i = 0; i < sizeof(packageList)/sizeof(packageList[0]); i++)
    {
        char path[128];
-        sprintf(path, "/data/data/org.opencv.lib_v%d%d_%s/lib/", CV_MAJOR_VERSION, CV_MINOR_VERSION, packageList[i].c_str());
-        LOGD("Trying package \"%s\" (\"%s\")", packageList[i].c_str(), path);
+        sprintf(path, "/data/data/%s/lib/", packageList[i]);
+        LOGD("Trying package \"%s\" (\"%s\")", packageList[i], path);

        DIR* dir = opendir(path);
        if (!dir)
@@ -427,7 +429,6 @@ void CameraActivity::applyProperties()

 int CameraActivity::getFrameWidth()
 {
-    LOGD("CameraActivity::getFrameWidth()");
    if (frameWidth <= 0)
    frameWidth = getProperty(ANDROID_CAMERA_PROPERTY_FRAMEWIDTH);
    return frameWidth;
@@ -435,7 +436,6 @@ int CameraActivity::getFrameWidth()

 int CameraActivity::getFrameHeight()
 {
-    LOGD("CameraActivity::getFrameHeight()");
    if (frameHeight <= 0)
    frameHeight = getProperty(ANDROID_CAMERA_PROPERTY_FRAMEHEIGHT);
    return frameHeight;
--- a/modules/calib3d/perf/perf_pnp.cpp
+++ b/modules/calib3d/perf/perf_pnp.cpp
@@ -86,6 +86,7 @@ PERF_TEST(PointsNum_Algo, solveP3P)
    add(points2d, noise, points2d);

    declare.in(points3d, points2d);
+    declare.time(100);

    TEST_CYCLE_N(1000)
    {
--- a/modules/contrib/doc/facerec/src/create_csv.py
+++ b/modules/contrib/doc/facerec/src/create_csv.py
@@ -1,3 +1,5 @@
+#/usr/bin/env python
+
 import sys
 import os.path

--- a/modules/contrib/doc/retina/index.rst
+++ b/modules/contrib/doc/retina/index.rst
@@ -208,7 +208,7 @@ Retina::getMagno
 Retina::getParameters
 +++++++++++++++++++++

-.. ocv:function:: struct Retina::RetinaParameters Retina::getParameters()
+.. ocv:function:: Retina::RetinaParameters Retina::getParameters()

    Retrieve the current parameters values in a *Retina::RetinaParameters* structure

@@ -323,7 +323,8 @@ 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
+
+  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. ::

    class RetinaParameters{
--- a/modules/core/perf/perf_arithm.cpp
+++ b/modules/core/perf/perf_arithm.cpp
@@ -123,6 +123,7 @@ PERF_TEST_P(Size_MatType, add, TYPICAL_MATS_CORE_ARITHM)
    cv::Mat c = Mat(sz, type);

    declare.in(a, b, WARMUP_RNG).out(c);
+    declare.time(50);

    if (CV_MAT_DEPTH(type) == CV_32S)
    {
--- a/modules/core/perf/perf_bitwise.cpp
+++ b/modules/core/perf/perf_bitwise.cpp
@@ -19,6 +19,7 @@ PERF_TEST_P(Size_MatType, bitwise_not, TYPICAL_MATS_BITW_ARITHM)
    cv::Mat c = Mat(sz, type);

    declare.in(a, WARMUP_RNG).out(c);
+    declare.time(100);

    TEST_CYCLE() cv::bitwise_not(a, c);

@@ -34,6 +35,7 @@ PERF_TEST_P(Size_MatType, bitwise_and, TYPICAL_MATS_BITW_ARITHM)
    cv::Mat c = Mat(sz, type);

    declare.in(a, b, WARMUP_RNG).out(c);
+    declare.time(100);

    TEST_CYCLE() bitwise_and(a, b, c);

@@ -49,6 +51,7 @@ PERF_TEST_P(Size_MatType, bitwise_or, TYPICAL_MATS_BITW_ARITHM)
    cv::Mat c = Mat(sz, type);

    declare.in(a, b, WARMUP_RNG).out(c);
+    declare.time(100);

    TEST_CYCLE() bitwise_or(a, b, c);

@@ -64,6 +67,7 @@ PERF_TEST_P(Size_MatType, bitwise_xor, TYPICAL_MATS_BITW_ARITHM)
    cv::Mat c = Mat(sz, type);

    declare.in(a, b, WARMUP_RNG).out(c);
+    declare.time(100);

    TEST_CYCLE() bitwise_xor(a, b, c);

--- a/modules/core/perf/perf_dot.cpp
+++ b/modules/core/perf/perf_dot.cpp
@@ -21,6 +21,7 @@ PERF_TEST_P( MatType_Length, dot,
    Mat b(size, size, type);

    declare.in(a, b, WARMUP_RNG);
+    declare.time(100);

    double product;

--- a/modules/core/perf/perf_norm.cpp
+++ b/modules/core/perf/perf_norm.cpp
@@ -150,6 +150,7 @@ PERF_TEST_P(Size_MatType_NormType, normalize_mask,
    if(normType==NORM_L2) alpha = (double)src.total()/10;

    declare.in(src, WARMUP_RNG).in(mask).out(dst);
+    declare.time(100);

    TEST_CYCLE() normalize(src, dst, alpha, 0., normType, -1, mask);

--- a/modules/core/perf/perf_reduce.cpp
+++ b/modules/core/perf/perf_reduce.cpp
@@ -32,6 +32,7 @@ PERF_TEST_P(Size_MatType_ROp, reduceR,
    Mat vec(1, sz.width, ddepth < 0 ? matType : ddepth);

    declare.in(src, WARMUP_RNG).out(vec);
+    declare.time(100);

    TEST_CYCLE() reduce(src, vec, 0, reduceOp, ddepth);

@@ -58,6 +59,7 @@ PERF_TEST_P(Size_MatType_ROp, reduceC,
    Mat vec(sz.height, 1, ddepth < 0 ? matType : ddepth);

    declare.in(src, WARMUP_RNG).out(vec);
+    declare.time(100);

    TEST_CYCLE() reduce(src, vec, 1, reduceOp, ddepth);

--- a/modules/core/src/lapack.cpp
+++ b/modules/core/src/lapack.cpp
@@ -1097,25 +1097,25 @@ double cv::invert( InputArray _src, OutputArray _dst, int method )
                double d = det3(Sf);
                if( d != 0. )
                {
-                    float CV_DECL_ALIGNED(16) t[12];
+                    double t[12];

                    result = true;
                    d = 1./d;
-                    t[0] = (float)(((double)Sf(1,1) * Sf(2,2) - (double)Sf(1,2) * Sf(2,1)) * d);
-                    t[1] = (float)(((double)Sf(0,2) * Sf(2,1) - (double)Sf(0,1) * Sf(2,2)) * d);
-                    t[2] = (float)(((double)Sf(0,1) * Sf(1,2) - (double)Sf(0,2) * Sf(1,1)) * d);
+                    t[0] = (((double)Sf(1,1) * Sf(2,2) - (double)Sf(1,2) * Sf(2,1)) * d);
+                    t[1] = (((double)Sf(0,2) * Sf(2,1) - (double)Sf(0,1) * Sf(2,2)) * d);
+                    t[2] = (((double)Sf(0,1) * Sf(1,2) - (double)Sf(0,2) * Sf(1,1)) * d);

-                    t[3] = (float)(((double)Sf(1,2) * Sf(2,0) - (double)Sf(1,0) * Sf(2,2)) * d);
-                    t[4] = (float)(((double)Sf(0,0) * Sf(2,2) - (double)Sf(0,2) * Sf(2,0)) * d);
-                    t[5] = (float)(((double)Sf(0,2) * Sf(1,0) - (double)Sf(0,0) * Sf(1,2)) * d);
+                    t[3] = (((double)Sf(1,2) * Sf(2,0) - (double)Sf(1,0) * Sf(2,2)) * d);
+                    t[4] = (((double)Sf(0,0) * Sf(2,2) - (double)Sf(0,2) * Sf(2,0)) * d);
+                    t[5] = (((double)Sf(0,2) * Sf(1,0) - (double)Sf(0,0) * Sf(1,2)) * d);

-                    t[6] = (float)(((double)Sf(1,0) * Sf(2,1) - (double)Sf(1,1) * Sf(2,0)) * d);
-                    t[7] = (float)(((double)Sf(0,1) * Sf(2,0) - (double)Sf(0,0) * Sf(2,1)) * d);
-                    t[8] = (float)(((double)Sf(0,0) * Sf(1,1) - (double)Sf(0,1) * Sf(1,0)) * d);
+                    t[6] = (((double)Sf(1,0) * Sf(2,1) - (double)Sf(1,1) * Sf(2,0)) * d);
+                    t[7] = (((double)Sf(0,1) * Sf(2,0) - (double)Sf(0,0) * Sf(2,1)) * d);
+                    t[8] = (((double)Sf(0,0) * Sf(1,1) - (double)Sf(0,1) * Sf(1,0)) * d);

-                    Df(0,0) = t[0]; Df(0,1) = t[1]; Df(0,2) = t[2];
-                    Df(1,0) = t[3]; Df(1,1) = t[4]; Df(1,2) = t[5];
-                    Df(2,0) = t[6]; Df(2,1) = t[7]; Df(2,2) = t[8];
+                    Df(0,0) = (float)t[0]; Df(0,1) = (float)t[1]; Df(0,2) = (float)t[2];
+                    Df(1,0) = (float)t[3]; Df(1,1) = (float)t[4]; Df(1,2) = (float)t[5];
+                    Df(2,0) = (float)t[6]; Df(2,1) = (float)t[7]; Df(2,2) = (float)t[8];
                }
            }
            else
--- a/modules/features2d/perf/perf_batchDistance.cpp
+++ b/modules/features2d/perf/perf_batchDistance.cpp
@@ -92,6 +92,7 @@ PERF_TEST_P(Source_CrossCheck, batchDistance_L2,

    generateData(queryDescriptors, trainDescriptors, sourceType);

+    declare.time(50);
    TEST_CYCLE()
    {
        batchDistance(queryDescriptors, trainDescriptors, dist, CV_32F, (isCrossCheck) ? ndix : noArray(),
@@ -118,6 +119,7 @@ PERF_TEST_P(Norm_CrossCheck, batchDistance_32F,
    Mat ndix;

    generateData(queryDescriptors, trainDescriptors, CV_32F);
+    declare.time(100);

    TEST_CYCLE()
    {
--- a/modules/gpu/doc/image_processing.rst
+++ b/modules/gpu/doc/image_processing.rst
@@ -873,15 +873,16 @@ gpu::FastNonLocalMeansDenoising
 -------------------------------
 .. ocv:class:: gpu::FastNonLocalMeansDenoising

-    class FastNonLocalMeansDenoising
-    {
-    public:
-        //! Simple method, recommended for grayscale images (though it supports multichannel images)
-        void simpleMethod(const GpuMat& src, GpuMat& dst, float h, int search_window = 21, int block_size = 7, Stream& s = Stream::Null())
+    ::

-        //! Processes luminance and color components separatelly
-        void labMethod(const GpuMat& src, GpuMat& dst, float h_luminance, float h_color, int search_window = 21, int block_size = 7, Stream& s = Stream::Null())
-    };
+        class FastNonLocalMeansDenoising
+        {
+        public:
+            //! Simple method, recommended for grayscale images (though it supports multichannel images)
+            void simpleMethod(const GpuMat& src, GpuMat& dst, float h, int search_window = 21, int block_size = 7, Stream& s = Stream::Null())
+            //! Processes luminance and color components separatelly
+            void labMethod(const GpuMat& src, GpuMat& dst, float h_luminance, float h_color, int search_window = 21, int block_size = 7, Stream& s = Stream::Null())
+        };

 The class implements fast approximate Non Local Means Denoising algorithm.

--- a/modules/gpu/include/opencv2/gpu/device/utility.hpp
+++ b/modules/gpu/include/opencv2/gpu/device/utility.hpp
@@ -149,7 +149,7 @@ namespace cv { namespace gpu { namespace device
            return true;
        }

-        static __device__ __forceinline__ bool check(int, int, int, uint offset = 0)
+        static __device__ __forceinline__ bool check(int, int, int)
        {
            return true;
        }
--- a/modules/gpu/misc/mark_nvidia.py
+++ b/modules/gpu/misc/mark_nvidia.py
@@ -1,3 +1,5 @@
+#/usr/bin/env python
+
 import sys, re

 spaces = '[\s]*'
--- a/modules/gpu/src/cuda/integral_image.cu
+++ b/modules/gpu/src/cuda/integral_image.cu
@@ -357,18 +357,19 @@ namespace cv { namespace gpu { namespace device
        #endif
        }

-        void shfl_integral_gpu(PtrStepSzb img, PtrStepSz<unsigned int> integral, cudaStream_t stream)
+        void shfl_integral_gpu(const PtrStepSzb& img, PtrStepSz<unsigned int> integral, cudaStream_t stream)
        {
            {
                // each thread handles 16 values, use 1 block/row
-                const int block = img.cols / 16;
+                // save, becouse step is actually can't be less 512 bytes
+                int block = integral.cols / 16;

                // launch 1 block / row
                const int grid = img.rows;

                cudaSafeCall( cudaFuncSetCacheConfig(shfl_integral_horizontal, cudaFuncCachePreferL1) );

-                shfl_integral_horizontal<<<grid, block, 0, stream>>>((PtrStepSz<uint4>) img, (PtrStepSz<uint4>) integral);
+                shfl_integral_horizontal<<<grid, block, 0, stream>>>((const PtrStepSz<uint4>) img, (PtrStepSz<uint4>) integral);
                cudaSafeCall( cudaGetLastError() );
            }

--- a/modules/gpu/src/cuda/lbp.cu
+++ b/modules/gpu/src/cuda/lbp.cu
@@ -185,6 +185,7 @@ namespace cv { namespace gpu { namespace device

        void connectedConmonents(PtrStepSz<int4> candidates, int ncandidates, PtrStepSz<int4> objects, int groupThreshold, float grouping_eps, unsigned int* nclasses)
        {
+            if (!ncandidates) return;
            int block = ncandidates;
            int smem  = block * ( sizeof(int) + sizeof(int4) );
            disjoin<InSameComponint><<<1, block, smem>>>(candidates, objects, ncandidates, groupThreshold, grouping_eps, nclasses);
--- a/modules/gpu/src/cuda/surf.cu
+++ b/modules/gpu/src/cuda/surf.cu
@@ -177,7 +177,7 @@ namespace cv { namespace gpu { namespace device
            return (HAAR_SIZE0 + HAAR_SIZE_INC * layer) << octave;
        }

-        __global__ void icvCalcLayerDetAndTrace(PtrStepf det, PtrStepf trace, uint sumOffset)
+        __global__ void icvCalcLayerDetAndTrace(PtrStepf det, PtrStepf trace)
        {
            // Determine the indices
            const int gridDim_y = gridDim.y / (c_nOctaveLayers + 2);
@@ -198,9 +198,9 @@ namespace cv { namespace gpu { namespace device

            if (size <= c_img_rows && size <= c_img_cols && i < samples_i && j < samples_j)
            {
-                const float dx  = icvCalcHaarPatternSum<3>(c_DX , 9, size, (i << c_octave), sumOffset + (j << c_octave));
-                const float dy  = icvCalcHaarPatternSum<3>(c_DY , 9, size, (i << c_octave), sumOffset + (j << c_octave));
-                const float dxy = icvCalcHaarPatternSum<4>(c_DXY, 9, size, (i << c_octave), sumOffset + (j << c_octave));
+                const float dx  = icvCalcHaarPatternSum<3>(c_DX , 9, size, (i << c_octave), (j << c_octave));
+                const float dy  = icvCalcHaarPatternSum<3>(c_DY , 9, size, (i << c_octave), (j << c_octave));
+                const float dxy = icvCalcHaarPatternSum<4>(c_DXY, 9, size, (i << c_octave), (j << c_octave));

                det.ptr(layer * c_layer_rows + i + margin)[j + margin] = dx * dy - 0.81f * dxy * dxy;
                trace.ptr(layer * c_layer_rows + i + margin)[j + margin] = dx + dy;
@@ -208,7 +208,7 @@ namespace cv { namespace gpu { namespace device
        }

        void icvCalcLayerDetAndTrace_gpu(const PtrStepf& det, const PtrStepf& trace, int img_rows, int img_cols,
-            int octave, int nOctaveLayers, const size_t sumOffset)
+            int octave, int nOctaveLayers)
        {
            const int min_size = calcSize(octave, 0);
            const int max_samples_i = 1 + ((img_rows - min_size) >> octave);
@@ -220,7 +220,7 @@ namespace cv { namespace gpu { namespace device
            grid.x = divUp(max_samples_j, threads.x);
            grid.y = divUp(max_samples_i, threads.y) * (nOctaveLayers + 2);

-            icvCalcLayerDetAndTrace<<<grid, threads>>>(det, trace, (uint)sumOffset);
+            icvCalcLayerDetAndTrace<<<grid, threads>>>(det, trace);
            cudaSafeCall( cudaGetLastError() );

            cudaSafeCall( cudaDeviceSynchronize() );
@@ -233,7 +233,7 @@ namespace cv { namespace gpu { namespace device

        struct WithMask
        {
-            static __device__ bool check(int sum_i, int sum_j, int size, const uint offset)
+            static __device__ bool check(int sum_i, int sum_j, int size)
            {
                float ratio = (float)size / 9.0f;

@@ -245,10 +245,10 @@ namespace cv { namespace gpu { namespace device
                int dy2 = __float2int_rn(ratio * c_DM[3]);

                float t = 0;
-                t += tex2D(maskSumTex, offset + sum_j + dx1, sum_i + dy1);
-                t -= tex2D(maskSumTex, offset + sum_j + dx1, sum_i + dy2);
-                t -= tex2D(maskSumTex, offset + sum_j + dx2, sum_i + dy1);
-                t += tex2D(maskSumTex, offset + sum_j + dx2, sum_i + dy2);
+                t += tex2D(maskSumTex, sum_j + dx1, sum_i + dy1);
+                t -= tex2D(maskSumTex, sum_j + dx1, sum_i + dy2);
+                t -= tex2D(maskSumTex, sum_j + dx2, sum_i + dy1);
+                t += tex2D(maskSumTex, sum_j + dx2, sum_i + dy2);

                d += t * c_DM[4] / ((dx2 - dx1) * (dy2 - dy1));

@@ -258,7 +258,7 @@ namespace cv { namespace gpu { namespace device

        template <typename Mask>
        __global__ void icvFindMaximaInLayer(const PtrStepf det, const PtrStepf trace, int4* maxPosBuffer,
-            unsigned int* maxCounter, const uint maskOffset)
+            unsigned int* maxCounter)
        {
            #if __CUDA_ARCH__ && __CUDA_ARCH__ >= 110

@@ -299,7 +299,7 @@ namespace cv { namespace gpu { namespace device
                    const int sum_i = (i - ((size >> 1) >> c_octave)) << c_octave;
                    const int sum_j = (j - ((size >> 1) >> c_octave)) << c_octave;

-                    if (Mask::check(sum_i, sum_j, size, maskOffset))
+                    if (Mask::check(sum_i, sum_j, size))
                    {
                        // Check to see if we have a max (in its 26 neighbours)
                        const bool condmax = val0 > N9[localLin - 1 - blockDim.x - zoff]
@@ -351,7 +351,7 @@ namespace cv { namespace gpu { namespace device
        }

        void icvFindMaximaInLayer_gpu(const PtrStepf& det, const PtrStepf& trace, int4* maxPosBuffer, unsigned int* maxCounter,
-            int img_rows, int img_cols, int octave, bool use_mask, int nOctaveLayers, const size_t maskOffset)
+            int img_rows, int img_cols, int octave, bool use_mask, int nOctaveLayers)
        {
            const int layer_rows = img_rows >> octave;
            const int layer_cols = img_cols >> octave;
@@ -367,9 +367,9 @@ namespace cv { namespace gpu { namespace device
            const size_t smem_size = threads.x * threads.y * 3 * sizeof(float);

            if (use_mask)
-                icvFindMaximaInLayer<WithMask><<<grid, threads, smem_size>>>(det, trace, maxPosBuffer, maxCounter, (uint)maskOffset);
+                icvFindMaximaInLayer<WithMask><<<grid, threads, smem_size>>>(det, trace, maxPosBuffer, maxCounter);
            else
-                icvFindMaximaInLayer<WithOutMask><<<grid, threads, smem_size>>>(det, trace, maxPosBuffer, maxCounter, 0);
+                icvFindMaximaInLayer<WithOutMask><<<grid, threads, smem_size>>>(det, trace, maxPosBuffer, maxCounter);

            cudaSafeCall( cudaGetLastError() );

--- a/modules/gpu/src/gftt.cpp
+++ b/modules/gpu/src/gftt.cpp
@@ -85,6 +85,12 @@ void cv::gpu::GoodFeaturesToTrackDetector_GPU::operator ()(const GpuMat& image,

    int total = findCorners_gpu(eig_, static_cast<float>(maxVal * qualityLevel), mask, tmpCorners_.ptr<float2>(), tmpCorners_.cols);

+    if (total == 0)
+    {
+        corners.release();
+        return;
+    }
+
    sortCorners_gpu(eig_, tmpCorners_.ptr<float2>(), total);

    if (minDistance < 1)
--- a/modules/gpu/src/imgproc.cpp
+++ b/modules/gpu/src/imgproc.cpp
@@ -534,7 +534,7 @@ namespace cv { namespace gpu { namespace device
 {
    namespace imgproc
    {
-        void shfl_integral_gpu(PtrStepSzb img, PtrStepSz<unsigned int> integral, cudaStream_t stream);
+        void shfl_integral_gpu(const PtrStepSzb& img, PtrStepSz<unsigned int> integral, cudaStream_t stream);
    }
 }}}

@@ -550,44 +550,26 @@ void cv::gpu::integralBuffered(const GpuMat& src, GpuMat& sum, GpuMat& buffer, S

    src.locateROI(whole, offset);

-    if (info.supports(WARP_SHUFFLE_FUNCTIONS) && src.cols <= 2048)
+    if (info.supports(WARP_SHUFFLE_FUNCTIONS) && src.cols <= 2048
+        && offset.x % 16 == 0 && ((src.cols + 63) / 64) * 64 <= (src.step - offset.x))
    {
-        GpuMat srcAlligned;
+        ensureSizeIsEnough(((src.rows + 7) / 8) * 8, ((src.cols + 63) / 64) * 64, CV_32SC1, buffer);

-        if (src.cols % 16 == 0 && src.rows % 8 == 0 && offset.x % 16 == 0 && offset.y % 8 == 0)
-            srcAlligned = src;
-        else
-        {
-            ensureSizeIsEnough(((src.rows + 7) / 8) * 8, ((src.cols + 15) / 16) * 16, src.type(), buffer);
-
-            GpuMat inner = buffer(Rect(0, 0, src.cols, src.rows));
-
-            if (s)
-            {
-                s.enqueueMemSet(buffer, Scalar::all(0));
-                s.enqueueCopy(src, inner);
-            }
-            else
-            {
-                buffer.setTo(Scalar::all(0));
-                src.copyTo(inner);
-            }
-
-            srcAlligned = buffer;
-        }
-
-        sum.create(srcAlligned.rows + 1, srcAlligned.cols + 4, CV_32SC1);
+        cv::gpu::device::imgproc::shfl_integral_gpu(src, buffer, stream);

+        sum.create(src.rows + 1, src.cols + 1, CV_32SC1);
        if (s)
            s.enqueueMemSet(sum, Scalar::all(0));
        else
            sum.setTo(Scalar::all(0));

-        GpuMat inner = sum(Rect(4, 1, srcAlligned.cols, srcAlligned.rows));
+        GpuMat inner = sum(Rect(1, 1, src.cols, src.rows));
+        GpuMat res = buffer(Rect(0, 0, src.cols, src.rows));

-        cv::gpu::device::imgproc::shfl_integral_gpu(srcAlligned, inner, stream);
-
-            sum = sum(Rect(3, 0, src.cols + 1, src.rows + 1));
+        if (s)
+            s.enqueueCopy(res, inner);
+        else
+            res.copyTo(inner);
    }
    else
    {
--- a/modules/gpu/src/surf.cpp
+++ b/modules/gpu/src/surf.cpp
@@ -75,10 +75,10 @@ namespace cv { namespace gpu { namespace device
        size_t bindMaskSumTex(PtrStepSz<unsigned int> maskSum);

        void icvCalcLayerDetAndTrace_gpu(const PtrStepf& det, const PtrStepf& trace, int img_rows, int img_cols,
-            int octave, int nOctaveLayers, const size_t sumOffset);
+            int octave, int nOctaveLayer);

        void icvFindMaximaInLayer_gpu(const PtrStepf& det, const PtrStepf& trace, int4* maxPosBuffer, unsigned int* maxCounter,
-            int img_rows, int img_cols, int octave, bool use_mask, int nLayers, const size_t maskOffset);
+            int img_rows, int img_cols, int octave, bool use_mask, int nLayers);

        void icvInterpolateKeypoint_gpu(const PtrStepf& det, const int4* maxPosBuffer, unsigned int maxCounter,
            float* featureX, float* featureY, int* featureLaplacian, int* featureOctave, float* featureSize, float* featureHessian,
@@ -145,8 +145,8 @@ namespace
            loadGlobalConstants(maxCandidates, maxFeatures, img_rows, img_cols, surf_.nOctaveLayers, static_cast<float>(surf_.hessianThreshold));

            bindImgTex(img);
-            integralBuffered(img, surf_.sum, surf_.intBuffer);

+            integralBuffered(img, surf_.sum, surf_.intBuffer);
            sumOffset = bindSumTex(surf_.sum);

            if (use_mask)
@@ -173,10 +173,10 @@ namespace

                loadOctaveConstants(octave, layer_rows, layer_cols);

-                icvCalcLayerDetAndTrace_gpu(surf_.det, surf_.trace, img_rows, img_cols, octave, surf_.nOctaveLayers, sumOffset);
+                icvCalcLayerDetAndTrace_gpu(surf_.det, surf_.trace, img_rows, img_cols, octave, surf_.nOctaveLayers);

                icvFindMaximaInLayer_gpu(surf_.det, surf_.trace, surf_.maxPosBuffer.ptr<int4>(), counters.ptr<unsigned int>() + 1 + octave,
-                    img_rows, img_cols, octave, use_mask, surf_.nOctaveLayers, maskOffset);
+                    img_rows, img_cols, octave, use_mask, surf_.nOctaveLayers);

                unsigned int maxCounter;
                cudaSafeCall( cudaMemcpy(&maxCounter, counters.ptr<unsigned int>() + 1 + octave, sizeof(unsigned int), cudaMemcpyDeviceToHost) );
--- a/modules/gpu/test/test_video.cpp
+++ b/modules/gpu/test/test_video.cpp
@@ -203,6 +203,21 @@ TEST_P(GoodFeaturesToTrack, Accuracy)
    }
 }

+TEST_P(GoodFeaturesToTrack, EmptyCorners)
+{
+    int maxCorners = 1000;
+    double qualityLevel = 0.01;
+
+    cv::gpu::GoodFeaturesToTrackDetector_GPU detector(maxCorners, qualityLevel, minDistance);
+
+    cv::gpu::GpuMat src(100, 100, CV_8UC1, cv::Scalar::all(0));
+    cv::gpu::GpuMat corners(1, maxCorners, CV_32FC2);
+
+    detector(src, corners);
+
+    ASSERT_TRUE( corners.empty() );
+}
+
 INSTANTIATE_TEST_CASE_P(GPU_Video, GoodFeaturesToTrack, testing::Combine(
    ALL_DEVICES,
    testing::Values(MinDistance(0.0), MinDistance(3.0))));
--- a/modules/highgui/CMakeLists.txt
+++ b/modules/highgui/CMakeLists.txt
@@ -171,21 +171,6 @@ if(HAVE_PVAPI)
  list(APPEND HIGHGUI_LIBRARIES ${PVAPI_LIBRARY})
 endif()

-if(HAVE_GIGE_API)
-  add_definitions(-DHAVE_GIGE_API)
-  ocv_include_directories(${GIGEAPI_INCLUDE_PATH})
-  set(highgui_srcs src/cap_giganetix.cpp ${highgui_srcs})
-  list(APPEND HIGHGUI_LIBRARIES ${GIGEAPI_LIBRARIES})
-  list(APPEND highgui_srcs src/cap_giganetix.cpp)
-endif(HAVE_GIGE_API)
-
-if(WITH_IMAGEIO)
-  add_definitions(-DHAVE_IMAGEIO=1)
-  if(IOS)
-    list(APPEND HIGHGUI_LIBRARIES "-framework ImageIO")
-  endif()
-endif(WITH_IMAGEIO)
-
 if(WITH_AVFOUNDATION)
  add_definitions(-DHAVE_AVFOUNDATION=1)
  list(APPEND highgui_srcs src/cap_avfoundation.mm)
--- a/modules/highgui/include/opencv2/highgui/highgui_c.h
+++ b/modules/highgui/include/opencv2/highgui/highgui_c.h
@@ -307,9 +307,7 @@ enum

    CV_CAP_XIAPI    =1100,   // XIMEA Camera API

-    CV_CAP_AVFOUNDATION = 1200,  // AVFoundation framework for iOS (OS X Lion will have the same API)
-
-    CV_CAP_GIGANETIX = 1300  // Smartek Giganetix GigEVisionSDK
+    CV_CAP_AVFOUNDATION = 1200  // AVFoundation framework for iOS (OS X Lion will have the same API)
 };

 /* start capturing frames from camera: index = camera_index + domain_offset (CV_CAP_*) */
@@ -456,15 +454,6 @@ enum
    CV_CAP_PROP_IOS_DEVICE_FLASH = 9003,
    CV_CAP_PROP_IOS_DEVICE_WHITEBALANCE = 9004,
    CV_CAP_PROP_IOS_DEVICE_TORCH = 9005
-
-    // Properties of cameras available through Smartek Giganetix Ethernet Vision interface
-    /* --- Vladimir Litvinenko (litvinenko.vladimir@gmail.com) --- */
-    ,CV_CAP_PROP_GIGA_FRAME_OFFSET_X = 10001,
-    CV_CAP_PROP_GIGA_FRAME_OFFSET_Y = 10002,
-    CV_CAP_PROP_GIGA_FRAME_WIDTH_MAX = 10003,
-    CV_CAP_PROP_GIGA_FRAME_HEIGH_MAX = 10004,
-    CV_CAP_PROP_GIGA_FRAME_SENS_WIDTH = 10005,
-    CV_CAP_PROP_GIGA_FRAME_SENS_HEIGH = 10006
 };

 enum
--- a/modules/highgui/src/cap.cpp
+++ b/modules/highgui/src/cap.cpp
@@ -149,9 +149,6 @@ CV_IMPL CvCapture * cvCreateCameraCapture (int index)
 #endif
 #ifdef HAVE_AVFOUNDATION
        CV_CAP_AVFOUNDATION,
-#endif
-#ifdef HAVE_GIGE_API
-        CV_CAP_GIGANETIX,
 #endif
        -1
    };
@@ -185,7 +182,6 @@ CV_IMPL CvCapture * cvCreateCameraCapture (int index)
    defined(HAVE_XIMEA)        || \
    defined(HAVE_AVFOUNDATION) || \
    defined(HAVE_ANDROID_NATIVE_CAMERA) || \
-    defined(HAVE_GIGE_API) || \
    (0)
        // local variable to memorize the captured device
        CvCapture *capture;
@@ -322,14 +318,6 @@ CV_IMPL CvCapture * cvCreateCameraCapture (int index)
                return capture;
        break;
 #endif
-
-#ifdef HAVE_GIGE_API
-        case CV_CAP_GIGANETIX:
-            capture = cvCreateCameraCapture_Giganetix (index);
-            if (capture)
-                return capture;
-        break; // CV_CAP_GIGANETIX
-#endif
        }
    }

@@ -424,7 +412,6 @@ CV_IMPL CvVideoWriter* cvCreateVideoWriter( const char* filename, int fourcc,

 CV_IMPL int cvWriteFrame( CvVideoWriter* writer, const IplImage* image )
 {
-
    return writer ? writer->writeFrame(image) : 0;
 }

--- a/modules/highgui/src/cap_ffmpeg.cpp
+++ b/modules/highgui/src/cap_ffmpeg.cpp
@@ -57,11 +57,32 @@ static CvCreateVideoWriter_Plugin icvCreateVideoWriter_FFMPEG_p = 0;
 static CvReleaseVideoWriter_Plugin icvReleaseVideoWriter_FFMPEG_p = 0;
 static CvWriteFrame_Plugin icvWriteFrame_FFMPEG_p = 0;

-static void
-icvInitFFMPEG(void)
+static cv::Mutex _icvInitFFMPEG_mutex;
+
+class icvInitFFMPEG
 {
-    static int ffmpegInitialized = 0;
-    if( !ffmpegInitialized )
+public:
+    static void Init()
+    {
+        cv::AutoLock al(_icvInitFFMPEG_mutex);
+        static icvInitFFMPEG init;
+    }
+
+private:
+    #if defined WIN32 || defined _WIN32
+    HMODULE icvFFOpenCV;
+
+    ~icvInitFFMPEG()
+    {
+        if (icvFFOpenCV)
+        {
+            FreeLibrary(icvFFOpenCV);
+            icvFFOpenCV = 0;
+        }
+    }
+    #endif
+
+    icvInitFFMPEG()
    {
    #if defined WIN32 || defined _WIN32
        const char* module_name = "opencv_ffmpeg"
@@ -71,7 +92,7 @@ icvInitFFMPEG(void)
        #endif
            ".dll";

-        static HMODULE icvFFOpenCV = LoadLibrary( module_name );
+        icvFFOpenCV = LoadLibrary( module_name );
        if( icvFFOpenCV )
        {
            icvCreateFileCapture_FFMPEG_p =
@@ -93,24 +114,18 @@ icvInitFFMPEG(void)
            icvWriteFrame_FFMPEG_p =
                (CvWriteFrame_Plugin)GetProcAddress(icvFFOpenCV, "cvWriteFrame_FFMPEG");

-#if 0
-            if( icvCreateFileCapture_FFMPEG_p != 0 &&
-                icvReleaseCapture_FFMPEG_p != 0 &&
-                icvGrabFrame_FFMPEG_p != 0 &&
-                icvRetrieveFrame_FFMPEG_p != 0 &&
-                icvSetCaptureProperty_FFMPEG_p != 0 &&
-                icvGetCaptureProperty_FFMPEG_p != 0 &&
-                icvCreateVideoWriter_FFMPEG_p != 0 &&
-                icvReleaseVideoWriter_FFMPEG_p != 0 &&
-                icvWriteFrame_FFMPEG_p != 0 )
+            if( icvCreateFileCapture_FFMPEG_p == NULL ||
+                icvReleaseCapture_FFMPEG_p == NULL ||
+                icvGrabFrame_FFMPEG_p == NULL  ||
+                icvRetrieveFrame_FFMPEG_p == NULL ||
+                icvSetCaptureProperty_FFMPEG_p == NULL ||
+                icvGetCaptureProperty_FFMPEG_p == NULL ||
+                icvCreateVideoWriter_FFMPEG_p == NULL ||
+                icvReleaseVideoWriter_FFMPEG_p == NULL ||
+                icvWriteFrame_FFMPEG_p == NULL )
            {
-                printf("Successfully initialized ffmpeg plugin!\n");
+                fprintf(stderr, "Failed to load FFMPEG plugin: module handle=%p\n", icvFFOpenCV);
            }
-            else
-            {
-                printf("Failed to load FFMPEG plugin: module handle=%p\n", icvFFOpenCV);
-            }
-#endif
        }
    #elif defined HAVE_FFMPEG
        icvCreateFileCapture_FFMPEG_p = (CvCreateFileCapture_Plugin)cvCreateFileCapture_FFMPEG;
@@ -123,10 +138,8 @@ icvInitFFMPEG(void)
        icvReleaseVideoWriter_FFMPEG_p = (CvReleaseVideoWriter_Plugin)cvReleaseVideoWriter_FFMPEG;
        icvWriteFrame_FFMPEG_p = (CvWriteFrame_Plugin)cvWriteFrame_FFMPEG;
    #endif
-
-        ffmpegInitialized = 1;
    }
-}
+};


 class CvCapture_FFMPEG_proxy : public CvCapture
@@ -161,9 +174,9 @@ public:
    }
    virtual bool open( const char* filename )
    {
+        icvInitFFMPEG::Init();
        close();

-        icvInitFFMPEG();
        if( !icvCreateFileCapture_FFMPEG_p )
            return false;
        ffmpegCapture = icvCreateFileCapture_FFMPEG_p( filename );
@@ -196,7 +209,6 @@ CvCapture* cvCreateFileCapture_FFMPEG_proxy(const char * filename)
 #endif
 }

-
 class CvVideoWriter_FFMPEG_proxy : public CvVideoWriter
 {
 public:
@@ -214,8 +226,8 @@ public:
    }
    virtual bool open( const char* filename, int fourcc, double fps, CvSize frameSize, bool isColor )
    {
+        icvInitFFMPEG::Init();
        close();
-        icvInitFFMPEG();
        if( !icvCreateVideoWriter_FFMPEG_p )
            return false;
        ffmpegWriter = icvCreateVideoWriter_FFMPEG_p( filename, fourcc, fps, frameSize.width, frameSize.height, isColor );
--- a/modules/highgui/src/cap_ffmpeg_impl.hpp
+++ b/modules/highgui/src/cap_ffmpeg_impl.hpp
@@ -328,28 +328,179 @@ void CvCapture_FFMPEG::close()
 #define AVSEEK_FLAG_ANY 1
 #endif

-static void icvInitFFMPEG_internal()
+class ImplMutex
 {
-    static volatile bool initialized = false;
-    if( !initialized )
+public:
+    ImplMutex();
+    ~ImplMutex();
+
+    void lock();
+    bool trylock();
+    void unlock();
+
+    struct Impl;
+protected:
+    Impl* impl;
+
+private:
+    ImplMutex(const ImplMutex&);
+    ImplMutex& operator = (const ImplMutex& m);
+};
+
+#if defined WIN32 || defined _WIN32 || defined WINCE
+
+struct ImplMutex::Impl
+{
+    Impl() { InitializeCriticalSection(&cs); refcount = 1; }
+    ~Impl() { DeleteCriticalSection(&cs); }
+
+    void lock() { EnterCriticalSection(&cs); }
+    bool trylock() { return TryEnterCriticalSection(&cs) != 0; }
+    void unlock() { LeaveCriticalSection(&cs); }
+
+    CRITICAL_SECTION cs;
+    int refcount;
+};
+
+#ifndef __GNUC__
+static int _interlockedExchangeAdd(int* addr, int delta)
+{
+#if defined _MSC_VER && _MSC_VER >= 1500
+    return (int)_InterlockedExchangeAdd((long volatile*)addr, delta);
+#else
+    return (int)InterlockedExchangeAdd((long volatile*)addr, delta);
+#endif
+}
+#endif // __GNUC__
+
+#elif defined __APPLE__
+
+#include <libkern/OSAtomic.h>
+
+struct ImplMutex::Impl
+{
+    Impl() { sl = OS_SPINLOCK_INIT; refcount = 1; }
+    ~Impl() {}
+
+    void lock() { OSSpinLockLock(&sl); }
+    bool trylock() { return OSSpinLockTry(&sl); }
+    void unlock() { OSSpinLockUnlock(&sl); }
+
+    OSSpinLock sl;
+    int refcount;
+};
+
+#elif defined __linux__ && !defined ANDROID
+
+struct ImplMutex::Impl
+{
+    Impl() { pthread_spin_init(&sl, 0); refcount = 1; }
+    ~Impl() { pthread_spin_destroy(&sl); }
+
+    void lock() { pthread_spin_lock(&sl); }
+    bool trylock() { return pthread_spin_trylock(&sl) == 0; }
+    void unlock() { pthread_spin_unlock(&sl); }
+
+    pthread_spinlock_t sl;
+    int refcount;
+};
+
+#else
+
+struct ImplMutex::Impl
+{
+    Impl() { pthread_mutex_init(&sl, 0); refcount = 1; }
+    ~Impl() { pthread_mutex_destroy(&sl); }
+
+    void lock() { pthread_mutex_lock(&sl); }
+    bool trylock() { return pthread_mutex_trylock(&sl) == 0; }
+    void unlock() { pthread_mutex_unlock(&sl); }
+
+    pthread_mutex_t sl;
+    int refcount;
+};
+
+#endif
+
+ImplMutex::ImplMutex()
+{
+    impl = new ImplMutex::Impl;
+}
+
+ImplMutex::~ImplMutex()
+{
+    delete impl;
+    impl = 0;
+}
+
+void ImplMutex::lock() { impl->lock(); }
+void ImplMutex::unlock() { impl->unlock(); }
+bool ImplMutex::trylock() { return impl->trylock(); }
+
+static int LockCallBack(void **mutex, AVLockOp op)
+{
+    switch (op)
    {
-    #if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 13, 0)
+        case AV_LOCK_CREATE:
+            *mutex = reinterpret_cast<void*>(new ImplMutex());
+            if (!*mutex)
+                return 1;
+        break;
+
+        case AV_LOCK_OBTAIN:
+            reinterpret_cast<ImplMutex*>(*mutex)->lock();
+        break;
+
+        case AV_LOCK_RELEASE:
+            reinterpret_cast<ImplMutex*>(*mutex)->unlock();
+        break;
+
+        case AV_LOCK_DESTROY:
+            ImplMutex* cv_mutex = reinterpret_cast<ImplMutex*>(*mutex);
+            delete cv_mutex;
+            cv_mutex = NULL;
+        break;
+    }
+    return 0;
+}
+
+static ImplMutex _InternalFFMpegRegister_mutex;
+
+class InternalFFMpegRegister
+{
+public:
+    static void Register()
+    {
+        _InternalFFMpegRegister_mutex.lock();
+        static InternalFFMpegRegister init;
+        _InternalFFMpegRegister_mutex.unlock();
+    }
+
+    ~InternalFFMpegRegister()
+    {
+        av_lockmgr_register(NULL);
+    }
+
+private:
+    InternalFFMpegRegister()
+    {
+#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 13, 0)
        avformat_network_init();
-    #endif
+#endif

        /* register all codecs, demux and protocols */
        av_register_all();

-        av_log_set_level(AV_LOG_ERROR);
+        /* register a callback function for synchronization */
+        av_lockmgr_register(&LockCallBack);

-        initialized = true;
+        av_log_set_level(AV_LOG_ERROR);
    }
-}
+};

 bool CvCapture_FFMPEG::open( const char* _filename )
 {
-    icvInitFFMPEG_internal();
-
+    InternalFFMpegRegister::Register();
    unsigned i;
    bool valid = false;

@@ -361,7 +512,8 @@ bool CvCapture_FFMPEG::open( const char* _filename )
    int err = av_open_input_file(&ic, _filename, NULL, 0, NULL);
 #endif

-    if (err < 0) {
+    if (err < 0)
+    {
        CV_WARN("Error opening file");
        goto exit_func;
    }
@@ -371,7 +523,8 @@ bool CvCapture_FFMPEG::open( const char* _filename )
 #else
    av_find_stream_info(ic);
 #endif
-    if (err < 0) {
+    if (err < 0)
+    {
        CV_WARN("Could not find codec parameters");
        goto exit_func;
    }
@@ -393,7 +546,8 @@ bool CvCapture_FFMPEG::open( const char* _filename )
 #define AVMEDIA_TYPE_VIDEO CODEC_TYPE_VIDEO
 #endif

-        if( AVMEDIA_TYPE_VIDEO == enc->codec_type && video_stream < 0) {
+        if( AVMEDIA_TYPE_VIDEO == enc->codec_type && video_stream < 0)
+        {
            AVCodec *codec = avcodec_find_decoder(enc->codec_id);
            if (!codec ||
 #if LIBAVCODEC_VERSION_INT >= ((53<<16)+(8<<8)+0)
@@ -401,7 +555,8 @@ bool CvCapture_FFMPEG::open( const char* _filename )
 #else
                avcodec_open(enc, codec)
 #endif
-                < 0) goto exit_func;
+                < 0)
+                goto exit_func;

            video_stream = i;
            video_st = ic->streams[i];
@@ -1275,7 +1430,7 @@ void CvVideoWriter_FFMPEG::close()
 bool CvVideoWriter_FFMPEG::open( const char * filename, int fourcc,
                                 double fps, int width, int height, bool is_color )
 {
-    icvInitFFMPEG_internal();
+    InternalFFMpegRegister::Register();

    CodecID codec_id = CODEC_ID_NONE;
    int err, codec_pix_fmt;
@@ -1495,6 +1650,7 @@ bool CvVideoWriter_FFMPEG::open( const char * filename, int fourcc,
    frame_width = width;
    frame_height = height;
    ok = true;
+
    return true;
 }

@@ -1506,6 +1662,7 @@ CvCapture_FFMPEG* cvCreateFileCapture_FFMPEG( const char* filename )
    capture->init();
    if( capture->open( filename ))
        return capture;
+
    capture->close();
    free(capture);
    return 0;
@@ -1554,7 +1711,6 @@ CvVideoWriter_FFMPEG* cvCreateVideoWriter_FFMPEG( const char* filename, int four
    return 0;
 }

-
 void cvReleaseVideoWriter_FFMPEG( CvVideoWriter_FFMPEG** writer )
 {
    if( writer && *writer )
@@ -1741,15 +1897,12 @@ AVStream* OutputMediaStream_FFMPEG::addVideoStream(AVFormatContext *oc, CodecID

 bool OutputMediaStream_FFMPEG::open(const char* fileName, int width, int height, double fps)
 {
+    InternalFFMpegRegister::Register();
+
    fmt_ = 0;
    oc_ = 0;
    video_st_ = 0;

-    // tell FFMPEG to register codecs
-    av_register_all();
-
-    av_log_set_level(AV_LOG_ERROR);
-
    // auto detect the output format from the name and fourcc code
    #if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 2, 0)
        fmt_ = av_guess_format(NULL, fileName, NULL);
@@ -1920,6 +2073,8 @@ private:

 bool InputMediaStream_FFMPEG::open(const char* fileName, int* codec, int* chroma_format, int* width, int* height)
 {
+    InternalFFMpegRegister::Register();
+
    int err;

    ctx_ = 0;
@@ -1930,11 +2085,6 @@ bool InputMediaStream_FFMPEG::open(const char* fileName, int* codec, int* chroma
        avformat_network_init();
    #endif

-    // register all codecs, demux and protocols
-    av_register_all();
-
-    av_log_set_level(AV_LOG_ERROR);
-
    #if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 6, 0)
        err = avformat_open_input(&ctx_, fileName, 0, 0);
    #else
@@ -2054,7 +2204,7 @@ bool InputMediaStream_FFMPEG::read(unsigned char** data, int* size, int* endOfFi

        if (ret < 0)
        {
-            if (ret == AVERROR_EOF)
+            if (ret == (int)AVERROR_EOF)
                *endOfFile = true;
            return false;
        }
--- a/modules/highgui/src/cap_gstreamer.cpp
+++ b/modules/highgui/src/cap_gstreamer.cpp
@@ -65,7 +65,24 @@
 #define CV_WARN(message) fprintf(stderr, "warning: %s (%s:%d)\n", message, __FILE__, __LINE__)
 #endif

-static bool isInited = false;
+static cv::Mutex gst_initializer_mutex;
+
+class gst_initializer
+{
+public:
+    static void init()
+    {
+        gst_initializer_mutex.lock();
+        static gst_initializer init;
+        gst_initializer_mutex.unlock();
+    }
+private:
+    gst_initializer()
+    {
+        gst_init(NULL, NULL);
+    }
+};
+
 class CvCapture_GStreamer : public CvCapture
 {
 public:
@@ -298,16 +315,18 @@ bool CvCapture_GStreamer::open( int type, const char* filename )

    __BEGIN__;

-    if(!isInited) {
+    gst_initializer::init();
+
+//    if(!isInited) {
 //        printf("gst_init\n");
-        gst_init (NULL, NULL);
+//        gst_init (NULL, NULL);

 //        gst_debug_set_active(TRUE);
 //        gst_debug_set_colored(TRUE);
 //        gst_debug_set_default_threshold(GST_LEVEL_WARNING);

-        isInited = true;
-    }
+//        isInited = true;
+//    }
    bool stream = false;
    bool manualpipeline = false;
    char *uri = NULL;
@@ -477,10 +496,11 @@ bool CvVideoWriter_GStreamer::open( const char * filename, int fourcc,
    encit=encs.find(fourcc);
    if (encit==encs.end())
        CV_ERROR( CV_StsUnsupportedFormat,"Gstreamer Opencv backend doesn't support this codec acutally.");
-    if(!isInited) {
-        gst_init (NULL, NULL);
-        isInited = true;
-    }
+//    if(!isInited) {
+//        gst_init (NULL, NULL);
+//        isInited = true;
+//    }
+    gst_initializer::init();
    close();
    source=gst_element_factory_make("appsrc",NULL);
    file=gst_element_factory_make("filesink", NULL);
--- a/modules/highgui/src/cap_libv4l.cpp
+++ b/modules/highgui/src/cap_libv4l.cpp
@@ -1008,10 +1008,6 @@ static CvCaptureCAM_V4L * icvCaptureFromCAM_V4L (int index)
      return NULL;
   }

-   /* set the default size */
-   capture->width  = DEFAULT_V4L_WIDTH;
-   capture->height = DEFAULT_V4L_HEIGHT;
-
 #ifdef USE_TEMP_BUFFER
   capture->buffers[MAX_V4L_BUFFERS].start = NULL;
 #endif
@@ -1035,6 +1031,9 @@ static CvCaptureCAM_V4L * icvCaptureFromCAM_V4L (int index)
      the standard set of cv calls promoting transparency.  "Vector Table" insertion. */
   capture->FirstCapture = 1;

+   /* set the default size */
+   capture->width  = DEFAULT_V4L_WIDTH;
+   capture->height = DEFAULT_V4L_HEIGHT;

   if (_capture_V4L2 (capture, deviceName) == -1) {
       icvCloseCAM_V4L(capture);
--- a/modules/highgui/src/cap_mil.cpp
+++ b/modules/highgui/src/cap_mil.cpp
@@ -1,219 +0,0 @@
-/*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 "precomp.hpp"
-#include "mil.h"
-
-#if _MSC_VER >= 1200
-  #pragma warning( disable: 4711 )
-  #pragma comment(lib,"mil.lib")
-  #pragma comment(lib,"milmet2.lib")
-#endif
-
-#if defined _M_X64
-  #pragma optimize("",off)
-#endif
-
-/********************* Capturing video from camera via MIL *********************/
-
-struct
-{
-    MIL_ID MilApplication;
-    int MilUser;
-} g_Mil = {0,0}; //global structure for handling MIL application
-
-class CvCaptureCAM_MIL : public CvCapture
-{
-public:
-    CvCaptureCAM_MIL() { init(); }
-    virtual ~CvCaptureCAM_MIL() { close(); }
-
-    virtual bool open( int index );
-    virtual void close();
-
-    virtual double getProperty(int);
-    virtual bool setProperty(int, double) { return false; }
-    virtual bool grabFrame();
-    virtual IplImage* retrieveFrame(int);
-    virtual int getCaptureDomain() { return CV_CAP_MIL; } // Return the type of the capture object: CV_CAP_VFW, etc...
-
-protected:
-    void init();
-
-    MIL_ID
-        MilSystem,       /* System identifier.       */
-        MilDisplay,      /* Display identifier.      */
-        MilDigitizer,    /* Digitizer identifier.    */
-        MilImage;        /* Image buffer identifier. */
-    IplImage* rgb_frame;
-};
-
-
-void CvCaptureCAM_MIL::init()
-{
-    MilSystem = MilDisplay = MilDigitizer = MilImage = M_NULL;
-    rgb_frame = 0;
-}
-
-// Initialize camera input
-bool CvCaptureCAM_MIL::open( int wIndex )
-{
-    close();
-
-    if( g_Mil.MilApplication == M_NULL )
-    {
-        assert(g_Mil.MilUser == 0);
-        MappAlloc(M_DEFAULT, &(g_Mil.MilApplication) );
-        g_Mil.MilUser = 1;
-    }
-    else
-    {
-        assert(g_Mil.MilUser>0);
-        g_Mil.MilUser++;
-    }
-
-    int dev_table[16] = { M_DEV0, M_DEV1, M_DEV2, M_DEV3,
-        M_DEV4, M_DEV5, M_DEV6, M_DEV7,
-        M_DEV8, M_DEV9, M_DEV10, M_DEV11,
-        M_DEV12, M_DEV13, M_DEV14, M_DEV15 };
-
-    //set default window size
-    int w = 320;
-    int h = 240;
-
-    for( ; wIndex < 16; wIndex++ )
-    {
-        MsysAlloc( M_SYSTEM_SETUP, //we use default system,
-                                   //if this does not work
-                                   //try to define exact board
-                                   //e.g.M_SYSTEM_METEOR,M_SYSTEM_METEOR_II...
-                   dev_table[wIndex],
-                   M_DEFAULT,
-                   &MilSystem );
-
-        if( MilSystem != M_NULL )
-            break;
-    }
-    if( MilSystem != M_NULL )
-    {
-        MdigAlloc(MilSystem,M_DEFAULT,
-                  M_CAMERA_SETUP, //default. May be M_NTSC or other
-                  M_DEFAULT,&MilDigitizer);
-
-        rgb_frame = cvCreateImage(cvSize(w,h), IPL_DEPTH_8U, 3 );
-        MdigControl(MilDigitizer, M_GRAB_SCALE,  1.0 / 2);
-
-        /*below line enables getting image vertical orientation
-         consistent with VFW but it introduces some image corruption
-         on MeteorII, so we left the image as is*/
-        //MdigControl(MilDigitizer, M_GRAB_DIRECTION_Y, M_REVERSE );
-
-        MilImage = MbufAllocColor(MilSystem, 3, w, h,
-            8+M_UNSIGNED, M_IMAGE + M_GRAB, M_NULL);
-    }
-
-    return MilSystem != M_NULL;
-}
-
-void CvCaptureCAM_MIL::close( CvCaptureCAM_MIL* capture )
-{
-    if( MilSystem != M_NULL )
-    {
-        MdigFree( MilDigitizer );
-        MbufFree( MilImage );
-        MsysFree( MilSystem );
-        cvReleaseImage(&rgb_frame );
-
-        g_Mil.MilUser--;
-        if(!g_Mil.MilUser)
-            MappFree(g_Mil.MilApplication);
-
-        MilSystem = M_NULL;
-        MilDigitizer = M_NULL;
-    }
-}
-
-
-bool CvCaptureCAM_MIL::grabFrame()
-{
-    if( MilSystem )
-    {
-        MdigGrab(MilDigitizer, MilImage);
-        return true;
-    }
-    return false;
-}
-
-
-IplImage* CvCaptureCAM_MIL::retrieveFrame(int)
-{
-    MbufGetColor(MilImage, M_BGR24+M_PACKED, M_ALL_BAND, (void*)(rgb_frame->imageData));
-    return rgb_frame;
-}
-
-double CvCaptureCAM_MIL::getProperty( int property_id )
-{
-    switch( property_id )
-    {
-    case CV_CAP_PROP_FRAME_WIDTH:
-        return rgb_frame ? rgb_frame->width : 0;
-    case CV_CAP_PROP_FRAME_HEIGHT:
-        return rgb_frame ? rgb_frame->height : 0;
-    }
-    return 0;
-}
-
-bool CvCaptureCAM_MIL::setProperty( int, double )
-{
-    return false;
-}
-
-
-CvCapture* cvCreateCameraCapture_MIL( int index )
-{
-    CvCaptureCAM_MIL* capture = new CvCaptureCAM_MIL;
-
-    if( capture->open( index ))
-        return capture;
-
-    delete capture;
-    return 0;
-}
--- a/modules/highgui/src/cap_pvapi.cpp
+++ b/modules/highgui/src/cap_pvapi.cpp
@@ -95,6 +95,10 @@ protected:
    virtual void Sleep(unsigned int time);
 #endif

+    void stopCapture();
+    bool startCapture();
+    bool resizeCaptureFrame (int frameWidth, int frameHeight);
+
    typedef struct
    {
        unsigned long   UID;
@@ -113,6 +117,8 @@ protected:
 CvCaptureCAM_PvAPI::CvCaptureCAM_PvAPI()
 {
    monocrome=false;
+    frame = NULL;
+    grayframe = NULL;
    memset(&this->Camera, 0, sizeof(this->Camera));
 }

@@ -132,8 +138,7 @@ void CvCaptureCAM_PvAPI::Sleep(unsigned int time)
 void CvCaptureCAM_PvAPI::close()
 {
    // Stop the acquisition & free the camera
-    PvCommandRun(Camera.Handle, "AcquisitionStop");
-    PvCaptureEnd(Camera.Handle);
+    stopCapture();
    PvCameraClose(Camera.Handle);
    PvUnInitialize();
 }
@@ -162,7 +167,8 @@ bool CvCaptureCAM_PvAPI::open( int index )

    Camera.UID = cameraList[index].UniqueId;

-    if (!PvCameraInfo(Camera.UID,&camInfo) && !PvCameraIpSettingsGet(Camera.UID,&ipSettings)) {
+    if (!PvCameraInfo(Camera.UID,&camInfo) && !PvCameraIpSettingsGet(Camera.UID,&ipSettings))
+    {
        /*
        struct in_addr addr;
        addr.s_addr = ipSettings.CurrentIpAddress;
@@ -173,7 +179,8 @@ bool CvCaptureCAM_PvAPI::open( int index )
        printf("Current gateway:\t%s\n",inet_ntoa(addr));
        */
    }
-    else {
+    else
+    {
        fprintf(stderr,"ERROR: could not retrieve camera IP settings.\n");
        return false;
    }
@@ -181,73 +188,33 @@ bool CvCaptureCAM_PvAPI::open( int index )

    if (PvCameraOpen(Camera.UID, ePvAccessMaster, &(Camera.Handle))==ePvErrSuccess)
    {
-
-        //Set Pixel Format to BRG24 to follow conventions
-        /*Errcode = PvAttrEnumSet(Camera.Handle, "PixelFormat", "Bgr24");
-        if (Errcode != ePvErrSuccess)
-        {
-            fprintf(stderr, "PvAPI: couldn't set PixelFormat to Bgr24\n");
-            return NULL;
-        }
-        */
-        tPvUint32 frameWidth, frameHeight, frameSize;
+        tPvUint32 frameWidth, frameHeight;
        unsigned long maxSize;
-        char pixelFormat[256];
-        PvAttrUint32Get(Camera.Handle, "TotalBytesPerFrame", &frameSize);
+
+        // By Default, try to set the pixel format to Mono8.  This can be changed later
+        // via calls to setProperty. Some colour cameras (i.e. the Manta line) have a default
+        // image mode of Bayer8, which is currently unsupported, so Mono8 is a safe bet for
+        // startup.
+
+        monocrome = (PvAttrEnumSet(Camera.Handle, "PixelFormat", "Mono8") == ePvErrSuccess);
+
        PvAttrUint32Get(Camera.Handle, "Width", &frameWidth);
        PvAttrUint32Get(Camera.Handle, "Height", &frameHeight);
-        PvAttrEnumGet(Camera.Handle, "PixelFormat", pixelFormat,256,NULL);
+
+        // Determine the maximum packet size supported by the system (ethernet adapter)
+        // and then configure the camera to use this value.  If the system's NIC only supports
+        // an MTU of 1500 or lower, this will automatically configure an MTU of 1500.
+        // 8228 is the optimal size described by the API in order to enable jumbo frames
+
        maxSize = 8228;
        //PvAttrUint32Get(Camera.Handle,"PacketSize",&maxSize);
        if (PvCaptureAdjustPacketSize(Camera.Handle,maxSize)!=ePvErrSuccess)
            return false;
-        if (strcmp(pixelFormat, "Mono8")==0) {
-                grayframe = cvCreateImage(cvSize((int)frameWidth, (int)frameHeight), IPL_DEPTH_8U, 1);
-                grayframe->widthStep = (int)frameWidth;
-                frame = cvCreateImage(cvSize((int)frameWidth, (int)frameHeight), IPL_DEPTH_8U, 3);
-                frame->widthStep = (int)frameWidth*3;
-                Camera.Frame.ImageBufferSize = frameSize;
-                Camera.Frame.ImageBuffer = grayframe->imageData;
-        }
-        else if (strcmp(pixelFormat, "Mono16")==0) {
-                grayframe = cvCreateImage(cvSize((int)frameWidth, (int)frameHeight), IPL_DEPTH_16U, 1);
-                grayframe->widthStep = (int)frameWidth;
-                frame = cvCreateImage(cvSize((int)frameWidth, (int)frameHeight), IPL_DEPTH_16U, 3);
-                frame->widthStep = (int)frameWidth*3;
-                Camera.Frame.ImageBufferSize = frameSize;
-                Camera.Frame.ImageBuffer = grayframe->imageData;
-        }
-        else if (strcmp(pixelFormat, "Bgr24")==0) {
-                frame = cvCreateImage(cvSize((int)frameWidth, (int)frameHeight), IPL_DEPTH_8U, 3);
-                frame->widthStep = (int)frameWidth*3;
-                Camera.Frame.ImageBufferSize = frameSize;
-                Camera.Frame.ImageBuffer = frame->imageData;
-        }
-        else
-                return false;
-        // Start the camera
-        PvCaptureStart(Camera.Handle);

-        // Set the camera to capture continuously
-        if(PvAttrEnumSet(Camera.Handle, "AcquisitionMode", "Continuous")!= ePvErrSuccess)
-        {
-            fprintf(stderr,"Could not set Prosilica Acquisition Mode\n");
-            return false;
-        }
+        resizeCaptureFrame(frameWidth, frameHeight);

-        if(PvCommandRun(Camera.Handle, "AcquisitionStart")!= ePvErrSuccess)
-        {
-            fprintf(stderr,"Could not start Prosilica acquisition\n");
-            return false;
-        }
+        return startCapture();

-        if(PvAttrEnumSet(Camera.Handle, "FrameStartTriggerMode", "Freerun")!= ePvErrSuccess)
-        {
-            fprintf(stderr,"Error setting Prosilica trigger to \"Freerun\"");
-            return false;
-        }
-
-        return true;
    }
    fprintf(stderr,"Error cannot open camera\n");
    return false;
@@ -264,8 +231,10 @@ bool CvCaptureCAM_PvAPI::grabFrame()
 IplImage* CvCaptureCAM_PvAPI::retrieveFrame(int)
 {

-    if (PvCaptureWaitForFrameDone(Camera.Handle, &(Camera.Frame), 1000) == ePvErrSuccess) {
-        if (!monocrome) {
+    if (PvCaptureWaitForFrameDone(Camera.Handle, &(Camera.Frame), 1000) == ePvErrSuccess)
+    {
+        if (!monocrome)
+        {
            cvMerge(grayframe,grayframe,grayframe,NULL,frame);
            return frame;
        }
@@ -287,26 +256,31 @@ double CvCaptureCAM_PvAPI::getProperty( int property_id )
        PvAttrUint32Get(Camera.Handle, "Height", &nTemp);
        return (double)nTemp;
    case CV_CAP_PROP_EXPOSURE:
-    PvAttrUint32Get(Camera.Handle,"ExposureValue",&nTemp);
-    return (double)nTemp;
+        PvAttrUint32Get(Camera.Handle,"ExposureValue",&nTemp);
+        return (double)nTemp;
    case CV_CAP_PROP_FPS:
-    tPvFloat32 nfTemp;
+        tPvFloat32 nfTemp;
        PvAttrFloat32Get(Camera.Handle, "StatFrameRate", &nfTemp);
        return (double)nfTemp;
    case CV_CAP_PROP_PVAPI_MULTICASTIP:
-    char mEnable[2];
-    char mIp[11];
-    PvAttrEnumGet(Camera.Handle,"MulticastEnable",mEnable,sizeof(mEnable),NULL);
-    if (strcmp(mEnable, "Off") == 0) {
-        return -1;
-    }
-    else {
-        long int ip;
-        int a,b,c,d;
-        PvAttrStringGet(Camera.Handle, "MulticastIPAddress",mIp,sizeof(mIp),NULL);
-        sscanf(mIp, "%d.%d.%d.%d", &a, &b, &c, &d); ip = ((a*256 + b)*256 + c)*256 + d;
-        return (double)ip;
-    }
+        char mEnable[2];
+        char mIp[11];
+        PvAttrEnumGet(Camera.Handle,"MulticastEnable",mEnable,sizeof(mEnable),NULL);
+        if (strcmp(mEnable, "Off") == 0)
+        {
+            return -1;
+        }
+        else
+        {
+            long int ip;
+            int a,b,c,d;
+            PvAttrStringGet(Camera.Handle, "MulticastIPAddress",mIp,sizeof(mIp),NULL);
+            sscanf(mIp, "%d.%d.%d.%d", &a, &b, &c, &d); ip = ((a*256 + b)*256 + c)*256 + d;
+            return (double)ip;
+        }
+    case CV_CAP_PROP_GAIN:
+        PvAttrUint32Get(Camera.Handle, "GainValue", &nTemp);
+        return (double)nTemp;
    }
    return -1.0;
 }
@@ -315,19 +289,50 @@ bool CvCaptureCAM_PvAPI::setProperty( int property_id, double value )
 {
    switch ( property_id )
    {
-    /*  TODO: Camera works, but IplImage must be modified for the new size
    case CV_CAP_PROP_FRAME_WIDTH:
-        PvAttrUint32Set(Camera.Handle, "Width", (tPvUint32)value);
+    {
+        tPvUint32 currHeight;
+
+        PvAttrUint32Get(Camera.Handle, "Height", &currHeight);
+
+        stopCapture();
+        // Reallocate Frames
+        if (!resizeCaptureFrame(value, currHeight))
+        {
+            startCapture();
+            return false;
+        }
+
+        startCapture();
+
        break;
+    }
    case CV_CAP_PROP_FRAME_HEIGHT:
-        PvAttrUint32Set(Camera.Handle, "Heigth", (tPvUint32)value);
+    {
+        tPvUint32 currWidth;
+
+        PvAttrUint32Get(Camera.Handle, "Width", &currWidth);
+
+        stopCapture();
+
+        // Reallocate Frames
+        if (!resizeCaptureFrame(value, currWidth))
+        {
+            startCapture();
+            return false;
+        }
+
+        startCapture();
+
        break;
-    */
+    }
    case CV_CAP_PROP_MONOCROME:
-        if (value==1) {
+        if (value==1)
+        {
            char pixelFormat[256];
            PvAttrEnumGet(Camera.Handle, "PixelFormat", pixelFormat,256,NULL);
-            if ((strcmp(pixelFormat, "Mono8")==0) || strcmp(pixelFormat, "Mono16")==0) {
+            if ((strcmp(pixelFormat, "Mono8")==0) || strcmp(pixelFormat, "Mono16")==0)
+            {
                monocrome=true;
            }
            else
@@ -338,31 +343,157 @@ bool CvCaptureCAM_PvAPI::setProperty( int property_id, double value )
        break;
    case CV_CAP_PROP_EXPOSURE:
        if ((PvAttrUint32Set(Camera.Handle,"ExposureValue",(tPvUint32)value)==ePvErrSuccess))
-        break;
+            break;
        else
-        return false;
+            return false;
    case CV_CAP_PROP_PVAPI_MULTICASTIP:
-
-            if (value==-1) {
-        if ((PvAttrEnumSet(Camera.Handle,"MulticastEnable", "Off")==ePvErrSuccess))
-            break;
-        else
-            return false;
-        }
-        else {
-        std::string ip=cv::format("%d.%d.%d.%d", ((int)value>>24)&255, ((int)value>>16)&255, ((int)value>>8)&255, (int)value&255);
-        if ((PvAttrEnumSet(Camera.Handle,"MulticastEnable", "On")==ePvErrSuccess) &&
-        (PvAttrStringSet(Camera.Handle, "MulticastIPAddress", ip.c_str())==ePvErrSuccess))
-            break;
+        if (value==-1)
+        {
+            if ((PvAttrEnumSet(Camera.Handle,"MulticastEnable", "Off")==ePvErrSuccess))
+                break;
+            else
+                return false;
+        }
        else
+        {
+            std::string ip=cv::format("%d.%d.%d.%d", ((int)value>>24)&255, ((int)value>>16)&255, ((int)value>>8)&255, (int)value&255);
+            if ((PvAttrEnumSet(Camera.Handle,"MulticastEnable", "On")==ePvErrSuccess) &&
+                (PvAttrStringSet(Camera.Handle, "MulticastIPAddress", ip.c_str())==ePvErrSuccess))
+                break;
+            else
+                return false;
+        }
+    case CV_CAP_PROP_GAIN:
+        if (PvAttrUint32Set(Camera.Handle,"GainValue",(tPvUint32)value)!=ePvErrSuccess)
+        {
            return false;
        }
+        break;
    default:
        return false;
    }
    return true;
 }

+void CvCaptureCAM_PvAPI::stopCapture()
+{
+    PvCommandRun(Camera.Handle, "AcquisitionStop");
+    PvCaptureEnd(Camera.Handle);
+}
+
+bool CvCaptureCAM_PvAPI::startCapture()
+{
+    // Start the camera
+    PvCaptureStart(Camera.Handle);
+
+    // Set the camera to capture continuously
+    if(PvAttrEnumSet(Camera.Handle, "AcquisitionMode", "Continuous")!= ePvErrSuccess)
+    {
+        fprintf(stderr,"Could not set PvAPI Acquisition Mode\n");
+        return false;
+    }
+
+    if(PvCommandRun(Camera.Handle, "AcquisitionStart")!= ePvErrSuccess)
+    {
+        fprintf(stderr,"Could not start PvAPI acquisition\n");
+        return false;
+    }
+
+    if(PvAttrEnumSet(Camera.Handle, "FrameStartTriggerMode", "Freerun")!= ePvErrSuccess)
+    {
+        fprintf(stderr,"Error setting PvAPI trigger to \"Freerun\"");
+        return false;
+    }
+
+    return true;
+}
+
+bool CvCaptureCAM_PvAPI::resizeCaptureFrame (int frameWidth, int frameHeight)
+{
+    char pixelFormat[256];
+    tPvUint32 frameSize;
+    tPvUint32 sensorHeight;
+    tPvUint32 sensorWidth;
+
+
+    if (grayframe)
+    {
+        cvReleaseImage(&grayframe);
+        grayframe = NULL;
+    }
+
+    if (frame)
+    {
+        cvReleaseImage(&frame);
+        frame = NULL;
+    }
+
+    if (PvAttrUint32Get(Camera.Handle, "SensorWidth", &sensorWidth) != ePvErrSuccess)
+    {
+        return false;
+    }
+
+    if (PvAttrUint32Get(Camera.Handle, "SensorHeight", &sensorHeight) != ePvErrSuccess)
+    {
+        return false;
+    }
+
+    // Cap out of bounds widths to the max supported by the sensor
+    if ((frameWidth < 0) || ((tPvUint32)frameWidth > sensorWidth))
+    {
+        frameWidth = sensorWidth;
+    }
+
+    if ((frameHeight < 0) || ((tPvUint32)frameHeight > sensorHeight))
+    {
+        frameHeight = sensorHeight;
+    }
+
+
+    if (PvAttrUint32Set(Camera.Handle, "Height", frameHeight) != ePvErrSuccess)
+    {
+        return false;
+    }
+
+    if (PvAttrUint32Set(Camera.Handle, "Width", frameWidth) != ePvErrSuccess)
+    {
+        return false;
+    }
+
+    PvAttrEnumGet(Camera.Handle, "PixelFormat", pixelFormat,256,NULL);
+    PvAttrUint32Get(Camera.Handle, "TotalBytesPerFrame", &frameSize);
+
+
+    if (strcmp(pixelFormat, "Mono8")==0)
+    {
+        grayframe = cvCreateImage(cvSize((int)frameWidth, (int)frameHeight), IPL_DEPTH_8U, 1);
+        grayframe->widthStep = (int)frameWidth;
+        frame = cvCreateImage(cvSize((int)frameWidth, (int)frameHeight), IPL_DEPTH_8U, 3);
+        frame->widthStep = (int)frameWidth*3;
+        Camera.Frame.ImageBufferSize = frameSize;
+        Camera.Frame.ImageBuffer = grayframe->imageData;
+    }
+    else if (strcmp(pixelFormat, "Mono16")==0)
+    {
+        grayframe = cvCreateImage(cvSize((int)frameWidth, (int)frameHeight), IPL_DEPTH_16U, 1);
+        grayframe->widthStep = (int)frameWidth;
+        frame = cvCreateImage(cvSize((int)frameWidth, (int)frameHeight), IPL_DEPTH_16U, 3);
+        frame->widthStep = (int)frameWidth*3;
+        Camera.Frame.ImageBufferSize = frameSize;
+        Camera.Frame.ImageBuffer = grayframe->imageData;
+    }
+    else if (strcmp(pixelFormat, "Bgr24")==0)
+    {
+        frame = cvCreateImage(cvSize((int)frameWidth, (int)frameHeight), IPL_DEPTH_8U, 3);
+        frame->widthStep = (int)frameWidth*3;
+        Camera.Frame.ImageBufferSize = frameSize;
+        Camera.Frame.ImageBuffer = frame->imageData;
+    }
+    else
+        return false;
+
+    return true;
+}

 CvCapture* cvCreateCameraCapture_PvAPI( int index )
 {
--- a/modules/highgui/src/cap_tyzx.cpp
+++ b/modules/highgui/src/cap_tyzx.cpp
@@ -1,230 +0,0 @@
-/*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 "precomp.hpp"
-#include <DeepSeaIF.h>
-
-#if _MSC_VER >= 1200
-    #pragma comment(lib,"DeepSeaIF.lib")
-#endif
-
-
-/****************** Capturing video from TYZX stereo camera  *******************/
-/** Initially developed by Roman Stanchak rstanchak@yahoo.com                  */
-
-class CvCaptureCAM_TYZX : public CvCapture
-{
-public:
-    CvCaptureCAM_TYZX() { index = -1; image = 0; }
-    virtual ~CvCaptureCAM_TYZX() { close(); }
-
-    virtual bool open( int _index );
-    virtual void close();
-    bool isOpened() { return index >= 0; }
-
-    virtual double getProperty(int);
-    virtual bool setProperty(int, double) { return false; }
-    virtual bool grabFrame();
-    virtual IplImage* retrieveFrame(int);
-    virtual int getCaptureDomain() { return CV_CAP_TYZX; } // Return the type of the capture object: CV_CAP_VFW, etc...
-
-protected:
-    virtual bool allocateImage();
-
-    int index;
-    IplImage* image;
-}
-CvCaptureCAM_TYZX;
-
-DeepSeaIF * g_tyzx_camera   = 0;
-int         g_tyzx_refcount = 0;
-
-bool CvCaptureCAM_TYZX::open( int _index )
-{
-    close();
-
-    if(!g_tyzx_camera){
-        g_tyzx_camera = new DeepSeaIF;
-        if(!g_tyzx_camera) return false;
-
-        if(!g_tyzx_camera->initializeSettings(NULL)){
-            delete g_tyzx_camera;
-            return false;
-        }
-
-        // set initial sensor mode
-        // TODO is g_tyzx_camera redundant?
-        g_tyzx_camera->setSensorMode(g_tyzx_camera->getSensorMode());
-
-        // mm's
-        g_tyzx_camera->setZUnits((int) 1000);
-
-        g_tyzx_camera->enableLeftColor(true);
-        g_tyzx_camera->setColorMode(DeepSeaIF::BGRcolor);
-        g_tyzx_camera->setDoIntensityCrop(true);
-        g_tyzx_camera->enable8bitImages(true);
-        if(!g_tyzx_camera->startCapture()){
-            return false;
-        }
-        g_tyzx_refcount++;
-    }
-    index = _index;
-    return true;
-}
-
-void CvCaptureCAM_TYZX::close()
-{
-    if( isOpened() )
-    {
-        cvReleaseImage( &image );
-        g_tyzx_refcount--;
-        if(g_tyzx_refcount==0){
-            delete g_tyzx_camera;
-        }
-    }
-}
-
-bool CvCaptureCAM_TYZX::grabFrame()
-{
-    return isOpened() && g_tyzx_camera && g_tyzx_camera->grab();
-}
-
-bool CvCaptureCAM_TYZX::allocateImage()
-{
-    int depth, nch;
-    CvSize size;
-
-    // assume we want to resize
-    cvReleaseImage(&image);
-
-    // figure out size depending on index provided
-    switch(index){
-        case CV_TYZX_RIGHT:
-            size = cvSize(g_tyzx_camera->intensityWidth(), g_tyzx_camera->intensityHeight());
-            depth = 8;
-            nch = 1;
-            break;
-        case CV_TYZX_Z:
-            size = cvSize(g_tyzx_camera->zWidth(), g_tyzx_camera->zHeight());
-            depth = IPL_DEPTH_16S;
-            nch = 1;
-            break;
-        case CV_TYZX_LEFT:
-        default:
-            size = cvSize(g_tyzx_camera->intensityWidth(), g_tyzx_camera->intensityHeight());
-            depth = 8;
-            nch = 1;
-            break;
-    }
-    image = cvCreateImage(size, depth, nch);
-    return image != 0;
-}
-
-/// Copy 'grabbed' image into capture buffer and return it.
-IplImage * CvCaptureCAM_TYZX::retrieveFrame(int)
-{
-    if(!isOpened() || !g_tyzx_camera) return 0;
-
-    if(!image && !alocateImage())
-        return 0;
-
-    // copy camera image into buffer.
-    // tempting to reference TYZX memory directly to avoid copying.
-    switch (index)
-    {
-        case CV_TYZX_RIGHT:
-            memcpy(image->imageData, g_tyzx_camera->getRImage(), image->imageSize);
-            break;
-        case CV_TYZX_Z:
-            memcpy(image->imageData, g_tyzx_camera->getZImage(), image->imageSize);
-            break;
-        case CV_TYZX_LEFT:
-        default:
-            memcpy(image->imageData, g_tyzx_camera->getLImage(), image->imageSize);
-            break;
-    }
-
-    return image;
-}
-
-double CvCaptureCAM_TYZX::getProperty(int property_id)
-{
-    CvSize size;
-    switch(capture->index)
-    {
-        case CV_TYZX_LEFT:
-            size = cvSize(g_tyzx_camera->intensityWidth(), g_tyzx_camera->intensityHeight());
-            break;
-        case CV_TYZX_RIGHT:
-            size = cvSize(g_tyzx_camera->intensityWidth(), g_tyzx_camera->intensityHeight());
-            break;
-        case CV_TYZX_Z:
-            size = cvSize(g_tyzx_camera->zWidth(), g_tyzx_camera->zHeight());
-            break;
-        default:
-            size = cvSize(0,0);
-    }
-
-    switch( property_id )
-    {
-        case CV_CAP_PROP_FRAME_WIDTH:
-            return size.width;
-        case CV_CAP_PROP_FRAME_HEIGHT:
-            return size.height;
-    }
-
-    return 0;
-}
-
-bool CvCaptureCAM_TYZX::setProperty( int, double )
-{
-    return false;
-}
-
-CvCapture * cvCreateCameraCapture_TYZX (int index)
-{
-    CvCaptureCAM_TYZX * capture = new CvCaptureCAM_TYZX;
-    if( capture->open(index) )
-        return capture;
-
-    delete capture;
-    return 0;
-}
--- a/modules/highgui/src/grfmt_imageio.cpp
+++ b/modules/highgui/src/grfmt_imageio.cpp
@@ -1,396 +0,0 @@
-/*
- *  grfmt_imageio.cpp
- *
- *
- *  Created by Morgan Conbere on 5/17/07.
- *
- */
-
-#include "precomp.hpp"
-
-#ifdef HAVE_IMAGEIO
-
-#include "grfmt_imageio.hpp"
-
-namespace cv
-{
-
-/////////////////////// ImageIODecoder ///////////////////
-
-ImageIODecoder::ImageIODecoder()
-{
-    imageRef = NULL;
-}
-
-ImageIODecoder::~ImageIODecoder()
-{
-    close();
-}
-
-
-void  ImageIODecoder::close()
-{
-    CGImageRelease( imageRef );
-    imageRef = NULL;
-}
-
-
-size_t ImageIODecoder::signatureLength() const
-{
-    return 12;
-}
-
-bool ImageIODecoder::checkSignature( const string& signature ) const
-{
-    // TODO: implement real signature check
-    return true;
-}
-
-ImageDecoder ImageIODecoder::newDecoder() const
-{
-    return new ImageIODecoder;
-}
-
-bool ImageIODecoder::readHeader()
-{
-    CFURLRef         imageURLRef;
-    CGImageSourceRef sourceRef;
-    // diciu, if ReadHeader is called twice in a row make sure to release the previously allocated imageRef
-    if (imageRef != NULL)
-        CGImageRelease(imageRef);
-    imageRef = NULL;
-
-    imageURLRef = CFURLCreateFromFileSystemRepresentation( NULL,
-        (const UInt8*)m_filename.c_str(), m_filename.size(), false );
-
-    sourceRef = CGImageSourceCreateWithURL( imageURLRef, NULL );
-    CFRelease( imageURLRef );
-    if ( !sourceRef )
-        return false;
-
-    imageRef = CGImageSourceCreateImageAtIndex( sourceRef, 0, NULL );
-    CFRelease( sourceRef );
-    if( !imageRef )
-        return false;
-
-    m_width = CGImageGetWidth( imageRef );
-    m_height = CGImageGetHeight( imageRef );
-
-    CGColorSpaceRef colorSpace = CGImageGetColorSpace( imageRef );
-    if( !colorSpace )
-        return false;
-
-    m_type = CGColorSpaceGetNumberOfComponents( colorSpace ) > 1 ? CV_8UC3 : CV_8UC1;
-
-    return true;
-}
-
-
-bool  ImageIODecoder::readData( Mat& img )
-{
-    uchar* data = img.data;
-    int step = img.step;
-    bool color = img.channels() > 1;
-    int bpp; // Bytes per pixel
-    int bit_depth = 8;
-
-    // Get Height, Width, and color information
-    if( !readHeader() )
-        return false;
-
-    CGContextRef     context = NULL; // The bitmap context
-    CGColorSpaceRef  colorSpace = NULL;
-    uchar*           bitmap = NULL;
-    CGImageAlphaInfo alphaInfo;
-
-    // CoreGraphics will take care of converting to grayscale and back as long as the
-    // appropriate colorspace is set
-    if( color == CV_LOAD_IMAGE_GRAYSCALE )
-    {
-        colorSpace = CGColorSpaceCreateDeviceGray();
-        bpp = 1;
-        alphaInfo = kCGImageAlphaNone;
-    }
-    else if( color == CV_LOAD_IMAGE_COLOR )
-    {
-#if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
-        colorSpace = CGColorSpaceCreateDeviceRGB();
-#else
-        colorSpace = CGColorSpaceCreateWithName( kCGColorSpaceGenericRGBLinear );
-#endif
-        bpp = 4; /* CG only has 8 and 32 bit color spaces, so we waste a byte */
-        alphaInfo = kCGImageAlphaNoneSkipLast;
-    }
-    if( !colorSpace )
-        return false;
-
-    bitmap = (uchar*)malloc( bpp * m_height * m_width );
-    if( !bitmap )
-    {
-        CGColorSpaceRelease( colorSpace );
-        return false;
-    }
-
-    context = CGBitmapContextCreate( (void *)bitmap,
-                                     m_width,        /* width */
-                                     m_height,       /* height */
-                                     bit_depth,    /* bit depth */
-                                     bpp * m_width,  /* bytes per row */
-                                     colorSpace,     /* color space */
-                                     alphaInfo);
-
-    CGColorSpaceRelease( colorSpace );
-    if( !context )
-    {
-        free( bitmap );
-        return false;
-    }
-
-    // Copy the image data into the bitmap region
-    CGRect rect = {{0,0},{m_width,m_height}};
-    CGContextDrawImage( context, rect, imageRef );
-
-    uchar* bitdata = (uchar*)CGBitmapContextGetData( context );
-    if( !bitdata )
-    {
-        free( bitmap);
-        CGContextRelease( context );
-        return false;
-    }
-
-    // Move the bitmap (in RGB) into data (in BGR)
-    int bitmapIndex = 0;
-
-    if( color == CV_LOAD_IMAGE_COLOR )
-    {
-        uchar * base = data;
-
-        for (int y = 0; y < m_height; y++)
-        {
-            uchar * line = base + y * step;
-
-            for (int x = 0; x < m_width; x++)
-            {
-                // Blue channel
-                line[0] = bitdata[bitmapIndex + 2];
-                // Green channel
-                line[1] = bitdata[bitmapIndex + 1];
-                // Red channel
-                line[2] = bitdata[bitmapIndex + 0];
-
-                line        += 3;
-                bitmapIndex += bpp;
-            }
-        }
-    }
-    else if( color == CV_LOAD_IMAGE_GRAYSCALE )
-    {
-        for (int y = 0; y < m_height; y++)
-            memcpy (data + y * step, bitmap + y * m_width, m_width);
-    }
-
-    free( bitmap );
-    CGContextRelease( context );
-    return true;
-}
-
-
-/////////////////////// ImageIOEncoder ///////////////////
-
-ImageIOEncoder::ImageIOEncoder()
-{
-    m_description = "Apple ImageIO (*.bmp;*.dib;*.exr;*.jpeg;*.jpg;*.jpe;*.jp2;*.pdf;*.png;*.tiff;*.tif)";
-}
-
-
-ImageIOEncoder::~ImageIOEncoder()
-{
-}
-
-
-ImageEncoder ImageIOEncoder::newEncoder() const
-{
-    return new ImageIOEncoder;
-}
-
-static
-CFStringRef  FilenameToUTI( const char* filename )
-{
-    const char* ext = filename;
-    char* ext_buf;
-    int i;
-    CFStringRef imageUTI = NULL;
-
-    for(;;)
-    {
-        const char* temp = strchr( ext + 1, '.' );
-        if( !temp ) break;
-        ext = temp;
-    }
-
-    if(!ext)
-        return NULL;
-
-    ext_buf = (char*)malloc(strlen(ext)+1);
-    for(i = 0; ext[i] != '\0'; i++)
-        ext_buf[i] = (char)tolower(ext[i]);
-    ext_buf[i] = '\0';
-    ext = ext_buf;
-
-    if( !strcmp(ext, ".bmp") || !strcmp(ext, ".dib") )
-        imageUTI = CFSTR( "com.microsoft.bmp" );
-    else if( !strcmp(ext, ".exr") )
-        imageUTI = CFSTR( "com.ilm.openexr-image" );
-    else if( !strcmp(ext, ".jpeg") || !strcmp(ext, ".jpg") || !strcmp(ext, ".jpe") )
-        imageUTI = CFSTR( "public.jpeg" );
-    else if( !strcmp(ext, ".jp2") )
-        imageUTI = CFSTR( "public.jpeg-2000" );
-    else if( !strcmp(ext, ".pdf") )
-        imageUTI = CFSTR( "com.adobe.pdf" );
-    else if( !strcmp(ext, ".png") )
-        imageUTI = CFSTR( "public.png" );
-    else if( !strcmp(ext, ".tiff") || !strcmp(ext, ".tif") )
-        imageUTI = CFSTR( "public.tiff" );
-
-    free(ext_buf);
-
-    return imageUTI;
-}
-
-
-bool  ImageIOEncoder::write( const Mat& img, const vector<int>& params )
-{
-    int width = img.cols, height = img.rows;
-    int _channels = img.channels();
-    const uchar* data = img.data;
-    int step = img.step;
-
-    // Determine the appropriate UTI based on the filename extension
-    CFStringRef imageUTI = FilenameToUTI( m_filename.c_str() );
-
-    // Determine the Bytes Per Pixel
-    int bpp = (_channels == 1) ? 1 : 4;
-
-    // Write the data into a bitmap context
-    CGContextRef context;
-    CGColorSpaceRef colorSpace;
-    uchar* bitmapData = NULL;
-
-    if( bpp == 1 ) {
-#if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
-        colorSpace = CGColorSpaceCreateDeviceGray();
-#else
-        colorSpace = CGColorSpaceCreateWithName( kCGColorSpaceGenericGray );
-#endif
-    }
-    else if( bpp == 4 ) {
-#if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
-        colorSpace = CGColorSpaceCreateDeviceRGB();
-#else
-        colorSpace = CGColorSpaceCreateWithName( kCGColorSpaceGenericRGBLinear );
-#endif
-    }
-    if( !colorSpace )
-        return false;
-
-    bitmapData = (uchar*)malloc( bpp * height * width );
-    if( !bitmapData )
-    {
-        CGColorSpaceRelease( colorSpace );
-        return false;
-    }
-
-    context = CGBitmapContextCreate( bitmapData,
-                                     width,
-                                     height,
-                                     8,
-                                     bpp * width,
-                                     colorSpace,
-                                     (bpp == 1) ? kCGImageAlphaNone :
-                                     kCGImageAlphaNoneSkipLast );
-    CGColorSpaceRelease( colorSpace );
-    if( !context )
-    {
-        free( bitmapData );
-        return false;
-    }
-
-    // Copy pixel information from data into bitmapData
-    if (bpp == 4)
-    {
-        int           bitmapIndex = 0;
-        const uchar * base        = data;
-
-        for (int y = 0; y < height; y++)
-        {
-            const uchar * line = base + y * step;
-
-            for (int x = 0; x < width; x++)
-            {
-                // Blue channel
-                bitmapData[bitmapIndex + 2] = line[0];
-                // Green channel
-                bitmapData[bitmapIndex + 1] = line[1];
-                // Red channel
-                bitmapData[bitmapIndex + 0] = line[2];
-
-                line        += 3;
-                bitmapIndex += bpp;
-            }
-        }
-    }
-    else if (bpp == 1)
-    {
-        for (int y = 0; y < height; y++)
-            memcpy (bitmapData + y * width, data + y * step, width);
-    }
-
-    // Turn the bitmap context into an imageRef
-    CGImageRef imageRef = CGBitmapContextCreateImage( context );
-    CGContextRelease( context );
-    if( !imageRef )
-    {
-        free( bitmapData );
-        return false;
-    }
-
-    // Write the imageRef to a file based on the UTI
-    CFURLRef imageURLRef = CFURLCreateFromFileSystemRepresentation( NULL,
-        (const UInt8*)m_filename.c_str(), m_filename.size(), false );
-    if( !imageURLRef )
-    {
-        CGImageRelease( imageRef );
-        free( bitmapData );
-        return false;
-    }
-
-    CGImageDestinationRef destRef = CGImageDestinationCreateWithURL( imageURLRef,
-                                                                     imageUTI,
-                                                                     1,
-                                                                     NULL);
-    CFRelease( imageURLRef );
-    if( !destRef )
-    {
-        CGImageRelease( imageRef );
-        free( bitmapData );
-        fprintf(stderr, "!destRef\n");
-        return false;
-    }
-
-    CGImageDestinationAddImage(destRef, imageRef, NULL);
-    if( !CGImageDestinationFinalize(destRef) )
-    {
-        fprintf(stderr, "Finalize failed\n");
-        return false;
-    }
-
-    CFRelease( destRef );
-    CGImageRelease( imageRef );
-    free( bitmapData );
-
-    return true;
-}
-
-}
-
-#endif /* HAVE_IMAGEIO */
--- a/modules/highgui/src/grfmt_imageio.hpp
+++ b/modules/highgui/src/grfmt_imageio.hpp
@@ -1,67 +0,0 @@
-/*
- *  grfmt_imageio.h
- *
- *
- *  Created by Morgan Conbere on 5/17/07.
- *
- */
-
-#ifndef _GRFMT_IMAGEIO_H_
-#define _GRFMT_IMAGEIO_H_
-
-#ifdef HAVE_IMAGEIO
-
-#include "grfmt_base.hpp"
-#include <TargetConditionals.h>
-
-#if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
-
-#include <MobileCoreServices/MobileCoreServices.h>
-#include <ImageIO/ImageIO.h>
-
-#else
-
-#include <ApplicationServices/ApplicationServices.h>
-
-#endif
-
-namespace cv
-{
-
-class ImageIODecoder : public BaseImageDecoder
-{
-public:
-
-    ImageIODecoder();
-    ~ImageIODecoder();
-
-    bool  readData( Mat& img );
-    bool  readHeader();
-    void  close();
-
-    size_t signatureLength() const;
-    bool checkSignature( const string& signature ) const;
-
-    ImageDecoder newDecoder() const;
-
-protected:
-
-    CGImageRef imageRef;
-};
-
-class ImageIOEncoder : public BaseImageEncoder
-{
-public:
-    ImageIOEncoder();
-    ~ImageIOEncoder();
-
-    bool  write( const Mat& img, const vector<int>& params );
-
-    ImageEncoder newEncoder() const;
-};
-
-}
-
-#endif/*HAVE_IMAGEIO*/
-
-#endif/*_GRFMT_IMAGEIO_H_*/
--- a/modules/highgui/src/grfmt_jpeg.cpp
+++ b/modules/highgui/src/grfmt_jpeg.cpp
@@ -229,12 +229,16 @@ bool  JpegDecoder::readHeader()
            if( m_f )
                jpeg_stdio_src( &state->cinfo, m_f );
        }
-        jpeg_read_header( &state->cinfo, TRUE );

-        m_width = state->cinfo.image_width;
-        m_height = state->cinfo.image_height;
-        m_type = state->cinfo.num_components > 1 ? CV_8UC3 : CV_8UC1;
-        result = true;
+        if (state->cinfo.src != 0)
+        {
+            jpeg_read_header( &state->cinfo, TRUE );
+
+            m_width = state->cinfo.image_width;
+            m_height = state->cinfo.image_height;
+            m_type = state->cinfo.num_components > 1 ? CV_8UC3 : CV_8UC1;
+            result = true;
+        }
    }

    if( !result )
--- a/modules/highgui/src/grfmts.hpp
+++ b/modules/highgui/src/grfmts.hpp
@@ -43,7 +43,6 @@
 #define _GRFMTS_H_

 #include "grfmt_base.hpp"
-#include "grfmt_imageio.hpp"
 #include "grfmt_bmp.hpp"
 #include "grfmt_sunras.hpp"
 #include "grfmt_jpeg.hpp"
--- a/modules/highgui/src/loadsave.cpp
+++ b/modules/highgui/src/loadsave.cpp
@@ -84,12 +84,6 @@ struct ImageCodecInitializer
        decoders.push_back( new ExrDecoder );
        encoders.push_back( new ExrEncoder );
    #endif
-    // because it is a generic image I/O API, supporting many formats,
-    // it should be last in the list.
-    #ifdef HAVE_IMAGEIO
-        decoders.push_back( new ImageIODecoder );
-        encoders.push_back( new ImageIOEncoder );
-    #endif
    }

    vector<ImageDecoder> decoders;
--- a/modules/highgui/src/precomp.hpp
+++ b/modules/highgui/src/precomp.hpp
@@ -115,7 +115,6 @@ CvCapture * cvCreateCameraCapture_V4L( int index );
 CvCapture * cvCreateCameraCapture_DC1394( int index );
 CvCapture * cvCreateCameraCapture_DC1394_2( int index );
 CvCapture* cvCreateCameraCapture_MIL( int index );
-CvCapture* cvCreateCameraCapture_Giganetix( int index );
 CvCapture * cvCreateCameraCapture_CMU( int index );
 CV_IMPL CvCapture * cvCreateCameraCapture_TYZX( int index );
 CvCapture* cvCreateFileCapture_Win32( const char* filename );
--- a/modules/highgui/test/test_ffmpeg.cpp
+++ b/modules/highgui/test/test_ffmpeg.cpp
@@ -43,11 +43,12 @@
 #include "test_precomp.hpp"
 #include "opencv2/highgui/highgui.hpp"

+using namespace cv;
+
 #ifdef HAVE_FFMPEG

 #include "ffmpeg_codecs.hpp"

-using namespace cv;
 using namespace std;

 class CV_FFmpegWriteBigVideoTest : public cvtest::BaseTest
@@ -118,11 +119,11 @@ public:
            else
            {
                Mat img(frame_s, CV_8UC3, Scalar::all(0));
-                const int coeff = cvRound(cv::min(frame_s.width, frame_s.height)/(fps0 * time_sec));
+                const int coeff = cvRound(min(frame_s.width, frame_s.height)/(fps0 * time_sec));

                for (int i = 0 ; i < static_cast<int>(fps * time_sec); i++ )
                {
-                    //circle(img, Point2i(img_c / 2, img_r / 2), cv::min(img_r, img_c) / 2 * (i + 1), Scalar(255, 0, 0, 0), 2);
+                    //circle(img, Point2i(img_c / 2, img_r / 2), min(img_r, img_c) / 2 * (i + 1), Scalar(255, 0, 0, 0), 2);
                    rectangle(img, Point2i(coeff * i, coeff * i), Point2i(coeff * (i + 1), coeff * (i + 1)),
                              Scalar::all(255 * (1.0 - static_cast<double>(i) / (fps * time_sec * 2) )), -1);
                    writer << img;
@@ -174,3 +175,221 @@ public:
 TEST(Highgui_Video, ffmpeg_image) { CV_FFmpegReadImageTest test; test.safe_run(); }

 #endif
+
+#if defined(HAVE_FFMPEG) || defined(WIN32) || defined(_WIN32)
+
+//////////////////////////////// Parallel VideoWriters and VideoCaptures ////////////////////////////////////
+
+class CreateVideoWriterInvoker :
+    public ParallelLoopBody
+{
+public:
+    const static Size FrameSize;
+    static std::string TmpDirectory;
+    
+    CreateVideoWriterInvoker(std::vector<VideoWriter*>& _writers, std::vector<std::string>& _files) :
+        ParallelLoopBody(), writers(&_writers), files(&_files)
+    {
+    }
+
+    virtual void operator() (const Range& range) const
+    {
+        for (int i = range.start; i != range.end; ++i)
+        {
+            std::ostringstream stream;
+            stream << i << ".avi";
+            std::string fileName = tempfile(stream.str().c_str());
+
+            files->operator[](i) = fileName;
+            writers->operator[](i) = new VideoWriter(fileName, CV_FOURCC('X','V','I','D'), 25.0f, FrameSize);
+
+            CV_Assert(writers->operator[](i)->isOpened());
+        }
+    }
+
+
+private:
+    std::vector<VideoWriter*>* writers;
+    std::vector<std::string>* files;
+};
+
+std::string CreateVideoWriterInvoker::TmpDirectory;
+const Size CreateVideoWriterInvoker::FrameSize(1020, 900);
+
+class WriteVideo_Invoker :
+    public ParallelLoopBody
+{
+public:
+    enum { FrameCount = 300 };
+    
+    static const Scalar ObjectColor;
+    static const Point Center;
+
+    WriteVideo_Invoker(const std::vector<VideoWriter*>& _writers) :
+        ParallelLoopBody(), writers(&_writers)
+    {
+    }
+    
+    static void GenerateFrame(Mat& frame, unsigned int i)
+    {
+        frame = Scalar::all(i % 255);
+        
+        std::string text = to_string(i);
+        putText(frame, text, Point(50, Center.y), FONT_HERSHEY_SIMPLEX, 5.0, ObjectColor, 5, CV_AA);
+        circle(frame, Center, i + 2, ObjectColor, 2, CV_AA);
+    }
+
+    virtual void operator() (const Range& range) const
+    {
+        CV_Assert((range.start + 1) == range.end);
+        VideoWriter* writer = writers->operator[](range.start);
+        CV_Assert(writer != NULL);
+        CV_Assert(writer->isOpened());
+        
+        Mat frame(CreateVideoWriterInvoker::FrameSize, CV_8UC3);
+        for (unsigned int i = 0; i < FrameCount; ++i)
+        {
+            GenerateFrame(frame, i);
+            writer->operator<< (frame);
+        }
+    }
+    
+protected:
+    static std::string to_string(unsigned int i)
+    {
+        std::stringstream stream(std::ios::out);
+        stream << "frame #" << i;
+        return stream.str();
+    }
+
+private:
+    const std::vector<VideoWriter*>* writers;
+};
+
+const Scalar WriteVideo_Invoker::ObjectColor(Scalar::all(0));
+const Point WriteVideo_Invoker::Center(CreateVideoWriterInvoker::FrameSize.height / 2,
+    CreateVideoWriterInvoker::FrameSize.width / 2);
+
+class CreateVideoCaptureInvoker :
+    public ParallelLoopBody
+{
+public:
+    CreateVideoCaptureInvoker(std::vector<VideoCapture*>& _readers, const std::vector<std::string>& _files) :
+        ParallelLoopBody(), readers(&_readers), files(&_files)
+    {
+    }
+
+    virtual void operator() (const Range& range) const
+    {
+        for (int i = range.start; i != range.end; ++i)
+        {
+            readers->operator[](i) = new VideoCapture(files->operator[](i));
+            CV_Assert(readers->operator[](i)->isOpened());
+        }
+    }
+private:
+    std::vector<VideoCapture*>* readers;
+    const std::vector<std::string>* files;
+};
+
+class ReadImageAndTest :
+    public ParallelLoopBody
+{
+public:
+    ReadImageAndTest(const std::vector<VideoCapture*>& _readers, cvtest::TS* _ts) :
+        ParallelLoopBody(), readers(&_readers), ts(_ts)
+    {
+    }
+
+    virtual void operator() (const Range& range) const
+    {
+        CV_Assert(range.start + 1 == range.end);
+        VideoCapture* capture = readers->operator[](range.start);
+        CV_Assert(capture != NULL);
+        CV_Assert(capture->isOpened());
+
+        const static double eps = 23.0;
+        unsigned int frameCount = static_cast<unsigned int>(capture->get(CV_CAP_PROP_FRAME_COUNT));
+        CV_Assert(frameCount == WriteVideo_Invoker::FrameCount);
+        Mat reference(CreateVideoWriterInvoker::FrameSize, CV_8UC3);
+
+        for (unsigned int i = 0; i < frameCount && next; ++i)
+        {
+            Mat actual;
+            (*capture) >> actual;
+
+            WriteVideo_Invoker::GenerateFrame(reference, i);
+
+            EXPECT_EQ(reference.cols, actual.cols);
+            EXPECT_EQ(reference.rows, actual.rows);
+            EXPECT_EQ(reference.depth(), actual.depth());
+            EXPECT_EQ(reference.channels(), actual.channels());
+
+            double psnr = PSNR(actual, reference);
+            if (psnr < eps)
+            {
+#define SUM cvtest::TS::SUMMARY
+                ts->printf(SUM, "\nPSNR: %lf\n", psnr);
+                ts->printf(SUM, "Video #: %d\n", range.start);
+                ts->printf(SUM, "Frame #: %d\n", i);
+#undef SUM
+                ts->set_failed_test_info(cvtest::TS::FAIL_BAD_ACCURACY);
+                ts->set_gtest_status();
+
+                Mat diff;
+                absdiff(actual, reference, diff);
+
+                EXPECT_EQ(countNonZero(diff.reshape(1) > 1), 0);
+
+                next = false;
+            }
+        }
+    }
+
+    static bool next;
+
+private:
+    const std::vector<VideoCapture*>* readers;
+    cvtest::TS* ts;
+};
+
+bool ReadImageAndTest::next;
+
+TEST(Highgui_Video_parallel_writers_and_readers, accuracy)
+{
+    const unsigned int threadsCount = 4;
+    cvtest::TS* ts = cvtest::TS::ptr();
+
+    // creating VideoWriters
+    std::vector<VideoWriter*> writers(threadsCount);
+    Range range(0, threadsCount);
+    std::vector<std::string> files(threadsCount);
+    CreateVideoWriterInvoker invoker1(writers, files);
+    parallel_for_(range, invoker1);
+
+    // write a video
+    parallel_for_(range, WriteVideo_Invoker(writers));
+
+    // deleting the writers
+    for (std::vector<VideoWriter*>::iterator i = writers.begin(), end = writers.end(); i != end; ++i)
+        delete *i;
+    writers.clear();
+
+    std::vector<VideoCapture*> readers(threadsCount);
+    CreateVideoCaptureInvoker invoker2(readers, files);
+    parallel_for_(range, invoker2);
+
+    ReadImageAndTest::next = true;
+
+    parallel_for_(range, ReadImageAndTest(readers, ts));
+
+    // deleting tmp video files
+    for (std::vector<std::string>::const_iterator i = files.begin(), end = files.end(); i != end; ++i)
+    {
+        int code = remove(i->c_str());
+        if (code == 1)
+            std::cerr << "Couldn't delete " << *i << std::endl;
+    }
+}
+
+#endif
--- a/modules/highgui/test/test_precomp.hpp
+++ b/modules/highgui/test/test_precomp.hpp
@@ -34,7 +34,6 @@
    defined(HAVE_OPENNI)       || \
    defined(HAVE_XIMEA)        || \
    defined(HAVE_AVFOUNDATION) || \
-    defined(HAVE_GIGE_API) || \
    (0)
    //defined(HAVE_ANDROID_NATIVE_CAMERA) ||   - enable after #1193
 #  define BUILD_WITH_CAMERA_SUPPORT 1
--- a/modules/imgproc/perf/perf_blur.cpp
+++ b/modules/imgproc/perf/perf_blur.cpp
@@ -63,11 +63,7 @@ PERF_TEST_P(Size_MatType_BorderType3x3, gaussianBlur3x3,

    TEST_CYCLE() GaussianBlur(src, dst, Size(3,3), 0, 0, btype);

-#if CV_SSE2
    SANITY_CHECK(dst, 1);
-#else
-    SANITY_CHECK(dst);
-#endif
 }

 PERF_TEST_P(Size_MatType_BorderType3x3, blur3x3,
@@ -89,7 +85,7 @@ PERF_TEST_P(Size_MatType_BorderType3x3, blur3x3,

    TEST_CYCLE() blur(src, dst, Size(3,3), Point(-1,-1), btype);

-    SANITY_CHECK(dst, 1e-3);
+    SANITY_CHECK(dst, 1);
 }

 PERF_TEST_P(Size_MatType_BorderType, blur16x16,
@@ -183,7 +179,7 @@ PERF_TEST_P(Size_MatType_BorderType, gaussianBlur5x5,

    TEST_CYCLE() GaussianBlur(src, dst, Size(5,5), 0, 0, btype);

-    SANITY_CHECK(dst);
+    SANITY_CHECK(dst, 1e-3);
 }

 PERF_TEST_P(Size_MatType_BorderType, blur5x5,
@@ -205,5 +201,5 @@ PERF_TEST_P(Size_MatType_BorderType, blur5x5,

    TEST_CYCLE() blur(src, dst, Size(5,5), Point(-1,-1), btype);

-    SANITY_CHECK(dst, 1e-3);
+    SANITY_CHECK(dst, 1);
 }
--- a/modules/imgproc/perf/perf_cvt_color.cpp
+++ b/modules/imgproc/perf/perf_cvt_color.cpp
@@ -244,6 +244,7 @@ PERF_TEST_P(Size_CvtMode, cvtColor8u,
    Mat src(sz, CV_8UC(ch.scn));
    Mat dst(sz, CV_8UC(ch.dcn));

+    declare.time(100);
    declare.in(src, WARMUP_RNG).out(dst);

    TEST_CYCLE() cvtColor(src, dst, mode, ch.dcn);
@@ -268,6 +269,7 @@ PERF_TEST_P(Size_CvtMode2, cvtColorYUV420,
    Mat src(sz.height + sz.height / 2, sz.width, CV_8UC(ch.scn));
    Mat dst(sz, CV_8UC(ch.dcn));

+    declare.time(100);
    declare.in(src, WARMUP_RNG).out(dst);

    TEST_CYCLE() cvtColor(src, dst, mode, ch.dcn);
--- a/modules/imgproc/perf/perf_filter2d.cpp
+++ b/modules/imgproc/perf/perf_filter2d.cpp
@@ -39,7 +39,7 @@ PERF_TEST_P( TestFilter2d, Filter2d,

    TEST_CYCLE() filter2D(src, dst, CV_8UC4, kernel, Point(1, 1), 0., borderMode);

-    SANITY_CHECK(dst);
+    SANITY_CHECK(dst, 1);
 }

 PERF_TEST_P( Image_KernelSize, GaborFilter2d,
--- a/modules/imgproc/perf/perf_houghLines.cpp
+++ b/modules/imgproc/perf/perf_houghLines.cpp
@@ -18,7 +18,7 @@ PERF_TEST_P(Image_RhoStep_ThetaStep_Threshold, HoughLines,
                testing::Values( 0.01, 0.1 ),
                testing::Values( 300, 500 )
                )
-          )
+            )
 {
    String filename = getDataPath(get<0>(GetParam()));
    double rhoStep = get<1>(GetParam());
@@ -32,9 +32,22 @@ PERF_TEST_P(Image_RhoStep_ThetaStep_Threshold, HoughLines,
    Canny(image, image, 0, 0);

    Mat lines;
-    declare.time(7);
+    declare.time(40);

    TEST_CYCLE() HoughLines(image, lines, rhoStep, thetaStep, threshold);

+#ifdef WIN32
+    //FIXME: ugly fix to make sanity check pass on Win32, must be investigated, issue #2617
+    if (lines.cols == 2015)
+    {
+        lines = lines(Rect(0, 0, lines.cols - 1, lines.rows));
+        SANITY_CHECK(lines, 800.0);
+    }
+    else
+    {
+        SANITY_CHECK(lines);
+    }
+#else
    SANITY_CHECK(lines);
-}
+#endif
+}
--- a/modules/imgproc/perf/perf_integral.cpp
+++ b/modules/imgproc/perf/perf_integral.cpp
@@ -48,6 +48,7 @@ PERF_TEST_P(Size_MatType_OutMatDepth, integral_sqsum,
    Mat sqsum(sz, sdepth);

    declare.in(src, WARMUP_RNG).out(sum, sqsum);
+    declare.time(100);

    TEST_CYCLE() integral(src, sum, sqsum, sdepth);

@@ -73,6 +74,7 @@ PERF_TEST_P( Size_MatType_OutMatDepth, integral_sqsum_tilted,
    Mat tilted(sz, sdepth);

    declare.in(src, WARMUP_RNG).out(sum, sqsum, tilted);
+    declare.time(100);

    TEST_CYCLE() integral(src, sum, sqsum, tilted, sdepth);

--- a/modules/imgproc/perf/perf_resize.cpp
+++ b/modules/imgproc/perf/perf_resize.cpp
@@ -28,7 +28,12 @@ PERF_TEST_P(MatInfo_Size_Size, resizeUpLinear,

    TEST_CYCLE() resize(src, dst, to);

+    // Test case temporary disabled for Android Platform
+#ifdef ANDROID
+    SANITY_CHECK(dst, 255); // TODO: Reimplement check in future versions
+#else
    SANITY_CHECK(dst, 1 + 1e-6);
+#endif
 }

 PERF_TEST_P(MatInfo_Size_Size, resizeDownLinear,
@@ -52,7 +57,12 @@ PERF_TEST_P(MatInfo_Size_Size, resizeDownLinear,

    TEST_CYCLE() resize(src, dst, to);

+    // Test case temporary disabled for Android Platform
+#ifdef ANDROID
+    SANITY_CHECK(dst, 255); // TODO: Reimplement check in future versions
+#else
    SANITY_CHECK(dst, 1 + 1e-6);
+#endif
 }


@@ -106,6 +116,7 @@ PERF_TEST_P(MatInfo_Size_Scale_Area, ResizeArea,
    cv::Mat dst(to, matType);

    declare.in(src, WARMUP_RNG).out(dst);
+    declare.time(100);

    TEST_CYCLE() resize(src, dst, dst.size(), 0, 0, INTER_AREA);

--- a/modules/imgproc/perf/perf_threshold.cpp
+++ b/modules/imgproc/perf/perf_threshold.cpp
@@ -31,6 +31,7 @@ PERF_TEST_P(Size_MatType_ThreshType, threshold,
    double maxval = theRNG().uniform(1, 254);

    declare.in(src, WARMUP_RNG).out(dst);
+    declare.time(100);

    TEST_CYCLE() threshold(src, dst, thresh, maxval, threshType);

--- a/modules/imgproc/perf/perf_warp.cpp
+++ b/modules/imgproc/perf/perf_warp.cpp
@@ -43,8 +43,12 @@ PERF_TEST_P( TestWarpAffine, WarpAffine,

    TEST_CYCLE() warpAffine( src, dst, warpMat, sz, interType, borderMode, Scalar::all(150) );

+    // Test case temporary disabled for Android Platform
+#ifdef ANDROID
+    SANITY_CHECK(dst, 255); // TODO: Reimplement check in future versions
+#else
    SANITY_CHECK(dst, 1);
-
+#endif
 }

 PERF_TEST_P( TestWarpPerspective, WarpPerspective,
@@ -133,13 +137,19 @@ PERF_TEST_P( TestWarpPerspectiveNear_t, WarpPerspectiveNear,
    Mat dst(size, type);

    declare.in(src).out(dst);
+    declare.time(100);

    TEST_CYCLE()
    {
        warpPerspective( src, dst, warpMat, size, interType, borderMode, Scalar::all(150) );
    }

+    // Test case temporary disabled for Android Platform
+#ifdef ANDROID
+    SANITY_CHECK(dst, 255); // TODO: Reimplement check in future versions
+#else
    SANITY_CHECK(dst, 1);
+#endif
 }

 PERF_TEST_P( TestRemap, remap,
--- a/modules/java/android_lib/res/values/attrs.xml
+++ b/modules/java/android_lib/res/values/attrs.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <declare-styleable name = "CameraBridgeViewBase" >
+       <attr name="show_fps" format="boolean"/>
+       <attr name="camera_id" format="integer" >
+          <enum name="any" value="-1" />
+          <enum name="back" value="0" />
+          <enum name="front" value="1" />
+       </attr>
+    </declare-styleable>
+</resources>
--- a/Show More
+++ b/Show More