temporary disable performance test for alphaComp function(cherry picked from commit 1ce5165cb7)

Dead code removed as this cannot be null in Java.
(cherry picked from commit dbe7634286)
2026-07-24 04:43:04 +04:00 · 2014-02-14 17:12:31 +04:00 · 2014-02-13 20:13:47 +04:00 · 2014-02-13 20:13:38 +04:00 · 2014-02-13 20:13:27 +04:00 · 2014-02-13 17:59:23 +04:00
543 changed files with 5319 additions and 45224 deletions
@@ -1,7 +1,6 @@
 *.autosave
 *.pyc
 *.user
-*~
 .*.swp
 .DS_Store
 .sw[a-z]
@@ -1,2 +0,0 @@
-[tgit]
-    icon = doc/opencv.ico
@@ -210,7 +210,7 @@
 #include <string>
 #endif 

-#if defined(__linux__) || defined(__APPLE__) || defined(__MACOSX)
+#if defined(linux) || defined(__APPLE__) || defined(__MACOSX)
 #include <alloca.h>

 #include <emmintrin.h>
@@ -54,7 +54,7 @@

 /* Native cpu byte order: 1 if big-endian (Motorola) or 0 if little-endian
   (Intel) */
-#define HOST_BIGENDIAN @WORDS_BIGENDIAN@
+#define HOST_BIGENDIAN 0

 /* Set the native cpu bit order (FILLORDER_LSB2MSB or FILLORDER_MSB2LSB) */
 #define HOST_FILLORDER FILLORDER_LSB2MSB
@@ -156,7 +156,15 @@

 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
   significant byte first (like Motorola and SPARC, unlike Intel). */
-#cmakedefine WORDS_BIGENDIAN 1
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+/* #  undef WORDS_BIGENDIAN */
+# endif
+#endif

 /* Support Deflate compression */
 #define ZIP_SUPPORT 1
@@ -128,7 +128,6 @@ OCV_OPTION(WITH_1394           "Include IEEE1394 support"                    ON
 OCV_OPTION(WITH_AVFOUNDATION   "Use AVFoundation for Video I/O"              ON   IF IOS)
 OCV_OPTION(WITH_CARBON         "Use Carbon for UI instead of Cocoa"          OFF  IF APPLE )
 OCV_OPTION(WITH_CUDA           "Include NVidia Cuda Runtime support"         ON   IF (CMAKE_VERSION VERSION_GREATER "2.8" AND NOT IOS) )
-OCV_OPTION(WITH_VTK            "Include VTK library support (and build opencv_viz module eiher)"             OFF IF (NOT ANDROID AND NOT IOS) )
 OCV_OPTION(WITH_CUFFT          "Include NVidia Cuda Fast Fourier Transform (FFT) library support"            ON  IF (CMAKE_VERSION VERSION_GREATER "2.8" AND NOT IOS) )
 OCV_OPTION(WITH_CUBLAS         "Include NVidia Cuda Basic Linear Algebra Subprograms (BLAS) library support" OFF IF (CMAKE_VERSION VERSION_GREATER "2.8" AND NOT IOS) )
 OCV_OPTION(WITH_NVCUVID        "Include NVidia Video Decoding library support"                               OFF IF (CMAKE_VERSION VERSION_GREATER "2.8" AND NOT ANDROID AND NOT IOS AND NOT APPLE) )
@@ -136,14 +135,13 @@ OCV_OPTION(WITH_EIGEN          "Include Eigen2/Eigen3 support"               ON)
 OCV_OPTION(WITH_VFW            "Include Video for Windows support"           ON   IF WIN32 )
 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_GSTREAMER_0_10 "Enable Gstreamer 0.10 support (instead of 1.x)"   OFF )
 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)
 OCV_OPTION(WITH_OPENEXR        "Include ILM support via OpenEXR"             ON   IF (NOT IOS) )
-OCV_OPTION(WITH_OPENGL         "Include OpenGL support"                      OFF  IF (NOT ANDROID) )
+OCV_OPTION(WITH_OPENGL         "Include OpenGL support"                      OFF  IF (NOT ANDROID AND NOT APPLE) )
 OCV_OPTION(WITH_OPENNI         "Include OpenNI support"                      OFF  IF (NOT ANDROID AND NOT IOS) )
 OCV_OPTION(WITH_PNG            "Include PNG support"                         ON)
 OCV_OPTION(WITH_PVAPI          "Include Prosilica GigE support"              ON   IF (NOT ANDROID AND NOT IOS) )
@@ -160,7 +158,7 @@ OCV_OPTION(WITH_V4L            "Include Video 4 Linux support"               ON
 OCV_OPTION(WITH_LIBV4L         "Use libv4l for Video 4 Linux support"        ON   IF (UNIX AND NOT ANDROID) )
 OCV_OPTION(WITH_DSHOW          "Build HighGUI with DirectShow support"       ON   IF (WIN32 AND NOT ARM) )
 OCV_OPTION(WITH_MSMF           "Build HighGUI with Media Foundation support" OFF  IF WIN32 )
-OCV_OPTION(WITH_XIMEA          "Include XIMEA cameras support"               OFF  IF (NOT ANDROID) )
+OCV_OPTION(WITH_XIMEA          "Include XIMEA cameras support"               OFF  IF (NOT ANDROID AND NOT APPLE) )
 OCV_OPTION(WITH_XINE           "Include Xine support (GPL)"                  OFF  IF (UNIX AND NOT APPLE AND NOT ANDROID) )
 OCV_OPTION(WITH_OPENCL         "Include OpenCL Runtime support"              ON   IF (NOT IOS) )
 OCV_OPTION(WITH_OPENCLAMDFFT   "Include AMD OpenCL FFT library support"      ON   IF (NOT ANDROID AND NOT IOS) )
@@ -207,7 +205,6 @@ OCV_OPTION(ENABLE_DYNAMIC_CUDA        "Enabled dynamic CUDA linkage"
 OCV_OPTION(ENABLE_PRECOMPILED_HEADERS "Use precompiled headers"                                  ON   IF (NOT IOS) )
 OCV_OPTION(ENABLE_SOLUTION_FOLDERS    "Solution folder in Visual Studio or in other IDEs"        (MSVC_IDE OR CMAKE_GENERATOR MATCHES Xcode) IF (CMAKE_VERSION VERSION_GREATER "2.8.0") )
 OCV_OPTION(ENABLE_PROFILING           "Enable profiling in the GCC compiler (Add flags: -g -pg)" OFF  IF CMAKE_COMPILER_IS_GNUCXX )
-OCV_OPTION(ENABLE_COVERAGE            "Enable coverage collection with  GCov"                    OFF  IF CMAKE_COMPILER_IS_GNUCXX )
 OCV_OPTION(ENABLE_OMIT_FRAME_POINTER  "Enable -fomit-frame-pointer for GCC"                      ON   IF CMAKE_COMPILER_IS_GNUCXX AND NOT (APPLE AND CMAKE_COMPILER_IS_CLANGCXX) )
 OCV_OPTION(ENABLE_POWERPC             "Enable PowerPC for GCC"                                   ON   IF (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_SYSTEM_PROCESSOR MATCHES powerpc.*) )
 OCV_OPTION(ENABLE_FAST_MATH           "Enable -ffast-math (not recommended for GCC 4.6.x)"       OFF  IF (CMAKE_COMPILER_IS_GNUCXX AND (X86 OR X86_64)) )
@@ -218,17 +215,12 @@ OCV_OPTION(ENABLE_SSSE3               "Enable SSSE3 instructions"
 OCV_OPTION(ENABLE_SSE41               "Enable SSE4.1 instructions"                               OFF  IF ((CV_ICC OR CMAKE_COMPILER_IS_GNUCXX) AND (X86 OR X86_64)) )
 OCV_OPTION(ENABLE_SSE42               "Enable SSE4.2 instructions"                               OFF  IF (CMAKE_COMPILER_IS_GNUCXX AND (X86 OR X86_64)) )
 OCV_OPTION(ENABLE_AVX                 "Enable AVX instructions"                                  OFF  IF ((MSVC OR CMAKE_COMPILER_IS_GNUCXX) AND (X86 OR X86_64)) )
-OCV_OPTION(ENABLE_AVX2                "Enable AVX2 instructions"                                 OFF  IF ((MSVC OR CMAKE_COMPILER_IS_GNUCXX) AND (X86 OR X86_64)) )
 OCV_OPTION(ENABLE_NEON                "Enable NEON instructions"                                 OFF  IF CMAKE_COMPILER_IS_GNUCXX AND ARM )
 OCV_OPTION(ENABLE_VFPV3               "Enable VFPv3-D32 instructions"                            OFF  IF CMAKE_COMPILER_IS_GNUCXX AND ARM )
 OCV_OPTION(ENABLE_NOISY_WARNINGS      "Show all warnings even if they are too noisy"             OFF )
 OCV_OPTION(OPENCV_WARNINGS_ARE_ERRORS "Treat warnings as errors"                                 OFF )
 OCV_OPTION(ENABLE_WINRT_MODE          "Build with Windows Runtime support"                       OFF  IF WIN32 )
 OCV_OPTION(ENABLE_WINRT_MODE_NATIVE   "Build with Windows Runtime native C++ support"            OFF  IF WIN32 )
-OCV_OPTION(ENABLE_LIBVS2013           "Build VS2013 with Visual Studio 2013 libraries"           OFF  IF WIN32 AND (MSVC_VERSION EQUAL 1800) )
-OCV_OPTION(ENABLE_WINSDK81            "Build VS2013 with Windows 8.1 SDK"                        OFF  IF WIN32 AND (MSVC_VERSION EQUAL 1800) )
-OCV_OPTION(ENABLE_WINPHONESDK80       "Build with Windows Phone 8.0 SDK"                         OFF  IF WIN32 AND (MSVC_VERSION EQUAL 1700) )
-OCV_OPTION(ENABLE_WINPHONESDK81       "Build VS2013 with Windows Phone 8.1 SDK"                  OFF  IF WIN32 AND (MSVC_VERSION EQUAL 1800) )

 # uncategorized options
 # ===================================================
@@ -451,19 +443,6 @@ endif()
 include(cmake/OpenCVPCHSupport.cmake)
 include(cmake/OpenCVModule.cmake)

-# ----------------------------------------------------------------------------
-#  Detect endianness of build platform
-# ----------------------------------------------------------------------------
-
-if(CMAKE_SYSTEM_NAME STREQUAL iOS)
-  # test_big_endian needs try_compile, which doesn't work for iOS
-  # http://public.kitware.com/Bug/view.php?id=12288
-  set(WORDS_BIGENDIAN 0)
-else()
-  include(TestBigEndian)
-  test_big_endian(WORDS_BIGENDIAN)
-endif()
-
 # ----------------------------------------------------------------------------
 #  Detect 3rd-party libraries
 # ----------------------------------------------------------------------------
@@ -473,6 +452,7 @@ include(cmake/OpenCVFindLibsGUI.cmake)
 include(cmake/OpenCVFindLibsVideo.cmake)
 include(cmake/OpenCVFindLibsPerf.cmake)

+
 # ----------------------------------------------------------------------------
 #  Detect other 3rd-party libraries/tools
 # ----------------------------------------------------------------------------
@@ -508,9 +488,6 @@ if(WITH_OPENCL)
  include(cmake/OpenCVDetectOpenCL.cmake)
 endif()

-# --- VTK support ---
-include(cmake/OpenCVDetectVTK.cmake)
-
 # ----------------------------------------------------------------------------
 # Add CUDA libraries (needed for apps/tools, samples)
 # ----------------------------------------------------------------------------
@@ -607,12 +584,6 @@ if(INSTALL_TESTS AND OPENCV_TEST_DATA_PATH AND UNIX)
    install(PROGRAMS "${CMAKE_BINARY_DIR}/unix-install/opencv_run_all_tests.sh"
            DESTINATION ${CMAKE_INSTALL_PREFIX} COMPONENT tests)
  else()
-    set(OPENCV_PYTHON_TESTS_LIST "")
-    if(BUILD_opencv_python)
-      file(GLOB py_tests modules/python/test/*.py)
-      install(PROGRAMS ${py_tests} DESTINATION ${OPENCV_TEST_INSTALL_PATH} COMPONENT tests)
-      set(OPENCV_PYTHON_TESTS_LIST "test2.py")
-    endif()
    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/templates/opencv_testing.sh.in"
                   "${CMAKE_BINARY_DIR}/unix-install/opencv_testing.sh" @ONLY)
    install(FILES "${CMAKE_BINARY_DIR}/unix-install/opencv_testing.sh"
@@ -621,6 +592,7 @@ if(INSTALL_TESTS AND OPENCV_TEST_DATA_PATH AND UNIX)
                   "${CMAKE_BINARY_DIR}/unix-install/opencv_run_all_tests.sh" @ONLY)
    install(PROGRAMS "${CMAKE_BINARY_DIR}/unix-install/opencv_run_all_tests.sh"
            DESTINATION ${OPENCV_TEST_INSTALL_PATH} COMPONENT tests)
+
  endif()
 endif()

@@ -756,8 +728,8 @@ if(WIN32)
 status("")
    status("  Windows RT support:" HAVE_WINRT THEN YES ELSE NO)
    if (ENABLE_WINRT_MODE OR ENABLE_WINRT_MODE_NATIVE)
-      status("  Windows (Phone) SDK v8.0/v8.1:" ${WINDOWS_SDK_PATH})
-      status("  Visual Studio 2012/2013:" ${VISUAL_STUDIO_PATH})
+      status("    Windows SDK v8.0:" ${WINDOWS_SDK_PATH})
+      status("    Visual Studio 2012:" ${VISUAL_STUDIO_PATH})
    endif()
 endif(WIN32)

@@ -793,7 +765,6 @@ else()
 endif()

 status("    OpenGL support:" HAVE_OPENGL THEN "YES (${OPENGL_LIBRARIES})" ELSE NO)
-status("    VTK support:" HAVE_VTK THEN "YES (ver ${VTK_VERSION})" ELSE NO)

 # ========================== MEDIA IO ==========================
 status("")
@@ -872,12 +843,10 @@ endif(DEFINED WITH_FFMPEG)
 if(DEFINED WITH_GSTREAMER)
  status("    GStreamer:"      HAVE_GSTREAMER      THEN ""                                         ELSE NO)
  if(HAVE_GSTREAMER)
-    status("      base:"       "YES (ver ${GSTREAMER_BASE_VERSION})")
-    status("      video:"      "YES (ver ${GSTREAMER_VIDEO_VERSION})")
-    status("      app:"        "YES (ver ${GSTREAMER_APP_VERSION})")
-    status("      riff:"       "YES (ver ${GSTREAMER_RIFF_VERSION})")
-    status("      pbutils:"    "YES (ver ${GSTREAMER_PBUTILS_VERSION})")
-  endif(HAVE_GSTREAMER)
+    status("      base:"       "YES (ver ${ALIASOF_gstreamer-base-0.10_VERSION})")
+    status("      app:"        "YES (ver ${ALIASOF_gstreamer-app-0.10_VERSION})")
+    status("      video:"      "YES (ver ${ALIASOF_gstreamer-video-0.10_VERSION})")
+  endif()
 endif(DEFINED WITH_GSTREAMER)

 if(DEFINED WITH_OPENNI)
@@ -918,9 +887,8 @@ if(DEFINED WITH_V4L)
  else()
    set(HAVE_CAMV4L2_STR "NO")
  endif()
-  status("    V4L/V4L2:"       HAVE_LIBV4L
-             THEN "Using libv4l1 (ver ${ALIASOF_libv4l1_VERSION}) / libv4l2 (ver ${ALIASOF_libv4l2_VERSION})"
-             ELSE "${HAVE_CAMV4L_STR}/${HAVE_CAMV4L2_STR}")
+  status("    V4L/V4L2:"       HAVE_LIBV4L         THEN "Using libv4l (ver ${ALIASOF_libv4l1_VERSION})"
+                                                   ELSE "${HAVE_CAMV4L_STR}/${HAVE_CAMV4L2_STR}")
 endif(DEFINED WITH_V4L)

 if(DEFINED WITH_DSHOW)
@@ -1,7 +1,5 @@
 ### OpenCV: Open Source Computer Vision Library

-[![Gittip](http://img.shields.io/gittip/OpenCV.png)](https://www.gittip.com/OpenCV/)
-
 #### Resources

 * Homepage: <http://opencv.org>
@@ -20,3 +18,6 @@ Summary of guidelines:
 * Include tests and documentation;
 * Clean up "oops" commits before submitting;
 * Follow the coding style guide.
+
+[![Donate OpenCV project](http://opencv.org/wp-content/uploads/2013/07/gittip1.png)](https://www.gittip.com/OpenCV/)
+[![Donate OpenCV project](http://opencv.org/wp-content/uploads/2013/07/paypal-donate-button.png)](https://www.paypal.com/cgi-bin/webscr?item_name=Donation+to+OpenCV&cmd=_donations&business=accountant%40opencv.org)
@@ -29,9 +29,6 @@ set(cvhaartraining_lib_src
  cvhaarclassifier.cpp
  cvhaartraining.cpp
  cvsamples.cpp
-  cvsamplesoutput.cpp
-  cvsamplesoutput.h
-  ioutput.h
  )

 add_library(opencv_haartraining_engine STATIC ${cvhaartraining_lib_src})
@@ -50,12 +50,10 @@
 #include <cstdlib>
 #include <cmath>
 #include <ctime>
-#include <memory>

 using namespace std;

 #include "cvhaartraining.h"
-#include "ioutput.h"

 int main( int argc, char* argv[] )
 {
@@ -73,12 +71,11 @@ int main( int argc, char* argv[] )
    double maxxangle = 1.1;
    double maxyangle = 1.1;
    double maxzangle = 0.5;
-    bool showsamples = false;
+    int showsamples = 0;
    /* the samples are adjusted to this scale in the sample preview window */
    double scale = 4.0;
    int width  = 24;
    int height = 24;
-    bool pngoutput = false; /* whether to make the samples in png or in jpg*/

    srand((unsigned int)time(0));

@@ -95,8 +92,7 @@ int main( int argc, char* argv[] )
                "  [-maxyangle <max_y_rotation_angle = %f>]\n"
                "  [-maxzangle <max_z_rotation_angle = %f>]\n"
                "  [-show [<scale = %f>]]\n"
-                "  [-w <sample_width = %d>]\n  [-h <sample_height = %d>]\n"
-                "  [-pngoutput]",
+                "  [-w <sample_width = %d>]\n  [-h <sample_height = %d>]\n",
                argv[0], num, bgcolor, bgthreshold, maxintensitydev,
                maxxangle, maxyangle, maxzangle, scale, width, height );

@@ -159,7 +155,7 @@ int main( int argc, char* argv[] )
        }
        else if( !strcmp( argv[i], "-show" ) )
        {
-            showsamples = true;
+            showsamples = 1;
            if( i+1 < argc && strlen( argv[i+1] ) > 0 && argv[i+1][0] != '-' )
            {
                double d;
@@ -176,10 +172,6 @@ int main( int argc, char* argv[] )
        {
            height = atoi( argv[++i] );
        }
-        else if( !strcmp( argv[i], "-pngoutput" ) )
-        {
-            pngoutput = true;
-        }
    }

    printf( "Info file name: %s\n", ((infoname == NULL) ?   nullname : infoname ) );
@@ -198,14 +190,10 @@ int main( int argc, char* argv[] )
    printf( "Show samples: %s\n", (showsamples) ? "TRUE" : "FALSE" );
    if( showsamples )
    {
-        printf( "Scale applied to display : %g\n", scale );
-    }
-    if( !pngoutput)
-    {
-        printf( "Original image will be scaled to:\n");
-        printf( "\tWidth: $backgroundWidth / %d\n", width );
-        printf( "\tHeight: $backgroundHeight / %d\n", height );
+        printf( "Scale: %g\n", scale );
    }
+    printf( "Width: %d\n", width );
+    printf( "Height: %d\n", height );

    /* determine action */
    if( imagename && vecname )
@@ -219,24 +207,13 @@ int main( int argc, char* argv[] )

        printf( "Done\n" );
    }
-    else if( imagename && bgfilename && infoname)
+    else if( imagename && bgfilename && infoname )
    {
-        printf( "Create data set from single image applying distortions...\n"
-                "Output format: %s\n",
-                (( pngoutput ) ? "PNG" : "JPG") );
+        printf( "Create test samples from single image applying distortions...\n" );

-        std::auto_ptr<DatasetGenerator> creator;
-        if( pngoutput )
-        {
-            creator = std::auto_ptr<DatasetGenerator>( new PngDatasetGenerator( infoname ) );
-        }
-        else
-        {
-            creator = std::auto_ptr<DatasetGenerator>( new JpgDatasetGenerator( infoname ) );
-        }
-        creator->create( imagename, bgcolor, bgthreshold, bgfilename, num,
-                        invert, maxintensitydev, maxxangle, maxyangle, maxzangle,
-                        showsamples, width, height );
+        cvCreateTestSamples( infoname, imagename, bgcolor, bgthreshold, bgfilename, num,
+            invert, maxintensitydev,
+            maxxangle, maxyangle, maxzangle, showsamples, width, height );

        printf( "Done\n" );
    }
@@ -338,7 +338,7 @@ typedef enum CvBoostType
    CV_LKCLASS  = 5, /* classification (K class problem)    */
    CV_LSREG    = 6, /* least squares regression            */
    CV_LADREG   = 7, /* least absolute deviation regression */
-    CV_MREG     = 8  /* M-regression (Huber loss)           */
+    CV_MREG     = 8, /* M-regression (Huber loss)           */
 } CvBoostType;

 /****************************************************************************************\
@@ -48,8 +48,6 @@
 #include "cvhaartraining.h"
 #include "_cvhaartraining.h"

-#include "ioutput.h"
-
 #include <cstdio>
 #include <cstdlib>
 #include <cmath>
@@ -2843,12 +2841,14 @@ void cvCreateTreeCascadeClassifier( const char* dirname,
    cvReleaseMat( &features_idx );
 }

+
+
 void cvCreateTrainingSamples( const char* filename,
                              const char* imgfilename, int bgcolor, int bgthreshold,
                              const char* bgfilename, int count,
                              int invert, int maxintensitydev,
                              double maxxangle, double maxyangle, double maxzangle,
-                              bool showsamples,
+                              int showsamples,
                              int winwidth, int winheight )
 {
    CvSampleDistortionData data;
@@ -2915,7 +2915,7 @@ void cvCreateTrainingSamples( const char* filename,
                    cvShowImage( "Sample", &sample );
                    if( cvWaitKey( 0 ) == 27 )
                    {
-                        showsamples = false;
+                        showsamples = 0;
                    }
                }

@@ -2942,43 +2942,45 @@ void cvCreateTrainingSamples( const char* filename,

 }

-DatasetGenerator::DatasetGenerator( IOutput* _writer )
-    :writer(_writer)
-{
+#define CV_INFO_FILENAME "info.dat"

-}

-void DatasetGenerator::showSamples(bool* show, CvMat *img) const
-{
-    if( *show )
-    {
-        cvShowImage( "Image", img);
-        if( cvWaitKey( 0 ) == 27 )
-        {
-            *show = false;
-        }
-    }
-}
-
-void DatasetGenerator::create(const char* imgfilename, int bgcolor, int bgthreshold,
-                              const char* bgfilename, int count,
-                              int invert, int maxintensitydev,
-                              double maxxangle, double maxyangle, double maxzangle,
-                              bool showsamples,
-                              int winwidth, int winheight )
+void cvCreateTestSamples( const char* infoname,
+                          const char* imgfilename, int bgcolor, int bgthreshold,
+                          const char* bgfilename, int count,
+                          int invert, int maxintensitydev,
+                          double maxxangle, double maxyangle, double maxzangle,
+                          int showsamples,
+                          int winwidth, int winheight )
 {
    CvSampleDistortionData data;

+    assert( infoname != NULL );
    assert( imgfilename != NULL );
    assert( bgfilename != NULL );

+    if( !icvMkDir( infoname ) )
+    {
+
+#if CV_VERBOSE
+        fprintf( stderr, "Unable to create directory hierarchy: %s\n", infoname );
+#endif /* CV_VERBOSE */
+
+        return;
+    }
    if( icvStartSampleDistortion( imgfilename, bgcolor, bgthreshold, &data ) )
    {
+        char fullname[PATH_MAX];
+        char* filename;
        CvMat win;
+        FILE* info;

        if( icvInitBackgroundReaders( bgfilename, cvSize( 10, 10 ) ) )
        {
            int i;
+            int x, y, width, height;
+            float scale;
+            float maxscale;
            int inverse;

            if( showsamples )
@@ -2986,112 +2988,73 @@ void DatasetGenerator::create(const char* imgfilename, int bgcolor, int bgthresh
                cvNamedWindow( "Image", CV_WINDOW_AUTOSIZE );
            }

+            info = fopen( infoname, "w" );
+            strcpy( fullname, infoname );
+            filename = strrchr( fullname, '\\' );
+            if( filename == NULL )
+            {
+                filename = strrchr( fullname, '/' );
+            }
+            if( filename == NULL )
+            {
+                filename = fullname;
+            }
+            else
+            {
+                filename++;
+            }
+
            count = MIN( count, cvbgdata->count );
            inverse = invert;
-
            for( i = 0; i < count; i++ )
            {
                icvGetNextFromBackgroundData( cvbgdata, cvbgreader );

-                CvRect boundingBox = getObjectPosition( cvSize( cvbgreader->src.cols,
-                                                                cvbgreader->src.rows ),
-                                                        cvGetSize(data.img),
-                                                        cvSize( winwidth, winheight ) );
-                if(boundingBox.width <= 0 || boundingBox.height <= 0)
-                {
-                    continue;
-                }
+                maxscale = MIN( 0.7F * cvbgreader->src.cols / winwidth,
+                                   0.7F * cvbgreader->src.rows / winheight );
+                if( maxscale < 1.0F ) continue;

-                cvGetSubArr( &cvbgreader->src, &win, boundingBox );
+                scale = (maxscale - 1.0F) * rand() / RAND_MAX + 1.0F;
+                width = (int) (scale * winwidth);
+                height = (int) (scale * winheight);
+                x = (int) ((0.1+0.8 * rand()/RAND_MAX) * (cvbgreader->src.cols - width));
+                y = (int) ((0.1+0.8 * rand()/RAND_MAX) * (cvbgreader->src.rows - height));

+                cvGetSubArr( &cvbgreader->src, &win, cvRect( x, y ,width, height ) );
                if( invert == CV_RANDOM_INVERT )
                {
                    inverse = (rand() > (RAND_MAX/2));
                }
-
                icvPlaceDistortedSample( &win, inverse, maxintensitydev,
                                         maxxangle, maxyangle, maxzangle,
                                         1, 0.0, 0.0, &data );

-                writer->write( cvbgreader->src, boundingBox );

-                showSamples(&showsamples, &cvbgreader->src);
+                sprintf( filename, "%04d_%04d_%04d_%04d_%04d.jpg",
+                         (i + 1), x, y, width, height );
+
+                if( info )
+                {
+                    fprintf( info, "%s %d %d %d %d %d\n",
+                        filename, 1, x, y, width, height );
+                }
+
+                cvSaveImage( fullname, &cvbgreader->src );
+                if( showsamples )
+                {
+                    cvShowImage( "Image", &cvbgreader->src );
+                    if( cvWaitKey( 0 ) == 27 )
+                    {
+                        showsamples = 0;
+                    }
+                }
            }
+            if( info ) fclose( info );
            icvDestroyBackgroundReaders();
        }
        icvEndSampleDistortion( &data );
    }
 }

-DatasetGenerator::~DatasetGenerator()
-{
-    delete writer;
-}
-
-
-JpgDatasetGenerator::JpgDatasetGenerator( const char* filename )
-    :DatasetGenerator( IOutput::createOutput( filename, IOutput::JPG_DATASET ) )
-{
-}
-
-CvSize JpgDatasetGenerator::scaleObjectSize( const CvSize& bgImgSize,
-                                             const CvSize& ,
-                                             const CvSize& sampleSize) const
-{
-    float scale;
-    float maxscale;
-
-    maxscale = MIN( 0.7F * bgImgSize.width / sampleSize.width,
-                    0.7F * bgImgSize.height / sampleSize.height );
-    if( maxscale < 1.0F )
-    {
-        scale = -1.f;
-    }
-    else
-    {
-        scale = (maxscale - 1.0F) * rand() / RAND_MAX + 1.0F;
-    }
-
-    int width = (int) (scale * sampleSize.width);
-    int height = (int) (scale * sampleSize.height);
-
-    return cvSize( width, height );
-}
-
-CvRect DatasetGenerator::getObjectPosition(const CvSize& bgImgSize,
-                                           const CvSize& imgSize,
-                                           const CvSize& sampleSize) const
-{
-    CvSize size = scaleObjectSize( bgImgSize, imgSize, sampleSize );
-
-    int width = size.width;
-    int height = size.height;
-    int x = (int) ((0.1 + 0.8 * rand() / RAND_MAX) * (bgImgSize.width - width));
-    int y = (int) ((0.1 + 0.8 * rand() / RAND_MAX) * (bgImgSize.height - height));
-
-    return cvRect( x, y, width, height );
-}
-
-
-PngDatasetGenerator::PngDatasetGenerator(const char* filename)
-    :DatasetGenerator( IOutput::createOutput( filename, IOutput::PNG_DATASET ) )
-{
-}
-
-CvSize PngDatasetGenerator::scaleObjectSize( const CvSize& bgImgSize,
-                                             const CvSize& imgSize,
-                                             const CvSize& ) const
-{
-    float scale;
-
-    scale = MIN( 0.3F * bgImgSize.width / imgSize.width,
-                 0.3F * bgImgSize.height / imgSize.height );
-
-
-    int width = (int) (scale * imgSize.width);
-    int height = (int) (scale * imgSize.height);
-
-    return cvSize( width, height );
-}

 /* End of file. */
@@ -48,11 +48,6 @@
 #ifndef _CVHAARTRAINING_H_
 #define _CVHAARTRAINING_H_

-class IOutput;
-struct CvRect;
-struct CvSize;
-struct CvMat;
-
 /*
 * cvCreateTrainingSamples
 *
@@ -79,30 +74,23 @@ struct CvMat;
 */
 #define CV_RANDOM_INVERT 0x7FFFFFFF

-void cvCreateTrainingSamples(const char* filename,
+void cvCreateTrainingSamples( const char* filename,
                              const char* imgfilename, int bgcolor, int bgthreshold,
                              const char* bgfilename, int count,
                              int invert = 0, int maxintensitydev = 40,
                              double maxxangle = 1.1,
                              double maxyangle = 1.1,
                              double maxzangle = 0.5,
-                              bool showsamples = false,
+                              int showsamples = 0,
                              int winwidth = 24, int winheight = 24 );

-void cvCreatePngTrainingSet(const char* imgfilename, int bgcolor, int bgthreshold,
-                            const char* bgfilename, int count,
-                            int invert, int maxintensitydev,
-                            double maxxangle, double maxyangle, double maxzangle,
-                            int winwidth, int winheight,
-                            IOutput *writer );
-
-void cvCreateTestSamples(const char* imgfilename, int bgcolor, int bgthreshold,
+void cvCreateTestSamples( const char* infoname,
+                          const char* imgfilename, int bgcolor, int bgthreshold,
                          const char* bgfilename, int count,
                          int invert, int maxintensitydev,
                          double maxxangle, double maxyangle, double maxzangle,
                          int showsamples,
-                          int winwidth, int winheight,
-                          IOutput* writer);
+                          int winwidth, int winheight );

 /*
 * cvCreateTrainingSamplesFromInfo
@@ -201,50 +189,4 @@ void cvCreateTreeCascadeClassifier( const char* dirname,
                                    int boosttype, int stumperror,
                                    int maxtreesplits, int minpos, bool bg_vecfile = false );

-
-class DatasetGenerator
-{
-public:
-    DatasetGenerator( IOutput* _writer );
-    void create( const char* imgfilename, int bgcolor, int bgthreshold,
-                 const char* bgfilename, int count,
-                 int invert, int maxintensitydev,
-                 double maxxangle, double maxyangle, double maxzangle,
-                 bool showsamples,
-                 int winwidth, int winheight);
-    virtual ~DatasetGenerator();
-private:
-    virtual void showSamples( bool* showSamples, CvMat* img ) const;
-
-    CvRect getObjectPosition( const CvSize& bgImgSize,
-                              const CvSize& imgSize,
-                              const CvSize& sampleSize ) const;
-    virtual CvSize scaleObjectSize(const CvSize& bgImgSize,
-                                   const CvSize& imgSize ,
-                                   const CvSize& sampleSize) const =0 ;
-private:
-    IOutput* writer;
-};
-
-/* Provides the functionality of test set generating */
-class JpgDatasetGenerator: public DatasetGenerator
-{
-public:
-    JpgDatasetGenerator(const char* filename);
-private:
-    CvSize scaleObjectSize(const CvSize& bgImgSize,
-                           const CvSize& ,
-                           const CvSize& sampleSize) const;
-};
-
-class PngDatasetGenerator: public DatasetGenerator
-{
-public:
-    PngDatasetGenerator(const char *filename);
-private:
-    CvSize scaleObjectSize(const CvSize& bgImgSize,
-                           const CvSize& imgSize ,
-                           const CvSize& ) const;
-};
-
 #endif /* _CVHAARTRAINING_H_ */
@@ -1,227 +0,0 @@
-#include "cvsamplesoutput.h"
-
-#include <cstdio>
-
-#include "_cvcommon.h"
-#include "highgui.h"
-
-/* print statistic info */
-#define CV_VERBOSE 1
-
-IOutput::IOutput()
-    : currentIdx(0)
-{}
-
-void IOutput::findFilePathPart(char **partOfPath, char *fullPath)
-{
-    *partOfPath = strrchr( fullPath, '\\' );
-    if( *partOfPath == NULL )
-    {
-        *partOfPath = strrchr( fullPath, '/' );
-    }
-    if( *partOfPath == NULL )
-    {
-        *partOfPath = fullPath;
-    }
-    else
-    {
-        *partOfPath += 1;
-    }
-}
-
-IOutput* IOutput::createOutput(const char *filename,
-                               IOutput::OutputType type)
-{
-    IOutput* output = 0;
-    switch (type) {
-    case IOutput::PNG_DATASET:
-        output = new PngDatasetOutput();
-        break;
-    case IOutput::JPG_DATASET:
-        output = new JpgDatasetOutput();
-        break;
-    default:
-#if CV_VERBOSE
-        fprintf( stderr, "Invalid output type, valid types are: PNG_TRAINING_SET, JPG_TEST_SET");
-#endif /* CV_VERBOSE */
-        return 0;
-    }
-
-    if ( output->init( filename ) )
-        return output;
-    else
-        return 0;
-}
-
-bool PngDatasetOutput::init( const char* annotationsListFileName )
-{
-    IOutput::init( annotationsListFileName );
-
-    if(imgFileName == imgFullPath)
-    {
-        #if CV_VERBOSE
-                fprintf( stderr, "Invalid path to annotations file: %s\n"
-                                 "It should contain a parent directory name\n", imgFullPath );
-        #endif /* CV_VERBOSE */
-        return false;
-    }
-
-
-    const char* annotationsdirname = "/annotations/";
-    const char* positivesdirname = "/pos/";
-
-    imgFileName[-1] = '\0'; //erase slash at the end of the path
-    imgFileName -= 1;
-
-    //copy path to dataset top-level dir
-    strcpy(annotationFullPath, imgFullPath);
-    //find the name of annotation starting from the top-level dataset dir
-    findFilePathPart(&annotationRelativePath, annotationFullPath);
-    if( !strcmp( annotationRelativePath, ".." ) || !strcmp( annotationRelativePath, "." ) )
-    {
-        #if CV_VERBOSE
-                fprintf( stderr, "Invalid path to annotations file: %s\n"
-                                 "It should contain a parent directory name\n", annotationsListFileName );
-        #endif /* CV_VERBOSE */
-        return false;
-    }
-    //find the name of output image starting from the top-level dataset dir
-    findFilePathPart(&imgRelativePath, imgFullPath);
-    annotationFileName = annotationFullPath + strlen(annotationFullPath);
-
-    sprintf(annotationFileName, "%s", annotationsdirname);
-    annotationFileName += strlen(annotationFileName);
-    sprintf(imgFileName, "%s", positivesdirname);
-    imgFileName += strlen(imgFileName);
-
-    if( !icvMkDir( annotationFullPath ) )
-    {
-        #if CV_VERBOSE
-                fprintf( stderr, "Unable to create directory hierarchy: %s\n", annotationFullPath );
-        #endif /* CV_VERBOSE */
-        return false;
-    }
-    if( !icvMkDir( imgFullPath ) )
-    {
-        #if CV_VERBOSE
-                fprintf( stderr, "Unable to create directory hierarchy: %s\n", imgFullPath );
-        #endif /* CV_VERBOSE */
-        return false;
-    }
-
-    return true;
-}
-
-bool PngDatasetOutput::write( const CvMat& img,
-                              const CvRect& boundingBox )
-{
-    CvRect bbox = addBoundingboxBorder(boundingBox);
-
-    sprintf( imgFileName,
-             "%04d_%04d_%04d_%04d_%04d",
-             ++currentIdx,
-             bbox.x,
-             bbox.y,
-             bbox.width,
-             bbox.height );
-
-    sprintf( annotationFileName, "%s.txt", imgFileName );
-    fprintf( annotationsList, "%s\n", annotationRelativePath );
-
-    FILE* annotationFile = fopen( annotationFullPath, "w" );
-    if(annotationFile == 0)
-    {
-        return false;
-    }
-
-    sprintf( imgFileName + strlen(imgFileName), ".%s", extension );
-
-
-
-    fprintf( annotationFile,
-             "Image filename : \"%s\"\n"
-             "Bounding box for object 1 \"PASperson\" (Xmin, Ymin) - (Xmax, Ymax) : (%d, %d) - (%d, %d)",
-             imgRelativePath,
-             bbox.x,
-             bbox.y,
-             bbox.x + bbox.width,
-             bbox.y + bbox.height );
-    fclose( annotationFile );
-
-    cvSaveImage( imgFullPath, &img);
-
-    return true;
-}
-
-CvRect PngDatasetOutput::addBoundingboxBorder(const CvRect& bbox) const
-{
-    CvRect boundingBox = bbox;
-    int border = 5;
-
-    boundingBox.x -= border;
-    boundingBox.y -= border;
-    boundingBox.width += 2*border;
-    boundingBox.height += 2*border;
-
-    return boundingBox;
-}
-
-IOutput::~IOutput()
-{
-    if(annotationsList)
-    {
-        fclose(annotationsList);
-    }
-}
-
-bool IOutput::init(const char *filename)
-{
-    assert( filename != NULL );
-
-    if( !icvMkDir( filename ) )
-    {
-
-#if CV_VERBOSE
-        fprintf( stderr, "Unable to create directory hierarchy: %s\n", filename );
-#endif /* CV_VERBOSE */
-
-        return false;
-    }
-
-    annotationsList = fopen( filename, "w" );
-    if( annotationsList == NULL )
-    {
-#if CV_VERBOSE
-        fprintf( stderr, "Unable to create info file: %s\n", filename );
-#endif /* CV_VERBOSE */
-        return false;
-    }
-    strcpy( imgFullPath, filename );
-
-    findFilePathPart( &imgFileName, imgFullPath );
-
-    return true;
-}
-
-bool JpgDatasetOutput::write( const CvMat& img,
-                               const CvRect& boundingBox )
-{
-    sprintf( imgFileName, "%04d_%04d_%04d_%04d_%04d.jpg",
-             ++currentIdx,
-             boundingBox.x,
-             boundingBox.y,
-             boundingBox.width,
-             boundingBox.height );
-
-   fprintf( annotationsList, "%s %d %d %d %d %d\n",
-            imgFileName,
-            1,
-            boundingBox.x,
-            boundingBox.y,
-            boundingBox.width,
-            boundingBox.height );
-
-    cvSaveImage( imgFullPath, &img);
-
-    return true;
-}
@@ -1,46 +0,0 @@
-#ifndef CVSAMPLESOUTPUT_H
-#define CVSAMPLESOUTPUT_H
-
-#include "ioutput.h"
-
-class PngDatasetOutput: public IOutput
-{
-    friend IOutput* IOutput::createOutput(const char *filename, OutputType type);
-public:
-    virtual bool write( const CvMat& img,
-                        const CvRect& boundingBox);
-
-    virtual ~PngDatasetOutput(){}
-private:
-    PngDatasetOutput()
-        : extension("png")
-        , destImgWidth(640)
-        , destImgHeight(480)
-    {}
-
-    virtual bool init(const char* annotationsListFileName );
-
-    CvRect addBoundingboxBorder(const CvRect& bbox) const;
-private:
-
-    char annotationFullPath[PATH_MAX];
-    char* annotationFileName;
-    char* annotationRelativePath;
-    char* imgRelativePath;
-    const char* extension;
-
-    int destImgWidth;
-    int destImgHeight ;
-};
-
-class JpgDatasetOutput: public IOutput
-{
-    friend IOutput* IOutput::createOutput(const char *filename, OutputType type);
-public:
-    virtual bool write( const CvMat& img,
-                        const CvRect& boundingBox );
-    virtual ~JpgDatasetOutput(){}
-private:
-    JpgDatasetOutput(){}
-};
-#endif // CVSAMPLESOUTPUT_H
@@ -1,34 +0,0 @@
-#ifndef IOUTPUT_H
-#define IOUTPUT_H
-
-#include <cstdio>
-
-#include "_cvcommon.h"
-
-struct CvMat;
-struct CvRect;
-
-class IOutput
-{
-public:
-    enum OutputType {PNG_DATASET, JPG_DATASET};
-public:
-    virtual bool write( const CvMat& img,
-                        const CvRect& boundingBox ) =0;
-
-    virtual ~IOutput();
-
-    static IOutput* createOutput( const char *filename, OutputType type );
-protected:
-    IOutput();
-    /* finds the beginning of the last token in the path */
-    void findFilePathPart( char **partOfPath, char *fullPath );
-    virtual bool init( const char* filename );
-protected:
-    int  currentIdx;
-    char imgFullPath[PATH_MAX];
-    char* imgFileName;
-    FILE* annotationsList;
-};
-
-#endif // IOUTPUT_H
@@ -198,7 +198,7 @@ bool CvCascadeClassifier::train( const string _cascadeDirName,
        cout << endl << "===== TRAINING " << i << "-stage =====" << endl;
        cout << "<BEGIN" << endl;

-        if ( !updateTrainingSet( requiredLeafFARate, tempLeafFARate ) )
+        if ( !updateTrainingSet( tempLeafFARate ) )
        {
            cout << "Train dataset for temp stage can not be filled. "
                "Branch training terminated." << endl;
@@ -284,17 +284,17 @@ int CvCascadeClassifier::predict( int sampleIdx )
    return 1;
 }

-bool CvCascadeClassifier::updateTrainingSet( double minimumAcceptanceRatio, double& acceptanceRatio)
+bool CvCascadeClassifier::updateTrainingSet( double& acceptanceRatio)
 {
    int64 posConsumed = 0, negConsumed = 0;
    imgReader.restart();
-    int posCount = fillPassedSamples( 0, numPos, true, 0, posConsumed );
+    int posCount = fillPassedSamples( 0, numPos, true, posConsumed );
    if( !posCount )
        return false;
    cout << "POS count : consumed   " << posCount << " : " << (int)posConsumed << endl;

    int proNumNeg = cvRound( ( ((double)numNeg) * ((double)posCount) ) / numPos ); // apply only a fraction of negative samples. double is required since overflow is possible
-    int negCount = fillPassedSamples( posCount, proNumNeg, false, minimumAcceptanceRatio, negConsumed );
+    int negCount = fillPassedSamples( posCount, proNumNeg, false, negConsumed );
    if ( !negCount )
        return false;

@@ -304,7 +304,7 @@ bool CvCascadeClassifier::updateTrainingSet( double minimumAcceptanceRatio, doub
    return true;
 }

-int CvCascadeClassifier::fillPassedSamples( int first, int count, bool isPositive, double minimumAcceptanceRatio, int64& consumed )
+int CvCascadeClassifier::fillPassedSamples( int first, int count, bool isPositive, int64& consumed )
 {
    int getcount = 0;
    Mat img(cascadeParams.winSize, CV_8UC1);
@@ -312,9 +312,6 @@ int CvCascadeClassifier::fillPassedSamples( int first, int count, bool isPositiv
    {
        for( ; ; )
        {
-            if( consumed != 0 && ((double)getcount+1)/(double)(int64)consumed <= minimumAcceptanceRatio )
-                return getcount;
-
            bool isGetImg = isPositive ? imgReader.getPos( img ) :
                                           imgReader.getNeg( img );
            if( !isGetImg )
@@ -509,8 +506,6 @@ void CvCascadeClassifier::save( const string filename, bool baseFormat )

 bool CvCascadeClassifier::load( const string cascadeDirName )
 {
-    cout << "Training parameters are loaded from the parameter file in data folder!" << endl;
-    cout << "Please empty the data folder if you want to use your own set of parameters." << endl;
    FileStorage fs( cascadeDirName + CC_PARAMS_FILENAME, FileStorage::READ );
    if ( !fs.isOpened() )
        return false;
@@ -101,8 +101,8 @@ private:
    int predict( int sampleIdx );
    void save( const std::string cascadeDirName, bool baseFormat = false );
    bool load( const std::string cascadeDirName );
-    bool updateTrainingSet( double minimumAcceptanceRatio, double& acceptanceRatio );
-    int fillPassedSamples( int first, int count, bool isPositive, double requiredAcceptanceRatio, int64& consumed );
+    bool updateTrainingSet( double& acceptanceRatio );
+    int fillPassedSamples( int first, int count, bool isPositive, int64& consumed );

    void writeParams( cv::FileStorage &fs ) const;
    void writeStages( cv::FileStorage &fs, const cv::Mat& featureMap ) const;
@@ -6,62 +6,34 @@ endif()

 set(HAVE_WINRT FALSE)

-# search Windows (Phone) Platform SDK
-message(STATUS "Checking for Windows (Phone) Platform SDK 8.0/8.1")
-unset(WINDOWS_SDK_PATH CACHE)
-GET_FILENAME_COMPONENT(WINDOWS_SDK_PATH  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\WindowsPhoneApp\\v8.1;InstallationFolder]" ABSOLUTE CACHE)
-if((NOT ENABLE_WINPHONESDK81) OR (NOT (MSVC_VERSION EQUAL 1800)) OR (WINDOWS_SDK_PATH STREQUAL ""))
-  unset(WINDOWS_SDK_PATH CACHE)
-  GET_FILENAME_COMPONENT(WINDOWS_SDK_PATH  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\WindowsPhone\\v8.0;InstallationFolder]" ABSOLUTE CACHE)
-  if((NOT ENABLE_WINPHONESDK80) OR (MSVC_VERSION LESS 1700) OR (WINDOWS_SDK_PATH STREQUAL ""))
-    unset(WINDOWS_SDK_PATH CACHE)
-    GET_FILENAME_COMPONENT(WINDOWS_SDK_PATH  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v8.1;InstallationFolder]" ABSOLUTE CACHE)
-    if((NOT ENABLE_WINSDK81) OR (NOT (MSVC_VERSION EQUAL 1800)) OR (WINDOWS_SDK_PATH STREQUAL ""))
-      set(HAVE_MSPDK FALSE)
-      unset(WINDOWS_SDK_PATH CACHE)
-      GET_FILENAME_COMPONENT(WINDOWS_SDK_PATH  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v8.0;InstallationFolder]" ABSOLUTE CACHE)
-      if(WINDOWS_SDK_PATH STREQUAL "")
-        set(HAVE_MSPDK FALSE)
-        message(STATUS "Windows (Phone) Platform SDK 8.0/8.1 was not found")
-      else()
-        set(HAVE_MSPDK TRUE)
-      endif()
-    else()
-      set(HAVE_MSPDK TRUE)
-    endif()
-  else()
-    set(HAVE_MSPDK TRUE)
-  endif()
+# search Windows Platform SDK
+message(STATUS "Checking for Windows Platform SDK")
+GET_FILENAME_COMPONENT(WINDOWS_SDK_PATH  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v8.0;InstallationFolder]" ABSOLUTE CACHE)
+if(WINDOWS_SDK_PATH STREQUAL "")
+  set(HAVE_MSPDK FALSE)
+  message(STATUS "Windows Platform SDK 8.0 was not found")
 else()
  set(HAVE_MSPDK TRUE)
 endif()

-#search for Visual Studio 11.0/12.0 install directory
-message(STATUS "Checking for Visual Studio 2012/2013")
-unset(VISUAL_STUDIO_PATH CACHE)
-GET_FILENAME_COMPONENT(VISUAL_STUDIO_PATH [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\12.0\\Setup\\VS;ProductDir] REALPATH CACHE)
-if((NOT ENABLE_LIBVS2013) OR (NOT (MSVC_VERSION EQUAL 1800)) OR (VISUAL_STUDIO_PATH STREQUAL ""))
-  set(HAVE_MSVC2013 FALSE)
-  unset(VISUAL_STUDIO_PATH CACHE)
-  GET_FILENAME_COMPONENT(VISUAL_STUDIO_PATH [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\11.0\\Setup\\VS;ProductDir] REALPATH CACHE)
-  if(VISUAL_STUDIO_PATH STREQUAL "")
-    set(HAVE_MSVC2012 FALSE)
-    message(STATUS "Visual Studio 2012/2013 not found")
-  else()
-    set(HAVE_MSVC2012 TRUE)
-  endif()
+#search for Visual Studio 11.0 install directory
+message(STATUS "Checking for Visual Studio 2012")
+GET_FILENAME_COMPONENT(VISUAL_STUDIO_PATH [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\11.0\\Setup\\VS;ProductDir] REALPATH CACHE)
+if(VISUAL_STUDIO_PATH STREQUAL "")
+  set(HAVE_MSVC2012 FALSE)
+  message(STATUS "Visual Studio 2012 was not found")
 else()
-  set(HAVE_MSVC2013 TRUE)
+  set(HAVE_MSVC2012 TRUE)
 endif()

 try_compile(HAVE_WINRT_SDK
  "${OpenCV_BINARY_DIR}"
  "${OpenCV_SOURCE_DIR}/cmake/checks/winrttest.cpp")

-if(ENABLE_WINRT_MODE AND HAVE_WINRT_SDK AND (HAVE_MSVC2012 OR HAVE_MSVC2013) AND HAVE_MSPDK)
+if(ENABLE_WINRT_MODE AND HAVE_WINRT_SDK AND HAVE_MSVC2012 AND HAVE_MSPDK)
  set(HAVE_WINRT TRUE)
  set(HAVE_WINRT_CX TRUE)
-elseif(ENABLE_WINRT_MODE_NATIVE AND HAVE_WINRT_SDK AND (HAVE_MSVC2012 OR HAVE_MSVC2013) AND HAVE_MSPDK)
+elseif(ENABLE_WINRT_MODE_NATIVE AND HAVE_WINRT_SDK AND HAVE_MSVC2012 AND HAVE_MSPDK)
  set(HAVE_WINRT TRUE)
  set(HAVE_WINRT_CX FALSE)
 endif()
@@ -140,11 +140,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
  # SSE3 and further should be disabled under MingW because it generates compiler errors
  if(NOT MINGW)
    if(ENABLE_AVX)
-      ocv_check_flag_support(CXX "-mavx" _varname)
-    endif()
-
-    if(ENABLE_AVX2)
-      ocv_check_flag_support(CXX "-mavx2" _varname)
+      add_extra_compiler_option(-mavx)
    endif()

    # GCC depresses SSEx instructions when -mavx is used. Instead, it generates new AVX instructions or AVX equivalence for all SSEx instructions when needed.
@@ -191,11 +187,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
    add_extra_compiler_option(-ffunction-sections)
  endif()

-  if(ENABLE_COVERAGE)
-    set(OPENCV_EXTRA_C_FLAGS "${OPENCV_EXTRA_C_FLAGS} --coverage")
-    set(OPENCV_EXTRA_CXX_FLAGS "${OPENCV_EXTRA_CXX_FLAGS} --coverage")
-  endif()
-
  set(OPENCV_EXTRA_FLAGS_RELEASE "${OPENCV_EXTRA_FLAGS_RELEASE} -DNDEBUG")
  set(OPENCV_EXTRA_FLAGS_DEBUG "${OPENCV_EXTRA_FLAGS_DEBUG} -O0 -DDEBUG -D_DEBUG")
 endif()
@@ -220,6 +211,10 @@ if(MSVC)
    set(OPENCV_EXTRA_FLAGS_RELEASE "${OPENCV_EXTRA_FLAGS_RELEASE} /Zi")
  endif()

+  if(ENABLE_AVX AND NOT MSVC_VERSION LESS 1600)
+    set(OPENCV_EXTRA_FLAGS "${OPENCV_EXTRA_FLAGS} /arch:AVX")
+  endif()
+
  if(ENABLE_SSE4_1 AND CV_ICC AND NOT OPENCV_EXTRA_FLAGS MATCHES "/arch:")
    set(OPENCV_EXTRA_FLAGS "${OPENCV_EXTRA_FLAGS} /arch:SSE4.1")
  endif()
@@ -238,7 +233,7 @@ if(MSVC)
    endif()
  endif()

-  if(ENABLE_SSE OR ENABLE_SSE2 OR ENABLE_SSE3 OR ENABLE_SSE4_1 OR ENABLE_AVX OR ENABLE_AVX2)
+  if(ENABLE_SSE OR ENABLE_SSE2 OR ENABLE_SSE3 OR ENABLE_SSE4_1 OR ENABLE_AVX)
    set(OPENCV_EXTRA_FLAGS "${OPENCV_EXTRA_FLAGS} /Oi")
  endif()

@@ -326,12 +326,12 @@ macro(add_android_project target path)

      # copy all needed CUDA libs to project if EMBED_CUDA flag is present
      if(android_proj_EMBED_CUDA)
-        set(android_proj_culibs ${CUDA_npp_LIBRARY_ABS} ${CUDA_LIBRARIES_ABS})
+        set(android_proj_culibs ${CUDA_npp_LIBRARY} ${CUDA_LIBRARIES})
        if(HAVE_CUFFT)
-          list(INSERT android_proj_culibs 0 ${CUDA_cufft_LIBRARY_ABS})
+          list(INSERT android_proj_culibs 0 ${CUDA_cufft_LIBRARY})
        endif()
        if(HAVE_CUBLAS)
-          list(INSERT android_proj_culibs 0 ${CUDA_cublas_LIBRARY_ABS})
+          list(INSERT android_proj_culibs 0 ${CUDA_cublas_LIBRARY})
        endif()
        foreach(lib ${android_proj_culibs})
          get_filename_component(f "${lib}" NAME)
@@ -180,9 +180,6 @@ if(CUDA_FOUND)
      # we remove -Wsign-promo as it generates warnings under linux
      string(REPLACE "-Wsign-promo" "" ${var} "${${var}}")

-      # we remove -Wno-sign-promo as it generates warnings under linux
-      string(REPLACE "-Wno-sign-promo" "" ${var} "${${var}}")
-
      # we remove -Wno-delete-non-virtual-dtor because it's used for C++ compiler
      # but NVCC uses C compiler by default
      string(REPLACE "-Wno-delete-non-virtual-dtor" "" ${var} "${${var}}")
@@ -219,42 +216,3 @@ else()
  unset(CUDA_ARCH_BIN CACHE)
  unset(CUDA_ARCH_PTX CACHE)
 endif()
-
-if(HAVE_CUDA)
-  set(CUDA_LIBS_PATH "")
-  foreach(p ${CUDA_LIBRARIES} ${CUDA_npp_LIBRARY})
-    get_filename_component(_tmp ${p} PATH)
-    list(APPEND CUDA_LIBS_PATH ${_tmp})
-  endforeach()
-
-  if(HAVE_CUBLAS)
-    foreach(p ${CUDA_cublas_LIBRARY})
-      get_filename_component(_tmp ${p} PATH)
-      list(APPEND CUDA_LIBS_PATH ${_tmp})
-    endforeach()
-  endif()
-
-  if(HAVE_CUFFT)
-    foreach(p ${CUDA_cufft_LIBRARY})
-      get_filename_component(_tmp ${p} PATH)
-      list(APPEND CUDA_LIBS_PATH ${_tmp})
-    endforeach()
-  endif()
-
-  list(REMOVE_DUPLICATES CUDA_LIBS_PATH)
-  link_directories(${CUDA_LIBS_PATH})
-
-  set(CUDA_LIBRARIES_ABS ${CUDA_LIBRARIES})
-  ocv_convert_to_lib_name(CUDA_LIBRARIES ${CUDA_LIBRARIES})
-  set(CUDA_npp_LIBRARY_ABS ${CUDA_npp_LIBRARY})
-  ocv_convert_to_lib_name(CUDA_npp_LIBRARY ${CUDA_npp_LIBRARY})
-  if(HAVE_CUBLAS)
-    set(CUDA_cublas_LIBRARY_ABS ${CUDA_cublas_LIBRARY})
-    ocv_convert_to_lib_name(CUDA_cublas_LIBRARY ${CUDA_cublas_LIBRARY})
-  endif()
-
-  if(HAVE_CUFFT)
-    set(CUDA_cufft_LIBRARY_ABS ${CUDA_cufft_LIBRARY})
-    ocv_convert_to_lib_name(CUDA_cufft_LIBRARY ${CUDA_cufft_LIBRARY})
-  endif()
-endif()
@@ -38,9 +38,7 @@ if(PYTHON_EXECUTABLE)

  if(NOT ANDROID AND NOT IOS)
    ocv_check_environment_variables(PYTHON_LIBRARY PYTHON_INCLUDE_DIR)
-    if(CMAKE_CROSSCOMPILING)
-      find_host_package(PythonLibs ${PYTHON_VERSION_MAJOR_MINOR})
-    elseif(CMAKE_VERSION VERSION_GREATER 2.8.8 AND PYTHON_VERSION_FULL)
+    if(CMAKE_VERSION VERSION_GREATER 2.8.8 AND PYTHON_VERSION_FULL)
      find_host_package(PythonLibs ${PYTHON_VERSION_FULL} EXACT)
    else()
      find_host_package(PythonLibs ${PYTHON_VERSION_FULL})
@@ -83,39 +81,24 @@ if(PYTHON_EXECUTABLE)
    SET(PYTHON_PACKAGES_PATH "${_PYTHON_PACKAGES_PATH}" CACHE PATH "Where to install the python packages.")

    if(NOT PYTHON_NUMPY_INCLUDE_DIR)
-      if(CMAKE_CROSSCOMPILING)
-        message(STATUS "Cannot probe for Python/Numpy support (because we are cross-compiling OpenCV)")
-        message(STATUS "If you want to enable Python/Numpy support, set the following variables:")
-        message(STATUS "  PYTHON_INCLUDE_PATH")
-        message(STATUS "  PYTHON_LIBRARIES")
-        message(STATUS "  PYTHON_NUMPY_INCLUDE_DIR")
-      else()
-        # Attempt to discover the NumPy include directory. If this succeeds, then build python API with NumPy
-        execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import os; os.environ['DISTUTILS_USE_SDK']='1'; import numpy.distutils; print numpy.distutils.misc_util.get_numpy_include_dirs()[0]"
-                        RESULT_VARIABLE PYTHON_NUMPY_PROCESS
-                        OUTPUT_VARIABLE PYTHON_NUMPY_INCLUDE_DIR
-                        OUTPUT_STRIP_TRAILING_WHITESPACE)
+      # Attempt to discover the NumPy include directory. If this succeeds, then build python API with NumPy
+      execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import os; os.environ['DISTUTILS_USE_SDK']='1'; import numpy.distutils; print numpy.distutils.misc_util.get_numpy_include_dirs()[0]"
+                      RESULT_VARIABLE PYTHON_NUMPY_PROCESS
+                      OUTPUT_VARIABLE PYTHON_NUMPY_INCLUDE_DIR
+                      OUTPUT_STRIP_TRAILING_WHITESPACE)

-        if(NOT PYTHON_NUMPY_PROCESS EQUAL 0)
-          unset(PYTHON_NUMPY_INCLUDE_DIR)
-        endif()
+      if(PYTHON_NUMPY_PROCESS EQUAL 0)
+        file(TO_CMAKE_PATH "${PYTHON_NUMPY_INCLUDE_DIR}" _PYTHON_NUMPY_INCLUDE_DIR)
+        set(PYTHON_NUMPY_INCLUDE_DIR ${_PYTHON_NUMPY_INCLUDE_DIR} CACHE PATH "Path to numpy headers")
      endif()
    endif()

    if(PYTHON_NUMPY_INCLUDE_DIR)
-      file(TO_CMAKE_PATH "${PYTHON_NUMPY_INCLUDE_DIR}" _PYTHON_NUMPY_INCLUDE_DIR)
-      set(PYTHON_NUMPY_INCLUDE_DIR ${_PYTHON_NUMPY_INCLUDE_DIR} CACHE PATH "Path to numpy headers")
      set(PYTHON_USE_NUMPY TRUE)
-      if(CMAKE_CROSSCOMPILING)
-        if(NOT PYTHON_NUMPY_VERSION)
-          set(PYTHON_NUMPY_VERSION "undefined - cannot be probed because of the cross-compilation")
-        endif()
-      else()
-        execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import numpy; print numpy.version.version"
+      execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import numpy; print numpy.version.version"
                        RESULT_VARIABLE PYTHON_NUMPY_PROCESS
                        OUTPUT_VARIABLE PYTHON_NUMPY_VERSION
                        OUTPUT_STRIP_TRAILING_WHITESPACE)
-      endif()
    endif()
  endif(NOT ANDROID AND NOT IOS)

@@ -1,53 +0,0 @@
-if(NOT WITH_VTK OR ANDROID OR IOS)
-  return()
-endif()
-
-# VTK 6.x components
-find_package(VTK QUIET COMPONENTS vtkRenderingOpenGL vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE)
-
-# VTK 5.x components
-if(NOT VTK_FOUND)
-  find_package(VTK QUIET COMPONENTS vtkCommon NO_MODULE)
-endif()
-
-if(NOT VTK_FOUND)
-  set(HAVE_VTK OFF)
-  message(STATUS "VTK is not found. Please set -DVTK_DIR in CMake to VTK build directory, or to VTK install subdirectory with VTKConfig.cmake file")
-  return()
-endif()
-
-# Don't support ealier VTKs
-if(${VTK_VERSION} VERSION_LESS "5.8.0")
-  message(STATUS "VTK support is disabled. VTK ver. 5.8.0 is minimum required, but found VTK ver. ${VTK_VERSION}")
-  return()
-endif()
-
-# Different Qt versions can't be linked together
-if(HAVE_QT5 AND ${VTK_VERSION} VERSION_LESS "6.0.0")
-  if(VTK_USE_QT)
-    message(STATUS "VTK support is disabled. Incompatible combination: OpenCV + Qt5 and VTK ver.${VTK_VERSION} + Qt4")
-  endif()
-endif()
-
-# Different Qt versions can't be linked together. VTK 6.0.0 doesn't provide a way to get Qt version it was linked with
-if(HAVE_QT5 AND ${VTK_VERSION} VERSION_EQUAL "6.0.0" AND NOT DEFINED FORCE_VTK)
-  message(STATUS "VTK support is disabled. Possible incompatible combination: OpenCV+Qt5, and VTK ver.${VTK_VERSION} with Qt4")
-  message(STATUS "If it is known that VTK was compiled without Qt4, please define '-DFORCE_VTK=TRUE' flag in CMake")
-  return()
-endif()
-
-# Different Qt versions can't be linked together
-if(HAVE_QT AND ${VTK_VERSION} VERSION_GREATER "6.0.0" AND NOT ${VTK_QT_VERSION} STREQUAL "")
-  if(HAVE_QT5 AND ${VTK_QT_VERSION} EQUAL "4")
-    message(STATUS "VTK support is disabled. Incompatible combination: OpenCV + Qt5 and VTK ver.${VTK_VERSION} + Qt4")
-    return()
-  endif()
-
-  if(NOT HAVE_QT5 AND ${VTK_QT_VERSION} EQUAL "5")
-    message(STATUS "VTK support is disabled. Incompatible combination: OpenCV + Qt4 and VTK ver.${VTK_VERSION} + Qt5")
-    return()
-  endif()
-endif()
-
-set(HAVE_VTK ON)
-message(STATUS "Found VTK ver. ${VTK_VERSION} (usefile: ${VTK_USE_FILE})")
@@ -4,7 +4,7 @@
 CONFIGURE_FILE(
  "${OpenCV_SOURCE_DIR}/cmake/templates/cmake_uninstall.cmake.in"
  "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-  @ONLY)
+  IMMEDIATE @ONLY)

 ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
 if(ENABLE_SOLUTION_FOLDERS)
@@ -163,16 +163,9 @@ function(set_ipp_new_libraries _LATEST_VERSION)
        ${IPP_LIB_PREFIX}${IPP_PREFIX}${IPPCV}${IPP_SUFFIX}${IPP_LIB_SUFFIX}
        ${IPP_LIB_PREFIX}${IPP_PREFIX}${IPPI}${IPP_SUFFIX}${IPP_LIB_SUFFIX}
        ${IPP_LIB_PREFIX}${IPP_PREFIX}${IPPS}${IPP_SUFFIX}${IPP_LIB_SUFFIX}
-        ${IPP_LIB_PREFIX}${IPP_PREFIX}${IPPCORE}${IPP_SUFFIX}${IPP_LIB_SUFFIX})
+        ${IPP_LIB_PREFIX}${IPP_PREFIX}${IPPCORE}${IPP_SUFFIX}${IPP_LIB_SUFFIX}
+        PARENT_SCOPE)

-    if (UNIX)
-        set(IPP_LIBRARIES
-            ${IPP_LIBRARIES}
-            ${IPP_LIB_PREFIX}irc${CMAKE_SHARED_LIBRARY_SUFFIX}
-            ${IPP_LIB_PREFIX}imf${CMAKE_SHARED_LIBRARY_SUFFIX}
-            ${IPP_LIB_PREFIX}svml${CMAKE_SHARED_LIBRARY_SUFFIX})
-    endif()
-    set(IPP_LIBRARIES ${IPP_LIBRARIES} PARENT_SCOPE)
    return()

 endfunction()
@@ -215,39 +208,19 @@ function(set_ipp_variables _LATEST_VERSION)
        set(IPP_INCLUDE_DIRS ${IPP_ROOT_DIR}/include PARENT_SCOPE)

        if (APPLE)
-            set(IPP_LIBRARY_DIRS ${IPP_ROOT_DIR}/lib)
+            set(IPP_LIBRARY_DIRS ${IPP_ROOT_DIR}/lib PARENT_SCOPE)
        elseif (IPP_X64)
            if(NOT EXISTS ${IPP_ROOT_DIR}/lib/intel64)
                message(SEND_ERROR "IPP EM64T libraries not found")
            endif()
-            set(IPP_LIBRARY_DIRS ${IPP_ROOT_DIR}/lib/intel64)
+            set(IPP_LIBRARY_DIRS ${IPP_ROOT_DIR}/lib/intel64 PARENT_SCOPE)
        else()
            if(NOT EXISTS ${IPP_ROOT_DIR}/lib/ia32)
                message(SEND_ERROR "IPP IA32 libraries not found")
            endif()
-            set(IPP_LIBRARY_DIRS ${IPP_ROOT_DIR}/lib/ia32)
+            set(IPP_LIBRARY_DIRS ${IPP_ROOT_DIR}/lib/ia32 PARENT_SCOPE)
        endif()

-        if (UNIX)
-            get_filename_component(INTEL_COMPILER_LIBRARY_DIR ${IPP_ROOT_DIR}/../lib REALPATH)
-            if (IPP_X64)
-                if(NOT EXISTS ${INTEL_COMPILER_LIBRARY_DIR}/intel64)
-                    message(SEND_ERROR "Intel compiler EM64T libraries not found")
-                endif()
-                set(IPP_LIBRARY_DIRS
-                    ${IPP_LIBRARY_DIRS}
-                    ${INTEL_COMPILER_LIBRARY_DIR}/intel64)
-            else()
-                if(NOT EXISTS ${INTEL_COMPILER_LIBRARY_DIR}/ia32)
-                    message(SEND_ERROR "Intel compiler IA32 libraries not found")
-                endif()
-                set(IPP_LIBRARY_DIRS
-                    ${IPP_LIBRARY_DIRS}
-                    ${INTEL_COMPILER_LIBRARY_DIR}/ia32)
-            endif()
-        endif()
-        set(IPP_LIBRARY_DIRS ${IPP_LIBRARY_DIRS} PARENT_SCOPE)
-
        # set IPP_LIBRARIES variable (7.x or 8.x lib names)
        set_ipp_new_libraries(${_LATEST_VERSION})
        set(IPP_LIBRARIES ${IPP_LIBRARIES} PARENT_SCOPE)
@@ -12,42 +12,15 @@ endif(WITH_VFW)

 # --- GStreamer ---
 ocv_clear_vars(HAVE_GSTREAMER)
-# try to find gstreamer 1.x first
-if(WITH_GSTREAMER AND NOT WITH_GSTREAMER_0_10)
-  CHECK_MODULE(gstreamer-base-1.0 HAVE_GSTREAMER_BASE)
-  CHECK_MODULE(gstreamer-video-1.0 HAVE_GSTREAMER_VIDEO)
-  CHECK_MODULE(gstreamer-app-1.0 HAVE_GSTREAMER_APP)
-  CHECK_MODULE(gstreamer-riff-1.0 HAVE_GSTREAMER_RIFF)
-  CHECK_MODULE(gstreamer-pbutils-1.0 HAVE_GSTREAMER_PBUTILS)
-
-  if(HAVE_GSTREAMER_BASE AND HAVE_GSTREAMER_VIDEO AND HAVE_GSTREAMER_APP AND HAVE_GSTREAMER_RIFF AND HAVE_GSTREAMER_PBUTILS)
-      set(HAVE_GSTREAMER TRUE)
-      set(GSTREAMER_BASE_VERSION ${ALIASOF_gstreamer-base-1.0_VERSION})
-      set(GSTREAMER_VIDEO_VERSION ${ALIASOF_gstreamer-video-1.0_VERSION})
-      set(GSTREAMER_APP_VERSION ${ALIASOF_gstreamer-app-1.0_VERSION})
-      set(GSTREAMER_RIFF_VERSION ${ALIASOF_gstreamer-riff-1.0_VERSION})
-      set(GSTREAMER_PBUTILS_VERSION ${ALIASOF_gstreamer-pbutils-1.0_VERSION})
+if(WITH_GSTREAMER)
+  CHECK_MODULE(gstreamer-base-0.10 HAVE_GSTREAMER)
+  if(HAVE_GSTREAMER)
+    CHECK_MODULE(gstreamer-app-0.10 HAVE_GSTREAMER)
  endif()
-
-endif(WITH_GSTREAMER AND NOT WITH_GSTREAMER_0_10)
-
-# if gstreamer 1.x was not found, or we specified we wanted 0.10, try to find it
-if(WITH_GSTREAMER_0_10 OR NOT HAVE_GSTREAMER)
-  CHECK_MODULE(gstreamer-base-0.10 HAVE_GSTREAMER_BASE)
-  CHECK_MODULE(gstreamer-video-0.10 HAVE_GSTREAMER_VIDEO)
-  CHECK_MODULE(gstreamer-app-0.10 HAVE_GSTREAMER_APP)
-  CHECK_MODULE(gstreamer-riff-0.10 HAVE_GSTREAMER_RIFF)
-  CHECK_MODULE(gstreamer-pbutils-0.10 HAVE_GSTREAMER_PBUTILS)
-
-  if(HAVE_GSTREAMER_BASE AND HAVE_GSTREAMER_VIDEO AND HAVE_GSTREAMER_APP AND HAVE_GSTREAMER_RIFF AND HAVE_GSTREAMER_PBUTILS)
-      set(HAVE_GSTREAMER TRUE)
-      set(GSTREAMER_BASE_VERSION ${ALIASOF_gstreamer-base-0.10_VERSION})
-      set(GSTREAMER_VIDEO_VERSION ${ALIASOF_gstreamer-video-0.10_VERSION})
-      set(GSTREAMER_APP_VERSION ${ALIASOF_gstreamer-app-0.10_VERSION})
-      set(GSTREAMER_RIFF_VERSION ${ALIASOF_gstreamer-riff-0.10_VERSION})
-      set(GSTREAMER_PBUTILS_VERSION ${ALIASOF_gstreamer-pbutils-0.10_VERSION})
+  if(HAVE_GSTREAMER)
+    CHECK_MODULE(gstreamer-video-0.10 HAVE_GSTREAMER)
  endif()
-endif(WITH_GSTREAMER_0_10 OR NOT HAVE_GSTREAMER)
+endif(WITH_GSTREAMER)

 # --- unicap ---
 ocv_clear_vars(HAVE_UNICAP)
@@ -153,13 +126,7 @@ endif(WITH_XINE)
 ocv_clear_vars(HAVE_LIBV4L HAVE_CAMV4L HAVE_CAMV4L2 HAVE_VIDEOIO)
 if(WITH_V4L)
  if(WITH_LIBV4L)
-    CHECK_MODULE(libv4l1 HAVE_LIBV4L1)
-    CHECK_MODULE(libv4l2 HAVE_LIBV4L2)
-    if(HAVE_LIBV4L1 AND HAVE_LIBV4L2)
-      set(HAVE_LIBV4L YES)
-    else()
-      set(HAVE_LIBV4L NO)
-    endif()
+    CHECK_MODULE(libv4l1 HAVE_LIBV4L)
  endif()
  CHECK_INCLUDE_FILE(linux/videodev.h HAVE_CAMV4L)
  CHECK_INCLUDE_FILE(linux/videodev2.h HAVE_CAMV4L2)
@@ -255,7 +222,6 @@ if(WITH_DSHOW)
 endif(WITH_DSHOW)

 # --- VideoInput/Microsoft Media Foundation ---
-ocv_clear_vars(HAVE_MSMF)
 if(WITH_MSMF)
  check_include_file(Mfapi.h HAVE_MSMF)
 endif(WITH_MSMF)
@@ -31,12 +31,6 @@ if(WIN32)
  else()
    set(XIMEA_FOUND 0)
  endif()
-elseif(APPLE)
-  if(EXISTS /Library/Frameworks/m3api.framework)
-    set(XIMEA_FOUND 1)
-  else()
-    set(XIMEA_FOUND 0)
-  endif()
 else()
  if(EXISTS /opt/XIMEA)
    set(XIMEA_FOUND 1)
@@ -56,11 +56,8 @@ if(ANDROID)

  # remove CUDA runtime and NPP from regular deps
  # it can be added separately if needed.
-  ocv_list_filterout(OPENCV_EXTRA_COMPONENTS_CONFIGMAKE "cusparse")
-  ocv_list_filterout(OPENCV_EXTRA_COMPONENTS_CONFIGMAKE "cufft")
-  ocv_list_filterout(OPENCV_EXTRA_COMPONENTS_CONFIGMAKE "cublas")
-  ocv_list_filterout(OPENCV_EXTRA_COMPONENTS_CONFIGMAKE "npp")
-  ocv_list_filterout(OPENCV_EXTRA_COMPONENTS_CONFIGMAKE "cudart")
+  ocv_list_filterout(OPENCV_EXTRA_COMPONENTS_CONFIGMAKE "libcu")
+  ocv_list_filterout(OPENCV_EXTRA_COMPONENTS_CONFIGMAKE "libnpp")

  if(HAVE_CUDA)
    # CUDA runtime libraries and are required always
@@ -131,7 +128,7 @@ if(ANDROID)
  set(OPENCV_LIBS_DIR_CONFIGCMAKE "\$(OPENCV_THIS_DIR)/lib/\$(OPENCV_TARGET_ARCH_ABI)")
  set(OPENCV_3RDPARTY_LIBS_DIR_CONFIGCMAKE "\$(OPENCV_THIS_DIR)/3rdparty/lib/\$(OPENCV_TARGET_ARCH_ABI)")

-  configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCV.mk.in" "${CMAKE_BINARY_DIR}/OpenCV.mk" @ONLY)
+  configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCV.mk.in" "${CMAKE_BINARY_DIR}/OpenCV.mk" IMMEDIATE @ONLY)

  # -------------------------------------------------------------------------------------------
  #  Part 2/2: ${BIN_DIR}/unix-install/OpenCV.mk -> For use with "make install"
@@ -141,6 +138,6 @@ if(ANDROID)
  set(OPENCV_LIBS_DIR_CONFIGCMAKE "\$(OPENCV_THIS_DIR)/../libs/\$(OPENCV_TARGET_ARCH_ABI)")
  set(OPENCV_3RDPARTY_LIBS_DIR_CONFIGCMAKE "\$(OPENCV_THIS_DIR)/../3rdparty/libs/\$(OPENCV_TARGET_ARCH_ABI)")

-  configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCV.mk.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCV.mk" @ONLY)
+  configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCV.mk.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCV.mk" IMMEDIATE @ONLY)
  install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCV.mk DESTINATION ${OPENCV_CONFIG_INSTALL_PATH} COMPONENT dev)
 endif(ANDROID)
@@ -83,9 +83,9 @@ endif()

 export(TARGETS ${OpenCVModules_TARGETS} FILE "${CMAKE_BINARY_DIR}/OpenCVModules${modules_file_suffix}.cmake")

-configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/OpenCVConfig.cmake" @ONLY)
+configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/OpenCVConfig.cmake" IMMEDIATE @ONLY)
 #support for version checking when finding opencv. find_package(OpenCV 2.3.1 EXACT) should now work.
-configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCVConfig-version.cmake.in" "${CMAKE_BINARY_DIR}/OpenCVConfig-version.cmake" @ONLY)
+configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCVConfig-version.cmake.in" "${CMAKE_BINARY_DIR}/OpenCVConfig-version.cmake" IMMEDIATE @ONLY)

 # --------------------------------------------------------------------------------------------
 #  Part 2/3: ${BIN_DIR}/unix-install/OpenCVConfig.cmake -> For use *with* "make install"
@@ -98,8 +98,8 @@ if(INSTALL_TO_MANGLED_PATHS)
  set(OpenCV_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/${OpenCV_3RDPARTY_LIB_DIRS_CONFIGCMAKE}\"")
 endif()

-configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake" @ONLY)
-configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCVConfig-version.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake" @ONLY)
+configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake" IMMEDIATE @ONLY)
+configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCVConfig-version.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake" IMMEDIATE @ONLY)

 if(UNIX) # ANDROID configuration is created here also
  #http://www.vtk.org/Wiki/CMake/Tutorials/Packaging reference
@@ -131,8 +131,8 @@ if(WIN32)
  set(OpenCV2_INCLUDE_DIRS_CONFIGCMAKE "\"\"")

  exec_program(mkdir ARGS "-p \"${CMAKE_BINARY_DIR}/win-install/\"" OUTPUT_VARIABLE RET_VAL)
-  configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/win-install/OpenCVConfig.cmake" @ONLY)
-  configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCVConfig-version.cmake.in" "${CMAKE_BINARY_DIR}/win-install/OpenCVConfig-version.cmake" @ONLY)
+  configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/win-install/OpenCVConfig.cmake" IMMEDIATE @ONLY)
+  configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCVConfig-version.cmake.in" "${CMAKE_BINARY_DIR}/win-install/OpenCVConfig-version.cmake" IMMEDIATE @ONLY)
  if(BUILD_SHARED_LIBS)
    install(FILES "${CMAKE_BINARY_DIR}/win-install/OpenCVConfig.cmake" DESTINATION "${OpenCV_INSTALL_BINARIES_PREFIX}lib" COMPONENT dev)
    install(EXPORT OpenCVModules DESTINATION "${OpenCV_INSTALL_BINARIES_PREFIX}lib" FILE OpenCVModules${modules_file_suffix}.cmake COMPONENT dev)
@@ -78,7 +78,7 @@ else()
 endif()
 configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/opencv-XXX.pc.in"
               "${CMAKE_BINARY_DIR}/unix-install/${OPENCV_PC_FILE_NAME}"
-               @ONLY)
+               @ONLY IMMEDIATE)

 if(UNIX AND NOT ANDROID)
  install(FILES ${CMAKE_BINARY_DIR}/unix-install/${OPENCV_PC_FILE_NAME} DESTINATION ${OPENCV_LIB_INSTALL_PATH}/pkgconfig COMPONENT dev)
@@ -27,8 +27,7 @@
 # The verbose template for OpenCV module:
 #
 #   ocv_add_module(modname <dependencies>)
-#   ocv_glob_module_sources(([EXCLUDE_CUDA] <extra sources&headers>)
-#                          or glob them manually and ocv_set_module_sources(...)
+#   ocv_glob_module_sources() or glob them manually and ocv_set_module_sources(...)
 #   ocv_module_include_directories(<extra include directories>)
 #   ocv_create_module()
 #   <add extra link dependencies, compiler options, etc>
@@ -136,13 +135,13 @@ macro(ocv_add_module _name)

    # parse list of dependencies
    if("${ARGV1}" STREQUAL "INTERNAL" OR "${ARGV1}" STREQUAL "BINDINGS")
-      set(OPENCV_MODULE_${the_module}_CLASS "${ARGV1}" CACHE INTERNAL "The category of the module")
+      set(OPENCV_MODULE_${the_module}_CLASS "${ARGV1}" CACHE INTERNAL "The cathegory of the module")
      set(__ocv_argn__ ${ARGN})
      list(REMOVE_AT __ocv_argn__ 0)
      ocv_add_dependencies(${the_module} ${__ocv_argn__})
      unset(__ocv_argn__)
    else()
-      set(OPENCV_MODULE_${the_module}_CLASS "PUBLIC" CACHE INTERNAL "The category of the module")
+      set(OPENCV_MODULE_${the_module}_CLASS "PUBLIC" CACHE INTERNAL "The cathegory of the module")
      ocv_add_dependencies(${the_module} ${ARGN})
      if(BUILD_${the_module})
        set(OPENCV_MODULES_PUBLIC ${OPENCV_MODULES_PUBLIC} "${the_module}" CACHE INTERNAL "List of OpenCV modules marked for export")
@@ -479,38 +478,22 @@ endmacro()

 # finds and sets headers and sources for the standard OpenCV module
 # Usage:
-# ocv_glob_module_sources([EXCLUDE_CUDA] <extra sources&headers in the same format as used in ocv_set_module_sources>)
+# ocv_glob_module_sources(<extra sources&headers in the same format as used in ocv_set_module_sources>)
 macro(ocv_glob_module_sources)
-  set(_argn ${ARGN})
-  list(FIND _argn "EXCLUDE_CUDA" exclude_cuda)
-  if(NOT exclude_cuda EQUAL -1)
-    list(REMOVE_AT _argn ${exclude_cuda})
-  endif()
-
  file(GLOB_RECURSE lib_srcs "src/*.cpp")
  file(GLOB_RECURSE lib_int_hdrs "src/*.hpp" "src/*.h")
  file(GLOB lib_hdrs "include/opencv2/${name}/*.hpp" "include/opencv2/${name}/*.h")
  file(GLOB lib_hdrs_detail "include/opencv2/${name}/detail/*.hpp" "include/opencv2/${name}/detail/*.h")
-  file(GLOB_RECURSE lib_srcs_apple "src/*.mm")
-  if (APPLE)
-    list(APPEND lib_srcs ${lib_srcs_apple})
-  endif()

-  if (exclude_cuda EQUAL -1)
-    file(GLOB lib_cuda_srcs "src/cuda/*.cu")
-    set(cuda_objs "")
-    set(lib_cuda_hdrs "")
-    if(HAVE_CUDA)
-      ocv_include_directories(${CUDA_INCLUDE_DIRS})
-      file(GLOB lib_cuda_hdrs "src/cuda/*.hpp")
+  file(GLOB lib_cuda_srcs "src/cuda/*.cu")
+  set(cuda_objs "")
+  set(lib_cuda_hdrs "")
+  if(HAVE_CUDA)
+    ocv_include_directories(${CUDA_INCLUDE_DIRS})
+    file(GLOB lib_cuda_hdrs "src/cuda/*.hpp")

-      ocv_cuda_compile(cuda_objs ${lib_cuda_srcs} ${lib_cuda_hdrs})
-      source_group("Src\\Cuda"      FILES ${lib_cuda_srcs} ${lib_cuda_hdrs})
-    endif()
-  else()
-    set(cuda_objs "")
-    set(lib_cuda_srcs "")
-    set(lib_cuda_hdrs "")
+    ocv_cuda_compile(cuda_objs ${lib_cuda_srcs} ${lib_cuda_hdrs})
+    source_group("Src\\Cuda"      FILES ${lib_cuda_srcs} ${lib_cuda_hdrs})
  endif()

  source_group("Src" FILES ${lib_srcs} ${lib_int_hdrs})
@@ -526,33 +509,11 @@ macro(ocv_glob_module_sources)
    list(APPEND lib_srcs ${cl_kernels} "${CMAKE_CURRENT_BINARY_DIR}/opencl_kernels.cpp" "${CMAKE_CURRENT_BINARY_DIR}/opencl_kernels.hpp")
  endif()

-  if(ENABLE_AVX)
-    file(GLOB avx_srcs "src/avx/*.cpp")
-    foreach(src ${avx_srcs})
-      if(CMAKE_COMPILER_IS_GNUCXX)
-        set_source_files_properties(${src} PROPERTIES COMPILE_FLAGS -mavx)
-      elseif(MSVC AND NOT MSVC_VERSION LESS 1600)
-        set_source_files_properties(${src} PROPERTIES COMPILE_FLAGS /arch:AVX)
-      endif()
-    endforeach()
-  endif()
-
-  if(ENABLE_AVX2)
-    file(GLOB avx2_srcs "src/avx2/*.cpp")
-    foreach(src ${avx2_srcs})
-      if(CMAKE_COMPILER_IS_GNUCXX)
-        set_source_files_properties(${src} PROPERTIES COMPILE_FLAGS -mavx2)
-      elseif(MSVC AND NOT MSVC_VERSION LESS 1800)
-        set_source_files_properties(${src} PROPERTIES COMPILE_FLAGS /arch:AVX2)
-      endif()
-    endforeach()
-  endif()
-
  source_group("Include" FILES ${lib_hdrs})
  source_group("Include\\detail" FILES ${lib_hdrs_detail})

-  ocv_set_module_sources(${_argn} HEADERS ${lib_hdrs} ${lib_hdrs_detail}
-                         SOURCES ${lib_srcs} ${lib_int_hdrs} ${cuda_objs} ${lib_cuda_srcs} ${lib_cuda_hdrs})
+  ocv_set_module_sources(${ARGN} HEADERS ${lib_hdrs} ${lib_hdrs_detail}
+                                 SOURCES ${lib_srcs} ${lib_int_hdrs} ${cuda_objs} ${lib_cuda_srcs} ${lib_cuda_hdrs})
 endmacro()

 # creates OpenCV module in current folder
@@ -651,20 +612,11 @@ endmacro()
 # short command for adding simple OpenCV module
 # see ocv_add_module for argument details
 # Usage:
-# ocv_define_module(module_name  [INTERNAL] [EXCLUDE_CUDA] [REQUIRED] [<list of dependencies>] [OPTIONAL <list of optional dependencies>])
+# ocv_define_module(module_name  [INTERNAL] [REQUIRED] [<list of dependencies>] [OPTIONAL <list of optional dependencies>])
 macro(ocv_define_module module_name)
-  set(_argn ${ARGN})
-  set(exclude_cuda "")
-  foreach(arg ${_argn})
-    if("${arg}" STREQUAL "EXCLUDE_CUDA")
-      set(exclude_cuda "${arg}")
-      list(REMOVE_ITEM _argn ${arg})
-    endif()
-  endforeach()
-
-  ocv_add_module(${module_name} ${_argn})
+  ocv_add_module(${module_name} ${ARGN})
  ocv_module_include_directories()
-  ocv_glob_module_sources(${exclude_cuda})
+  ocv_glob_module_sources()
  ocv_create_module()
  ocv_add_precompiled_headers(${the_module})

@@ -792,8 +744,8 @@ function(ocv_add_accuracy_tests)
      endif()

      get_native_precompiled_header(${the_target} test_precomp.hpp)
-      add_executable(${the_target} ${OPENCV_TEST_${the_module}_SOURCES} ${${the_target}_pch})

+      add_executable(${the_target} ${OPENCV_TEST_${the_module}_SOURCES} ${${the_target}_pch})
      target_link_libraries(${the_target} ${OPENCV_MODULE_${the_module}_DEPS} ${test_deps} ${OPENCV_LINKER_LIBS})
      add_dependencies(opencv_tests ${the_target})

@@ -1,6 +1,3 @@
-# Use patched version of CPACK to build accurate set of Debian packages
-# https://github.com/asmorkalov/CMake/tree/deb_generator_improvement
-
 if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
 set(CPACK_set_DESTDIR "on")

@@ -21,8 +18,6 @@ OpenCV makes it easy for businesses to utilize and modify the code.")
  set(CPACK_PACKAGE_VERSION "${OPENCV_VCSVERSION}")
 endif(NOT OPENCV_CUSTOM_PACKAGE_INFO)

-set(CPACK_STRIP_FILES 1)
-
 #arch
 if(X86)
  set(CPACK_DEBIAN_ARCHITECTURE "i386")
@@ -69,61 +64,36 @@ set(CPACK_COMPONENT_dev_DEPENDS libs)
 set(CPACK_COMPONENT_docs_DEPENDS libs)
 set(CPACK_COMPONENT_java_DEPENDS libs)
 set(CPACK_COMPONENT_python_DEPENDS libs)
-set(CPACK_DEB_python_PACKAGE_DEPENDS "python${PYTHON_VERSION_MAJOR_MINOR}")
 set(CPACK_COMPONENT_tests_DEPENDS libs)
-if (HAVE_opencv_python)
-  set(CPACK_DEB_tests_PACKAGE_DEPENDS "python${PYTHON_VERSION_MAJOR_MINOR}, python-py | python-pytest")
-endif()

 if(HAVE_CUDA)
  string(REPLACE "." "-" cuda_version_suffix ${CUDA_VERSION})
-  if(CUDA_VERSION VERSION_LESS "6.5")
-    set(CPACK_DEB_libs_PACKAGE_DEPENDS "cuda-core-libs-${cuda_version_suffix}, cuda-extra-libs-${cuda_version_suffix}")
-    set(CPACK_DEB_dev_PACKAGE_DEPENDS "cuda-headers-${cuda_version_suffix}")
-  else()
-    set(CPACK_DEB_libs_PACKAGE_DEPENDS "cuda-cudart-${cuda_version_suffix}, cuda-npp-${cuda_version_suffix}")
-    set(CPACK_DEB_dev_PACKAGE_DEPENDS "cuda-cudart-dev-${cuda_version_suffix}, cuda-npp-dev-${cuda_version_suffix}")
-    if(HAVE_CUFFT)
-      set(CPACK_DEB_libs_PACKAGE_DEPENDS "${CPACK_DEB_libs_PACKAGE_DEPENDS}, cuda-cufft-${cuda_version_suffix}")
-      set(CPACK_DEB_dev_PACKAGE_DEPENDS "${CPACK_DEB_dev_PACKAGE_DEPENDS}, cuda-cufft-dev-${cuda_version_suffix}")
-    endif()
-    if(HAVE_HAVE_CUBLAS)
-      set(CPACK_DEB_libs_PACKAGE_DEPENDS "${CPACK_DEB_libs_PACKAGE_DEPENDS}, cuda-cublas-${cuda_version_suffix}")
-      set(CPACK_DEB_dev_PACKAGE_DEPENDS "${CPACK_DEB_dev_PACKAGE_DEPENDS}, cuda-cublas-dev-${cuda_version_suffix}")
-    endif()
-  endif()
-
+  set(CPACK_DEB_libs_PACKAGE_DEPENDS "cuda-core-libs-${cuda_version_suffix}, cuda-extra-libs-${cuda_version_suffix}")
  set(CPACK_COMPONENT_dev_DEPENDS libs)
+  set(CPACK_DEB_dev_PACKAGE_DEPENDS "cuda-headers-${cuda_version_suffix}")
 endif()

 if(NOT OPENCV_CUSTOM_PACKAGE_INFO)
  set(CPACK_COMPONENT_libs_DISPLAY_NAME "lib${CMAKE_PROJECT_NAME}")
  set(CPACK_COMPONENT_libs_DESCRIPTION "Open Computer Vision Library")
-  set(CPACK_COMPONENT_libs_SECTION "libs")

  set(CPACK_COMPONENT_python_DISPLAY_NAME "lib${CMAKE_PROJECT_NAME}-python")
  set(CPACK_COMPONENT_python_DESCRIPTION "Python bindings for Open Source Computer Vision Library")
-  set(CPACK_COMPONENT_python_SECTION "python")

  set(CPACK_COMPONENT_java_DISPLAY_NAME "lib${CMAKE_PROJECT_NAME}-java")
  set(CPACK_COMPONENT_java_DESCRIPTION "Java bindings for Open Source Computer Vision Library")
-  set(CPACK_COMPONENT_java_SECTION "java")

  set(CPACK_COMPONENT_dev_DISPLAY_NAME "lib${CMAKE_PROJECT_NAME}-dev")
  set(CPACK_COMPONENT_dev_DESCRIPTION "Development files for Open Source Computer Vision Library")
-  set(CPACK_COMPONENT_dev_SECTION "libdevel")

  set(CPACK_COMPONENT_docs_DISPLAY_NAME "lib${CMAKE_PROJECT_NAME}-docs")
  set(CPACK_COMPONENT_docs_DESCRIPTION "Documentation for Open Source Computer Vision Library")
-  set(CPACK_COMPONENT_docs_SECTION "doc")

  set(CPACK_COMPONENT_samples_DISPLAY_NAME "lib${CMAKE_PROJECT_NAME}-samples")
  set(CPACK_COMPONENT_samples_DESCRIPTION "Samples for Open Source Computer Vision Library")
-  set(CPACK_COMPONENT_samples_SECTION "devel")

  set(CPACK_COMPONENT_tests_DISPLAY_NAME "lib${CMAKE_PROJECT_NAME}-tests")
  set(CPACK_COMPONENT_tests_DESCRIPTION "Accuracy and performance tests for Open Source Computer Vision Library")
-  set(CPACK_COMPONENT_tests_SECTION "misc")
 endif(NOT OPENCV_CUSTOM_PACKAGE_INFO)

 if(NOT OPENCV_CUSTOM_PACKAGE_LAYOUT)
@@ -152,14 +152,11 @@ ifeq ($(OPENCV_MK_$(OPENCV_TARGET_ARCH_ABI)_ALREADY_INCLUDED),)
    OPENCV_MK_$(OPENCV_TARGET_ARCH_ABI)_ALREADY_INCLUDED:=on
 endif

-ifeq ($(OPENCV_MK_$(OPENCV_TARGET_ARCH_ABI)_GPU_ALREADY_INCLUDED),)
-    ifeq ($(OPENCV_USE_GPU_MODULE),on)
-        include $(CLEAR_VARS)
-        LOCAL_MODULE:=opencv_gpu
-        LOCAL_SRC_FILES:=$(OPENCV_LIBS_DIR)/libopencv_gpu.a
-        include $(PREBUILT_STATIC_LIBRARY)
-    endif
-    OPENCV_MK_$(OPENCV_TARGET_ARCH_ABI)_GPU_ALREADY_INCLUDED:=on
+ifeq ($(OPENCV_USE_GPU_MODULE),on)
+    include $(CLEAR_VARS)
+    LOCAL_MODULE:=opencv_gpu
+    LOCAL_SRC_FILES:=$(OPENCV_LIBS_DIR)/libopencv_gpu.a
+    include $(PREBUILT_STATIC_LIBRARY)
 endif

 ifeq ($(OPENCV_LOCAL_CFLAGS),)
@@ -18,8 +18,8 @@
 #    This file will define the following variables:
 #      - OpenCV_LIBS                     : The list of all imported targets for OpenCV modules.
 #      - OpenCV_INCLUDE_DIRS             : The OpenCV include directories.
-#      - OpenCV_COMPUTE_CAPABILITIES     : The version of compute capability.
-#      - OpenCV_ANDROID_NATIVE_API_LEVEL : Minimum required level of Android API.
+#      - OpenCV_COMPUTE_CAPABILITIES     : The version of compute capability
+#      - OpenCV_ANDROID_NATIVE_API_LEVEL : Minimum required level of Android API
 #      - OpenCV_VERSION                  : The version of this OpenCV build: "@OPENCV_VERSION@"
 #      - OpenCV_VERSION_MAJOR            : Major version part of OpenCV_VERSION: "@OPENCV_VERSION_MAJOR@"
 #      - OpenCV_VERSION_MINOR            : Minor version part of OpenCV_VERSION: "@OPENCV_VERSION_MINOR@"
@@ -27,26 +27,22 @@
 #      - OpenCV_VERSION_TWEAK            : Tweak version part of OpenCV_VERSION: "@OPENCV_VERSION_TWEAK@"
 #
 #    Advanced variables:
-#      - OpenCV_SHARED                   : Use OpenCV as shared library
-#      - OpenCV_CONFIG_PATH              : Path to this OpenCVConfig.cmake
-#      - OpenCV_INSTALL_PATH             : OpenCV location (not set on Windows)
-#      - OpenCV_LIB_COMPONENTS           : Present OpenCV modules list
-#      - OpenCV_USE_MANGLED_PATHS        : Mangled OpenCV path flag
-#      - OpenCV_MODULES_SUFFIX           : The suffix for OpenCVModules-XXX.cmake file
-#      - OpenCV_HAVE_ANDROID_CAMERA      : Presence of Android native camera wrappers
+#      - OpenCV_SHARED
+#      - OpenCV_CONFIG_PATH
+#      - OpenCV_INSTALL_PATH  (not set on Windows)
+#      - OpenCV_LIB_COMPONENTS
+#      - OpenCV_USE_MANGLED_PATHS
+#      - OpenCV_HAVE_ANDROID_CAMERA
 #
 # ===================================================================================

-if(NOT DEFINED OpenCV_MODULES_SUFFIX)
-  if(ANDROID)
-    string(REPLACE - _ OpenCV_MODULES_SUFFIX "_${ANDROID_NDK_ABI_NAME}")
-  else()
-    set(OpenCV_MODULES_SUFFIX "")
-  endif()
+set(modules_file_suffix "")
+if(ANDROID)
+  string(REPLACE - _ modules_file_suffix "_${ANDROID_NDK_ABI_NAME}")
 endif()

 if(NOT TARGET opencv_core)
-  include(${CMAKE_CURRENT_LIST_DIR}/OpenCVModules${OpenCV_MODULES_SUFFIX}.cmake)
+  include(${CMAKE_CURRENT_LIST_DIR}/OpenCVModules${modules_file_suffix}.cmake)
 endif()

 # TODO All things below should be reviewed. What is about of moving this code into related modules (special vars/hooks/files)
@@ -60,11 +56,7 @@ set(OpenCV_USE_CUFFT    @HAVE_CUFFT@)
 set(OpenCV_USE_NVCUVID  @HAVE_NVCUVID@)

 # Android API level from which OpenCV has been compiled is remembered
-if(ANDROID)
-  set(OpenCV_ANDROID_NATIVE_API_LEVEL @OpenCV_ANDROID_NATIVE_API_LEVEL_CONFIGCMAKE@)
-else()
-  set(OpenCV_ANDROID_NATIVE_API_LEVEL 0)
-endif()
+set(OpenCV_ANDROID_NATIVE_API_LEVEL @OpenCV_ANDROID_NATIVE_API_LEVEL_CONFIGCMAKE@)

 # Some additional settings are required if OpenCV is built as static libs
 set(OpenCV_SHARED @BUILD_SHARED_LIBS@)
@@ -75,8 +67,8 @@ set(OpenCV_USE_MANGLED_PATHS @OpenCV_USE_MANGLED_PATHS_CONFIGCMAKE@)
 # Extract the directory where *this* file has been installed (determined at cmake run-time)
 get_filename_component(OpenCV_CONFIG_PATH "${CMAKE_CURRENT_LIST_FILE}" PATH CACHE)

-if(NOT WIN32 OR ANDROID)
-  if(ANDROID)
+if(NOT WIN32 OR OpenCV_ANDROID_NATIVE_API_LEVEL GREATER 0)
+  if(OpenCV_ANDROID_NATIVE_API_LEVEL GREATER 0)
    set(OpenCV_INSTALL_PATH "${OpenCV_CONFIG_PATH}/../../..")
  else()
    set(OpenCV_INSTALL_PATH "${OpenCV_CONFIG_PATH}/../..")
@@ -214,7 +206,7 @@ foreach(__opttype OPT DBG)
  SET(OpenCV_EXTRA_LIBS_${__opttype} "")

  # CUDA
-  if(OpenCV_CUDA_VERSION)
+  if(OpenCV_CUDA_VERSION AND (CMAKE_CROSSCOMPILING OR (WIN32 AND NOT OpenCV_SHARED)))
    if(NOT CUDA_FOUND)
      find_package(CUDA ${OpenCV_CUDA_VERSION} EXACT REQUIRED)
    else()
@@ -223,41 +215,32 @@ foreach(__opttype OPT DBG)
      endif()
    endif()

-    set(OpenCV_CUDA_LIBS_ABSPATH ${CUDA_LIBRARIES})
+    list(APPEND OpenCV_EXTRA_LIBS_${__opttype} ${CUDA_LIBRARIES})

    if(${CUDA_VERSION} VERSION_LESS "5.5")
-      list(APPEND OpenCV_CUDA_LIBS_ABSPATH ${CUDA_npp_LIBRARY})
+      list(APPEND OpenCV_EXTRA_LIBS_${__opttype} ${CUDA_npp_LIBRARY})
    else()
      find_cuda_helper_libs(nppc)
      find_cuda_helper_libs(nppi)
      find_cuda_helper_libs(npps)
-      list(APPEND OpenCV_CUDA_LIBS_ABSPATH ${CUDA_nppc_LIBRARY} ${CUDA_nppi_LIBRARY} ${CUDA_npps_LIBRARY})
+      list(APPEND OpenCV_EXTRA_LIBS_${__opttype} ${CUDA_nppc_LIBRARY} ${CUDA_nppi_LIBRARY} ${CUDA_npps_LIBRARY})
    endif()

    if(OpenCV_USE_CUBLAS)
-      list(APPEND OpenCV_CUDA_LIBS_ABSPATH ${CUDA_CUBLAS_LIBRARIES})
+      list(APPEND OpenCV_EXTRA_LIBS_${__opttype} ${CUDA_CUBLAS_LIBRARIES})
    endif()

    if(OpenCV_USE_CUFFT)
-      list(APPEND OpenCV_CUDA_LIBS_ABSPATH ${CUDA_CUFFT_LIBRARIES})
+      list(APPEND OpenCV_EXTRA_LIBS_${__opttype} ${CUDA_CUFFT_LIBRARIES})
    endif()

    if(OpenCV_USE_NVCUVID)
-      list(APPEND OpenCV_CUDA_LIBS_ABSPATH ${CUDA_nvcuvid_LIBRARIES})
+      list(APPEND OpenCV_EXTRA_LIBS_${__opttype} ${CUDA_nvcuvid_LIBRARIES})
    endif()

    if(WIN32)
-      list(APPEND OpenCV_CUDA_LIBS_ABSPATH ${CUDA_nvcuvenc_LIBRARIES})
+      list(APPEND OpenCV_EXTRA_LIBS_${__opttype} ${CUDA_nvcuvenc_LIBRARIES})
    endif()
-
-    set(OpenCV_CUDA_LIBS_RELPATH "")
-    foreach(l ${OpenCV_CUDA_LIBS_ABSPATH})
-      get_filename_component(_tmp ${l} PATH)
-      list(APPEND OpenCV_CUDA_LIBS_RELPATH ${_tmp})
-    endforeach()
-
-    list(REMOVE_DUPLICATES OpenCV_CUDA_LIBS_RELPATH)
-    link_directories(${OpenCV_CUDA_LIBS_RELPATH})
  endif()
 endforeach()

@@ -161,6 +161,6 @@
 /* Xine video library */
 #cmakedefine HAVE_XINE

-/* Define if your processor stores words with the most significant byte
+/* Define to 1 if your processor stores words with the most significant byte
   first (like Motorola and SPARC, unlike Intel and VAX). */
 #cmakedefine WORDS_BIGENDIAN
@@ -18,14 +18,11 @@ if [ -z `which adb` ]; then
  return 1
 fi

-accuracy=`find "$OPENCV_TEST_PATH/$TARGET_ARCH" -maxdepth 1 -executable -name "opencv_test_*" -not -name opencv_test_ocl`
-performance=`find "$OPENCV_TEST_PATH/$TARGET_ARCH" -maxdepth 1 -executable -name "opencv_perf_*" -not -name opencv_perf_ocl`
-
 adb push $OPENCV_TEST_DATA_PATH /sdcard/opencv_testdata

 adb shell "mkdir -p /data/local/tmp/opencv_test"
 SUMMARY_STATUS=0
-for t in $accuracy $performance;
+for t in "$OPENCV_TEST_PATH/$TARGET_ARCH/"opencv_test_* "$OPENCV_TEST_PATH/$TARGET_ARCH/"opencv_perf_*;
 do
  test_name=`basename "$t"`
  report="$test_name-`date --rfc-3339=date`.xml"
@@ -1,7 +1,6 @@
 #!/bin/sh

 OPENCV_TEST_PATH=@CMAKE_INSTALL_PREFIX@/@OPENCV_TEST_INSTALL_PATH@
-OPENCV_PYTHON_TESTS=@OPENCV_PYTHON_TESTS_LIST@
 export OPENCV_TEST_DATA_PATH=@CMAKE_INSTALL_PREFIX@/share/OpenCV/testdata

 SUMMARY_STATUS=0
@@ -15,16 +14,6 @@ do
  fi
 done

-for t in $OPENCV_PYTHON_TESTS;
-do
-  report="`basename "$t"`-`date --rfc-3339=date`.xml"
-  py.test --junitxml $report "$OPENCV_TEST_PATH"/$t
-  TEST_STATUS=$?
-  if [ $TEST_STATUS -ne 0 ]; then
-    SUMMARY_STATUS=$TEST_STATUS
-  fi
-done
-
 rm -f /tmp/__opencv_temp.*

 if [ $SUMMARY_STATUS -eq 0 ]; then
@@ -1,11 +1,11 @@
-<?xml version="1.0"?>
 <!--
-This is 20x34 detector of profile faces using LBP features.
-It was created by Attila Novak during GSoC 2012.
-Note that the detector only detects faces rotated to the right,
-so you may want to run it on the original and on
-the flipped image to detect different profile faces.
+    This is 20x34 detector of profile faces using LBP features.
+    It was created by Attila Novak during GSoC 2012.
+    Note that the detector only detects faces rotated to the right,
+    so you may want to run it on the original and on
+    the flipped image to detect different profile faces.
 -->
+<?xml version="1.0"?>
 <opencv_storage>
 <cascade>
  <stageType>BOOST</stageType>
@@ -1,4 +1,3 @@
-<?xml version="1.0"?>
 <!--
    This is 12x80 detector of the silverware (forks, spoons, knives) using LBP features.
    It was created by Attila Novak during GSoC 2012.
@@ -7,6 +6,7 @@
    (probably should run detector several times).
    It also assumes the "top view" when the camera optical axis is orthogonal to the table plane.
 -->
+<?xml version="1.0"?>
 <opencv_storage>
 <cascade>
  <stageType>BOOST</stageType>
@@ -44,7 +44,7 @@ master_doc = 'index'

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

 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -293,11 +293,11 @@ extlinks = {
            'oldbasicstructures' : ('http://docs.opencv.org/modules/core/doc/old_basic_structures.html#%s', None),
            'readwriteimagevideo' : ('http://docs.opencv.org/modules/highgui/doc/reading_and_writing_images_and_video.html#%s', None),
            'operationsonarrays' : ('http://docs.opencv.org/modules/core/doc/operations_on_arrays.html#%s', None),
-            'utilitysystemfunctions' : ('http://docs.opencv.org/modules/core/doc/utility_and_system_functions_and_macros.html#%s', None),
-            'imgprocfilter' : ('http://docs.opencv.org/modules/imgproc/doc/filtering.html#%s', None),
-            'svms' : ('http://docs.opencv.org/modules/ml/doc/support_vector_machines.html#%s', None),
-            'drawingfunc' : ('http://docs.opencv.org/modules/core/doc/drawing_functions.html#%s', None),
-            'xmlymlpers' : ('http://docs.opencv.org/modules/core/doc/xml_yaml_persistence.html#%s', None),
+            'utilitysystemfunctions':('http://docs.opencv.org/modules/core/doc/utility_and_system_functions_and_macros.html#%s', None),
+            'imgprocfilter':('http://docs.opencv.org/modules/imgproc/doc/filtering.html#%s', None),
+            'svms':('http://docs.opencv.org/modules/ml/doc/support_vector_machines.html#%s', None),
+            'drawingfunc':('http://docs.opencv.org/modules/core/doc/drawing_functions.html#%s', None),
+            'xmlymlpers':('http://docs.opencv.org/modules/core/doc/xml_yaml_persistence.html#%s', None),
            'hgvideo' : ('http://docs.opencv.org/modules/highgui/doc/reading_and_writing_images_and_video.html#%s', None),
            'gpuinit' : ('http://docs.opencv.org/modules/gpu/doc/initalization_and_information.html#%s', None),
            'gpudatastructure' : ('http://docs.opencv.org/modules/gpu/doc/data_structures.html#%s', None),
@@ -305,58 +305,56 @@ extlinks = {
            'gpuperelement' : ('http://docs.opencv.org/modules/gpu/doc/per_element_operations.html#%s', None),
            'gpuimgproc' : ('http://docs.opencv.org/modules/gpu/doc/image_processing.html#%s', None),
            'gpumatrixreduct' : ('http://docs.opencv.org/modules/gpu/doc/matrix_reductions.html#%s', None),
-            'filtering' : ('http://docs.opencv.org/modules/imgproc/doc/filtering.html#%s', None),
+            'filtering':('http://docs.opencv.org/modules/imgproc/doc/filtering.html#%s', None),
            'flann' : ('http://docs.opencv.org/modules/flann/doc/flann_fast_approximate_nearest_neighbor_search.html#%s', None ),
            'calib3d' : ('http://docs.opencv.org/modules/calib3d/doc/camera_calibration_and_3d_reconstruction.html#%s', None ),
            'feature2d' : ('http://docs.opencv.org/modules/imgproc/doc/feature_detection.html#%s', None ),
            'imgproc_geometric' : ('http://docs.opencv.org/modules/imgproc/doc/geometric_transformations.html#%s', None ),
-            'miscellaneous_transformations' : ('http://docs.opencv.org/modules/imgproc/doc/miscellaneous_transformations.html#%s', None),
-            'user_interface' : ('http://docs.opencv.org/modules/highgui/doc/user_interface.html#%s', None),

            # 'opencv_group' : ('http://answers.opencv.org/%s', None),
            'opencv_qa' : ('http://answers.opencv.org/%s', None),
            'how_to_contribute' : ('http://code.opencv.org/projects/opencv/wiki/How_to_contribute/%s', None),

-            'cvt_color' : ('http://docs.opencv.org/modules/imgproc/doc/miscellaneous_transformations.html?highlight=cvtcolor#cvtcolor%s', None),
-            'imread' : ('http://docs.opencv.org/modules/highgui/doc/reading_and_writing_images_and_video.html?highlight=imread#imread%s', None),
-            'imwrite' : ('http://docs.opencv.org/modules/highgui/doc/reading_and_writing_images_and_video.html?highlight=imwrite#imwrite%s', None),
-            'imshow' : ('http://docs.opencv.org/modules/highgui/doc/user_interface.html?highlight=imshow#imshow%s', None),
-            'named_window' : ('http://docs.opencv.org/modules/highgui/doc/user_interface.html?highlight=namedwindow#namedwindow%s', None),
-            'wait_key' : ('http://docs.opencv.org/modules/highgui/doc/user_interface.html?highlight=waitkey#waitkey%s', None),
-            'add_weighted' : ('http://docs.opencv.org/modules/core/doc/operations_on_arrays.html?highlight=addweighted#addweighted%s', None),
-            'saturate_cast' : ('http://docs.opencv.org/modules/core/doc/utility_and_system_functions_and_macros.html?highlight=saturate_cast#saturate-cast%s', None),
-            'mat_zeros' : ('http://docs.opencv.org/modules/core/doc/basic_structures.html?highlight=zeros#mat-zeros%s', None),
-            'convert_to' : ('http://docs.opencv.org/modules/core/doc/basic_structures.html#mat-convertto%s', None),
-            'create_trackbar' : ('http://docs.opencv.org/modules/highgui/doc/user_interface.html?highlight=createtrackbar#createtrackbar%s', None),
-            'point' : ('http://docs.opencv.org/modules/core/doc/basic_structures.html#point%s', None),
-            'scalar' : ('http://docs.opencv.org/modules/core/doc/basic_structures.html#scalar%s', None),
-            'line' : ('http://docs.opencv.org/modules/core/doc/drawing_functions.html#line%s', None),
-            'ellipse' : ('http://docs.opencv.org/modules/core/doc/drawing_functions.html#ellipse%s', None),
-            'rectangle' : ('http://docs.opencv.org/modules/core/doc/drawing_functions.html#rectangle%s', None),
-            'circle' : ('http://docs.opencv.org/modules/core/doc/drawing_functions.html#circle%s', None),
-            'fill_poly' : ('http://docs.opencv.org/modules/core/doc/drawing_functions.html#fillpoly%s', None),
-            'rng' : ('http://docs.opencv.org/modules/core/doc/operations_on_arrays.html?highlight=rng#rng%s', None),
-            'put_text' : ('http://docs.opencv.org/modules/core/doc/drawing_functions.html#puttext%s', None),
-            'gaussian_blur' : ('http://docs.opencv.org/modules/imgproc/doc/filtering.html?highlight=gaussianblur#gaussianblur%s', None),
-            'blur' : ('http://docs.opencv.org/modules/imgproc/doc/filtering.html?highlight=blur#blur%s', None),
-            'median_blur' : ('http://docs.opencv.org/modules/imgproc/doc/filtering.html?highlight=medianblur#medianblur%s', None),
-            'bilateral_filter' : ('http://docs.opencv.org/modules/imgproc/doc/filtering.html?highlight=bilateralfilter#bilateralfilter%s', None),
-            'erode' : ('http://docs.opencv.org/modules/imgproc/doc/filtering.html?highlight=erode#erode%s', None),
-            'dilate' : ('http://docs.opencv.org/modules/imgproc/doc/filtering.html?highlight=dilate#dilate%s', None),
-            'get_structuring_element' : ('http://docs.opencv.org/modules/imgproc/doc/filtering.html?highlight=getstructuringelement#getstructuringelement%s', None),
-            'flood_fill' : ( 'http://docs.opencv.org/modules/imgproc/doc/miscellaneous_transformations.html?highlight=floodfill#floodfill%s', None),
-            'morphology_ex' : ('http://docs.opencv.org/modules/imgproc/doc/filtering.html?highlight=morphologyex#morphologyex%s', None),
-            'pyr_down' : ('http://docs.opencv.org/modules/imgproc/doc/filtering.html?highlight=pyrdown#pyrdown%s', None),
-            'pyr_up' : ('http://docs.opencv.org/modules/imgproc/doc/filtering.html?highlight=pyrup#pyrup%s', None),
-            'resize' : ('http://docs.opencv.org/modules/imgproc/doc/geometric_transformations.html?highlight=resize#resize%s', None),
-            'threshold' : ('http://docs.opencv.org/modules/imgproc/doc/miscellaneous_transformations.html?highlight=threshold#threshold%s', None),
-            'filter2d' : ('http://docs.opencv.org/modules/imgproc/doc/filtering.html?highlight=filter2d#filter2d%s', None),
-            'copy_make_border' : ('http://docs.opencv.org/modules/imgproc/doc/filtering.html?highlight=copymakeborder#copymakeborder%s', None),
-            'sobel' : ('http://docs.opencv.org/modules/imgproc/doc/filtering.html?highlight=sobel#sobel%s', None),
-            'scharr' : ('http://docs.opencv.org/modules/imgproc/doc/filtering.html?highlight=scharr#scharr%s', None),
-            'laplacian' : ('http://docs.opencv.org/modules/imgproc/doc/filtering.html?highlight=laplacian#laplacian%s', None),
-            'canny' : ('http://docs.opencv.org/modules/imgproc/doc/feature_detection.html?highlight=canny#canny%s', None),
-            'copy_to' : ('http://docs.opencv.org/modules/core/doc/basic_structures.html?highlight=copyto#mat-copyto%s', None),
+            'cvt_color': ('http://docs.opencv.org/modules/imgproc/doc/miscellaneous_transformations.html?highlight=cvtcolor#cvtcolor%s', None),
+            'imread':    ('http://docs.opencv.org/modules/highgui/doc/reading_and_writing_images_and_video.html?highlight=imread#imread%s', None),
+            'imwrite':   ('http://docs.opencv.org/modules/highgui/doc/reading_and_writing_images_and_video.html?highlight=imwrite#imwrite%s', None),
+            'imshow':    ('http://docs.opencv.org/modules/highgui/doc/user_interface.html?highlight=imshow#imshow%s', None),
+            'named_window': ('http://docs.opencv.org/modules/highgui/doc/user_interface.html?highlight=namedwindow#namedwindow%s', None),
+            'wait_key': ('http://docs.opencv.org/modules/highgui/doc/user_interface.html?highlight=waitkey#waitkey%s', None),
+            'add_weighted': ('http://docs.opencv.org/modules/core/doc/operations_on_arrays.html?highlight=addweighted#addweighted%s', None),
+            'saturate_cast': ('http://docs.opencv.org/modules/core/doc/utility_and_system_functions_and_macros.html?highlight=saturate_cast#saturate-cast%s', None),
+            'mat_zeros': ('http://docs.opencv.org/modules/core/doc/basic_structures.html?highlight=zeros#mat-zeros%s', None),
+            'convert_to': ('http://docs.opencv.org/modules/core/doc/basic_structures.html#mat-convertto%s', None),
+            'create_trackbar': ('http://docs.opencv.org/modules/highgui/doc/user_interface.html?highlight=createtrackbar#createtrackbar%s', None),
+            'point': ('http://docs.opencv.org/modules/core/doc/basic_structures.html#point%s', None),
+            'scalar': ('http://docs.opencv.org/modules/core/doc/basic_structures.html#scalar%s', None),
+            'line': ('http://docs.opencv.org/modules/core/doc/drawing_functions.html#line%s', None),
+            'ellipse': ('http://docs.opencv.org/modules/core/doc/drawing_functions.html#ellipse%s', None),
+            'rectangle': ('http://docs.opencv.org/modules/core/doc/drawing_functions.html#rectangle%s', None),
+            'circle': ('http://docs.opencv.org/modules/core/doc/drawing_functions.html#circle%s', None),
+            'fill_poly': ('http://docs.opencv.org/modules/core/doc/drawing_functions.html#fillpoly%s', None),
+            'rng': ('http://docs.opencv.org/modules/core/doc/operations_on_arrays.html?highlight=rng#rng%s', None),
+            'put_text': ('http://docs.opencv.org/modules/core/doc/drawing_functions.html#puttext%s', None),
+            'gaussian_blur': ('http://docs.opencv.org/modules/imgproc/doc/filtering.html?highlight=gaussianblur#gaussianblur%s', None),
+            'blur': ('http://docs.opencv.org/modules/imgproc/doc/filtering.html?highlight=blur#blur%s', None),
+            'median_blur': ('http://docs.opencv.org/modules/imgproc/doc/filtering.html?highlight=medianblur#medianblur%s', None),
+            'bilateral_filter': ('http://docs.opencv.org/modules/imgproc/doc/filtering.html?highlight=bilateralfilter#bilateralfilter%s', None),
+            'erode': ('http://docs.opencv.org/modules/imgproc/doc/filtering.html?highlight=erode#erode%s', None),
+            'dilate': ('http://docs.opencv.org/modules/imgproc/doc/filtering.html?highlight=dilate#dilate%s', None),
+            'get_structuring_element': ('http://docs.opencv.org/modules/imgproc/doc/filtering.html?highlight=getstructuringelement#getstructuringelement%s', None),
+            'flood_fill': ( 'http://docs.opencv.org/modules/imgproc/doc/miscellaneous_transformations.html?highlight=floodfill#floodfill%s', None),
+            'morphology_ex': ('http://docs.opencv.org/modules/imgproc/doc/filtering.html?highlight=morphologyex#morphologyex%s', None),
+            'pyr_down': ('http://docs.opencv.org/modules/imgproc/doc/filtering.html?highlight=pyrdown#pyrdown%s', None),
+            'pyr_up': ('http://docs.opencv.org/modules/imgproc/doc/filtering.html?highlight=pyrup#pyrup%s', None),
+            'resize': ('http://docs.opencv.org/modules/imgproc/doc/geometric_transformations.html?highlight=resize#resize%s', None),
+            'threshold': ('http://docs.opencv.org/modules/imgproc/doc/miscellaneous_transformations.html?highlight=threshold#threshold%s', None),
+            'filter2d': ('http://docs.opencv.org/modules/imgproc/doc/filtering.html?highlight=filter2d#filter2d%s', None),
+            'copy_make_border': ('http://docs.opencv.org/modules/imgproc/doc/filtering.html?highlight=copymakeborder#copymakeborder%s', None),
+            'sobel': ('http://docs.opencv.org/modules/imgproc/doc/filtering.html?highlight=sobel#sobel%s', None),
+            'scharr': ('http://docs.opencv.org/modules/imgproc/doc/filtering.html?highlight=scharr#scharr%s', None),
+            'laplacian': ('http://docs.opencv.org/modules/imgproc/doc/filtering.html?highlight=laplacian#laplacian%s', None),
+            'canny': ('http://docs.opencv.org/modules/imgproc/doc/feature_detection.html?highlight=canny#canny%s', None),
+            'copy_to': ('http://docs.opencv.org/modules/core/doc/basic_structures.html?highlight=copyto#mat-copyto%s', None),
            'hough_lines' : ('http://docs.opencv.org/modules/imgproc/doc/feature_detection.html?highlight=houghlines#houghlines%s', None),
            'hough_lines_p' : ('http://docs.opencv.org/modules/imgproc/doc/feature_detection.html?highlight=houghlinesp#houghlinesp%s', None),
            'hough_circles' : ('http://docs.opencv.org/modules/imgproc/doc/feature_detection.html?highlight=houghcircles#houghcircles%s', None),
@@ -492,7 +492,7 @@ class=Typewch><span lang=EN-US>- weighttrimming &lt;weight_trimming&gt;</span></
 <p class=MsoNormal style='margin-left:17.1pt;text-indent:-17.1pt'><span
 class=Typewch><span lang=EN-US>  </span></span><span class=Typewch><span
 lang=EN-US style='font-family:"Times New Roman";font-weight:normal'>Specifies
-whether and how much weight trimming should be used. A decent choice is 0.90.</span></span></p>
+wheter and how much weight trimming should be used. A decent choice is 0.90.</span></span></p>

 <p class=MsoNormal style='margin-left:17.1pt;text-indent:-17.1pt'><span
 class=Typewch><span lang=EN-US>- eqw</span></span></p>
@@ -6,12 +6,12 @@ Adding (blending) two images using OpenCV
 Goal
 =====

-In this tutorial you will learn:
+In this tutorial you will learn how to:

 .. container:: enumeratevisibleitemswithsquare

-   * what is *linear blending* and why it is useful;
-   * how to add two images using :add_weighted:`addWeighted <>`
+   * What is *linear blending* and why it is useful.
+   * Add two images using :add_weighted:`addWeighted <>`

 Theory
 =======
@@ -192,7 +192,7 @@ Explanation

      image.convertTo(new_image, -1, alpha, beta);

-   where :convert_to:`convertTo <>` would effectively perform *new_image = a*image + beta*. However, we wanted to show you how to access each pixel. In any case, both methods give the same result but convertTo is more optimized and works a lot faster.
+   where :convert_to:`convertTo <>` would effectively perform *new_image = a*image + beta*. However, we wanted to show you how to access each pixel. In any case, both methods give the same result.

 Result
 =======
@@ -31,15 +31,15 @@ Here's a sample code of how to achieve all the stuff enumerated at the goal list
 Explanation
 ===========

-Here we talk only about XML and YAML file inputs. Your output (and its respective input) file may have only one of these extensions and the structure coming from this. They are two kinds of data structures you may serialize: *mappings* (like the STL map) and *element sequence* (like the STL vector). The difference between these is that in a map every element has a unique name through what you may access it. For sequences you need to go through them to query a specific item.
+Here we talk only about XML and YAML file inputs. Your output (and its respective input) file may have only one of these extensions and the structure coming from this. They are two kinds of data structures you may serialize: *mappings* (like the STL map) and *element sequence* (like the STL vector>. The difference between these is that in a map every element has a unique name through what you may access it. For sequences you need to go through them to query a specific item.

-1. **XML/YAML File Open and Close.** Before you write any content to such file you need to open it and at the end to close it. The XML/YAML data structure in OpenCV is :xmlymlpers:`FileStorage <filestorage>`. To specify that this structure to which file binds on your hard drive you can use either its constructor or the *open()* function of this:
+1. **XML\\YAML File Open and Close.** Before you write any content to such file you need to open it and at the end to close it. The XML\YAML data structure in OpenCV is :xmlymlpers:`FileStorage <filestorage>`. To specify that this structure to which file binds on your hard drive you can use either its constructor or the *open()* function of this:

   .. code-block:: cpp

      string filename = "I.xml";
      FileStorage fs(filename, FileStorage::WRITE);
-      //...
+      \\...
      fs.open(filename, FileStorage::READ);

   Either one of this you use the second argument is a constant specifying the type of operations you'll be able to on them: WRITE, READ or APPEND. The extension specified in the file name also determinates the output format that will be used. The output may be even compressed if you specify an extension such as *.xml.gz*.
@@ -64,7 +64,7 @@ Here we talk only about XML and YAML file inputs. Your output (and its respectiv
      fs["iterationNr"] >> itNr;
      itNr = (int) fs["iterationNr"];

-#. **Input/Output of OpenCV Data structures.** Well these behave exactly just as the basic C++ types:
+#. **Input\\Output of OpenCV Data structures.** Well these behave exactly just as the basic C++ types:

   .. code-block:: cpp

@@ -77,7 +77,7 @@ Here we talk only about XML and YAML file inputs. Your output (and its respectiv
      fs["R"] >> R;                                      // Read cv::Mat
      fs["T"] >> T;

-#. **Input/Output of vectors (arrays) and associative maps.** As I mentioned beforehand, we can output maps and sequences (array, vector) too. Again we first print the name of the variable and then we have to specify if our output is either a sequence or map.
+#. **Input\\Output of vectors (arrays) and associative maps.** As I mentioned beforehand we can output maps and sequences (array, vector) too. Again we first print the name of the variable and then we have to specify if our output is either a sequence or map.

   For sequence before the first element print the "[" character and after the last one the "]" character:

@@ -18,7 +18,7 @@ We'll seek answers for the following questions:
 Our test case
 =============

-Let us consider a simple color reduction method. By using the unsigned char C and C++ type for matrix item storing, a channel of pixel may have up to 256 different values. For a three channel image this can allow the formation of way too many colors (16 million to be exact). Working with so many color shades may give a heavy blow to our algorithm performance. However, sometimes it is enough to work with a lot less of them to get the same final result.
+Let us consider a simple color reduction method. Using the unsigned char C and C++ type for matrix item storing a channel of pixel may have up to 256 different values. For a three channel image this can allow the formation of way too many colors (16 million to be exact). Working with so many color shades may give a heavy blow to our algorithm performance. However, sometimes it is enough to work with a lot less of them to get the same final result.

 In this cases it's common that we make a *color space reduction*. This means that we divide the color space current value with a new input value to end up with fewer colors. For instance every value between zero and nine takes the new value zero, every value between ten and nineteen the value ten and so on.

@@ -32,14 +32,14 @@ Here's a function that will do this:

 .. code-block:: cpp

-   void Sharpen(const Mat& myImage, Mat& Result)
+   void Sharpen(const Mat& myImage,Mat& Result)
   {
       CV_Assert(myImage.depth() == CV_8U);  // accept only uchar images

-       Result.create(myImage.size(), myImage.type());
+       Result.create(myImage.size(),myImage.type());
       const int nChannels = myImage.channels();

-       for(int j = 1; j < myImage.rows - 1; ++j)
+       for(int j = 1 ; j < myImage.rows-1; ++j)
       {
           const uchar* previous = myImage.ptr<uchar>(j - 1);
           const uchar* current  = myImage.ptr<uchar>(j    );
@@ -47,17 +47,17 @@ Here's a function that will do this:

           uchar* output = Result.ptr<uchar>(j);

-           for(int i = nChannels; i < nChannels * (myImage.cols - 1); ++i)
+           for(int i= nChannels;i < nChannels*(myImage.cols-1); ++i)
           {
-               *output++ = saturate_cast<uchar>(5 * current[i]
-                            -current[i - nChannels] - current[i + nChannels] - previous[i] - next[i]);
+               *output++ = saturate_cast<uchar>(5*current[i]
+                            -current[i-nChannels] - current[i+nChannels] - previous[i] - next[i]);
           }
       }

       Result.row(0).setTo(Scalar(0));
-       Result.row(Result.rows - 1).setTo(Scalar(0));
+       Result.row(Result.rows-1).setTo(Scalar(0));
       Result.col(0).setTo(Scalar(0));
-       Result.col(Result.cols - 1).setTo(Scalar(0));
+       Result.col(Result.cols-1).setTo(Scalar(0));
   }

 At first we make sure that the input images data is in unsigned char format. For this we use the :utilitysystemfunctions:`CV_Assert <cv-assert>` function that throws an error when the expression inside it is false.
@@ -70,14 +70,14 @@ We create an output image with the same size and the same type as our input. As

 .. code-block:: cpp

-   Result.create(myImage.size(), myImage.type());
+   Result.create(myImage.size(),myImage.type());
   const int nChannels = myImage.channels();

 We'll use the plain C [] operator to access pixels. Because we need to access multiple rows at the same time we'll acquire the pointers for each of them (a previous, a current and a next line). We need another pointer to where we're going to save the calculation. Then simply access the right items with the [] operator. For moving the output pointer ahead we simply increase this (with one byte) after each operation:

 .. code-block:: cpp

-   for(int j = 1; j < myImage.rows - 1; ++j)
+   for(int j = 1 ; j < myImage.rows-1; ++j)
   {
       const uchar* previous = myImage.ptr<uchar>(j - 1);
       const uchar* current  = myImage.ptr<uchar>(j    );
@@ -85,21 +85,21 @@ We'll use the plain C [] operator to access pixels. Because we need to access mu

       uchar* output = Result.ptr<uchar>(j);

-       for(int i = nChannels; i < nChannels * (myImage.cols - 1); ++i)
+       for(int i= nChannels;i < nChannels*(myImage.cols-1); ++i)
       {
-           *output++ = saturate_cast<uchar>(5 * current[i]
-                        -current[i - nChannels] - current[i + nChannels] - previous[i] - next[i]);
+           *output++ = saturate_cast<uchar>(5*current[i]
+                        -current[i-nChannels] - current[i+nChannels] - previous[i] - next[i]);
       }
   }

-On the borders of the image the upper notation results inexistent pixel locations (like minus one - minus one). In these points our formula is undefined. A simple solution is to not apply the kernel in these points and, for example, set the pixels on the borders to zeros:
+On the borders of the image the upper notation results inexistent pixel locations (like minus one - minus one). In these points our formula is undefined. A simple solution is to not apply the mask in these points and, for example, set the pixels on the borders to zeros:

 .. code-block:: cpp

-   Result.row(0).setTo(Scalar(0));               // The top row
-   Result.row(Result.rows - 1).setTo(Scalar(0)); // The bottom row
-   Result.col(0).setTo(Scalar(0));               // The left column
-   Result.col(Result.cols - 1).setTo(Scalar(0)); // The right column
+   Result.row(0).setTo(Scalar(0));             // The top row
+   Result.row(Result.rows-1).setTo(Scalar(0)); // The bottom row
+   Result.col(0).setTo(Scalar(0));             // The left column
+   Result.col(Result.cols-1).setTo(Scalar(0)); // The right column

 The filter2D function
 =====================
@@ -116,7 +116,7 @@ Then call the :filtering:`filter2D <filter2d>` function specifying the input, th

 .. code-block:: cpp

-   filter2D(I, K, I.depth(), kern);
+   filter2D(I, K, I.depth(), kern );

 The function even has a fifth optional argument to specify the center of the kernel, and a sixth one for determining what to do in the regions where the operation is undefined (borders). Using this function has the advantage that it's shorter, less verbose and because there are some optimization techniques implemented it is usually faster than the *hand-coded method*. For example in my test while the second one took only 13 milliseconds the first took around 31 milliseconds. Quite some difference.

@@ -45,7 +45,7 @@ All the above objects, in the end, point to the same single data matrix. Their h
   :linenos:

   Mat D (A, Rect(10, 10, 100, 100) ); // using a rectangle
-   Mat E = A(Range::all(), Range(1,3)); // using row and column boundaries
+   Mat E = A(Range:all(), Range(1,3)); // using row and column boundaries

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

@@ -86,7 +86,7 @@ Each of the building components has their own valid domains. This leads to the d
 Creating a *Mat* object explicitly
 ==================================

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

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

@@ -113,7 +113,7 @@ Although *Mat* works really well as an image container, it is also a general mat

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

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

     .. literalinclude:: ../../../../samples/cpp/tutorial_code/core/mat_the_basic_image_container/mat_the_basic_image_container.cpp
        :language: cpp
@@ -84,10 +84,88 @@ Code

   * **Code at glance:**

-.. literalinclude:: ../../../../../samples/cpp/tutorial_code/Histograms_Matching/compareHist_Demo.cpp
-   :language: cpp
-   :tab-width: 4
+.. code-block:: cpp

+   #include "opencv2/highgui/highgui.hpp"
+   #include "opencv2/imgproc/imgproc.hpp"
+   #include <iostream>
+   #include <stdio.h>
+
+   using namespace std;
+   using namespace cv;
+
+   /** @function main */
+   int main( int argc, char** argv )
+   {
+     Mat src_base, hsv_base;
+     Mat src_test1, hsv_test1;
+     Mat src_test2, hsv_test2;
+     Mat hsv_half_down;
+
+     /// Load three images with different environment settings
+     if( argc < 4 )
+       { printf("** Error. Usage: ./compareHist_Demo <image_settings0> <image_setting1> <image_settings2>\n");
+         return -1;
+       }
+
+     src_base = imread( argv[1], 1 );
+     src_test1 = imread( argv[2], 1 );
+     src_test2 = imread( argv[3], 1 );
+
+     /// Convert to HSV
+     cvtColor( src_base, hsv_base, CV_BGR2HSV );
+     cvtColor( src_test1, hsv_test1, CV_BGR2HSV );
+     cvtColor( src_test2, hsv_test2, CV_BGR2HSV );
+
+     hsv_half_down = hsv_base( Range( hsv_base.rows/2, hsv_base.rows - 1 ), Range( 0, hsv_base.cols - 1 ) );
+
+     /// Using 30 bins for hue and 32 for saturation
+     int h_bins = 50; int s_bins = 60;
+     int histSize[] = { h_bins, s_bins };
+
+     // hue varies from 0 to 256, saturation from 0 to 180
+     float h_ranges[] = { 0, 256 };
+     float s_ranges[] = { 0, 180 };
+
+     const float* ranges[] = { h_ranges, s_ranges };
+
+     // Use the o-th and 1-st channels
+     int channels[] = { 0, 1 };
+
+     /// Histograms
+     MatND hist_base;
+     MatND hist_half_down;
+     MatND hist_test1;
+     MatND hist_test2;
+
+     /// Calculate the histograms for the HSV images
+     calcHist( &hsv_base, 1, channels, Mat(), hist_base, 2, histSize, ranges, true, false );
+     normalize( hist_base, hist_base, 0, 1, NORM_MINMAX, -1, Mat() );
+
+     calcHist( &hsv_half_down, 1, channels, Mat(), hist_half_down, 2, histSize, ranges, true, false );
+     normalize( hist_half_down, hist_half_down, 0, 1, NORM_MINMAX, -1, Mat() );
+
+     calcHist( &hsv_test1, 1, channels, Mat(), hist_test1, 2, histSize, ranges, true, false );
+     normalize( hist_test1, hist_test1, 0, 1, NORM_MINMAX, -1, Mat() );
+
+     calcHist( &hsv_test2, 1, channels, Mat(), hist_test2, 2, histSize, ranges, true, false );
+     normalize( hist_test2, hist_test2, 0, 1, NORM_MINMAX, -1, Mat() );
+
+     /// Apply the histogram comparison methods
+     for( int i = 0; i < 4; i++ )
+        { int compare_method = i;
+          double base_base = compareHist( hist_base, hist_base, compare_method );
+          double base_half = compareHist( hist_base, hist_half_down, compare_method );
+          double base_test1 = compareHist( hist_base, hist_test1, compare_method );
+          double base_test2 = compareHist( hist_base, hist_test2, compare_method );
+
+          printf( " Method [%d] Perfect, Base-Half, Base-Test(1), Base-Test(2) : %f, %f, %f, %f \n", i, base_base, base_half , base_test1, base_test2 );
+        }
+
+     printf( "Done \n" );
+
+     return 0;
+    }


 Explanation
@@ -133,11 +211,11 @@ Explanation

   .. code-block:: cpp

-     int h_bins = 50; int s_bins = 60;
+     int h_bins = 50; int s_bins = 32;
     int histSize[] = { h_bins, s_bins };

-     float h_ranges[] = { 0, 180 };
-     float s_ranges[] = { 0, 256 };
+     float h_ranges[] = { 0, 256 };
+     float s_ranges[] = { 0, 180 };

     const float* ranges[] = { h_ranges, s_ranges };

@@ -85,7 +85,7 @@ d. **method=CV\_TM\_CCORR\_NORMED**

   .. math::

-      R(x,y)= \frac{\sum_{x',y'} (T(x',y') \cdot I(x+x',y+y'))}{\sqrt{\sum_{x',y'}T(x',y')^2 \cdot \sum_{x',y'} I(x+x',y+y')^2}}
+      R(x,y)= \frac{\sum_{x',y'} (T(x',y') \cdot I'(x+x',y+y'))}{\sqrt{\sum_{x',y'}T(x',y')^2 \cdot \sum_{x',y'} I(x+x',y+y')^2}}


 e. **method=CV\_TM\_CCOEFF**
@@ -48,10 +48,10 @@ The structure of package contents looks as follows:

 ::

-    OpenCV-2.4.10-android-sdk
+    OpenCV-2.4.8.2-android-sdk
    |_ apk
-    |   |_ OpenCV_2.4.10_binary_pack_armv7a.apk
-    |   |_ OpenCV_2.4.10_Manager_2.19_XXX.apk
+    |   |_ OpenCV_2.4.8.2_binary_pack_armv7a.apk
+    |   |_ OpenCV_2.4.8.2_Manager_2.17_XXX.apk
    |
    |_ doc
    |_ samples
@@ -157,10 +157,10 @@ Get the OpenCV4Android SDK

   .. code-block:: bash

-      unzip ~/Downloads/OpenCV-2.4.10-android-sdk.zip
+      unzip ~/Downloads/OpenCV-2.4.8.2-android-sdk.zip

-.. |opencv_android_bin_pack| replace:: :file:`OpenCV-2.4.10-android-sdk.zip`
-.. _opencv_android_bin_pack_url: http://sourceforge.net/projects/opencvlibrary/files/opencv-android/2.4.10/OpenCV-2.4.10-android-sdk.zip/download
+.. |opencv_android_bin_pack| replace:: :file:`OpenCV-2.4.8.2-android-sdk.zip`
+.. _opencv_android_bin_pack_url: http://sourceforge.net/projects/opencvlibrary/files/opencv-android/2.4.8.2/OpenCV-2.4.8.2-android-sdk.zip/download
 .. |opencv_android_bin_pack_url| replace:: |opencv_android_bin_pack|
 .. |seven_zip| replace:: 7-Zip
 .. _seven_zip: http://www.7-zip.org/
@@ -295,7 +295,7 @@ Well, running samples from Eclipse is very simple:
  .. code-block:: sh
    :linenos:

-    <Android SDK path>/platform-tools/adb install <OpenCV4Android SDK path>/apk/OpenCV_2.4.10_Manager_2.19_armv7a-neon.apk
+    <Android SDK path>/platform-tools/adb install <OpenCV4Android SDK path>/apk/OpenCV_2.4.8.2_Manager_2.17_armv7a-neon.apk

  .. note:: ``armeabi``, ``armv7a-neon``, ``arm7a-neon-android8``, ``mips`` and ``x86`` stand for
            platform targets:
@@ -5,7 +5,7 @@
 Introduction into Android Development
 *************************************

-This guide was designed to help you in learning Android development basics and setting up your
+This guide was designed to help you in learning Android development basics and seting up your
 working environment quickly. It was written with Windows 7 in mind, though it would work with Linux
 (Ubuntu), Mac OS X and any other OS supported by Android SDK.

@@ -55,14 +55,14 @@ Manager to access OpenCV libraries externally installed in the target system.
   :guilabel:`File -> Import -> Existing project in your workspace`.

   Press :guilabel:`Browse`  button and locate OpenCV4Android SDK
-   (:file:`OpenCV-2.4.10-android-sdk/sdk`).
+   (:file:`OpenCV-2.4.8.2-android-sdk/sdk`).

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

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

   .. image:: images/eclipse_opencv_dependency1.png
        :alt: Add dependency from OpenCV library
@@ -128,27 +128,27 @@ described above.
 #. Add the OpenCV library project to your workspace the same way as for the async initialization
   above. Use menu :guilabel:`File -> Import -> Existing project in your workspace`,
   press :guilabel:`Browse` button and select OpenCV SDK path
-   (:file:`OpenCV-2.4.10-android-sdk/sdk`).
+   (:file:`OpenCV-2.4.8.2-android-sdk/sdk`).

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

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

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

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

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

   .. code-block:: make
      :linenos:
@@ -221,7 +221,7 @@ taken:

   .. code-block:: make

-      include C:\Work\OpenCV4Android\OpenCV-2.4.10-android-sdk\sdk\native\jni\OpenCV.mk
+      include C:\Work\OpenCV4Android\OpenCV-2.4.8.2-android-sdk\sdk\native\jni\OpenCV.mk

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

@@ -382,7 +382,7 @@ result.
           OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_6, this, mLoaderCallback);
       }

-#. Defines that your activity implements ``CvCameraViewListener2`` interface and fix activity related
+#. Defines that your activity implements ``CvViewFrameListener2`` interface and fix activity related
   errors by defining missed methods. For this activity define ``onCreate``, ``onDestroy`` and
   ``onPause`` and implement them according code snippet bellow. Fix errors by adding requited
   imports.
@@ -432,7 +432,7 @@ result.
 Lets discuss some most important steps. Every Android application with UI must implement Activity
 and View. By the first steps we create blank activity and default view layout. The simplest
 OpenCV-centric application must implement OpenCV initialization, create its own view to show
-preview from camera and implements ``CvCameraViewListener2`` interface to get frames from camera and
+preview from camera and implements ``CvViewFrameListener2`` interface to get frames from camera and
 process it.

 First of all we create our application view using xml layout. Our layout consists of the only
@@ -83,8 +83,8 @@ After checking that the image data was loaded correctly, we want to display our

 .. container:: enumeratevisibleitemswithsquare

-   + *WINDOW_AUTOSIZE* is the only supported one if you do not use the Qt backend. In this case the window size will take up the size of the image it shows. No resize permitted!
-   + *WINDOW_NORMAL* on Qt you may use this to allow window resize. The image will resize itself according to the current window size. By using the | operator you also need to specify if you would like the image to keep its aspect ratio (*WINDOW_KEEPRATIO*) or not (*WINDOW_FREERATIO*).
+   + *CV_WINDOW_AUTOSIZE* is the only supported one if you do not use the Qt backend. In this case the window size will take up the size of the image it shows. No resize permitted!
+   + *CV_WINDOW_NORMAL* on Qt you may use this to allow window resize. The image will resize itself according to the current window size. By using the | operator you also need to specify if you would like the image to keep its aspect ratio (*CV_WINDOW_KEEPRATIO*) or not (*CV_WINDOW_FREERATIO*).

 .. literalinclude:: ../../../../samples/cpp/tutorial_code/introduction/display_image/display_image.cpp
   :language: cpp
@@ -25,34 +25,29 @@ Let's use a simple program such as DisplayImage.cpp shown below.

 .. code-block:: cpp

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

-  using namespace cv;
+   using namespace cv;

-  int main(int argc, char** argv )
-  {
-      if ( argc != 2 )
-      {
-          printf("usage: DisplayImage.out <Image_Path>\n");
-          return -1;
-      }
+   int main( int argc, char** argv )
+   {
+     Mat image;
+     image = imread( argv[1], 1 );

-      Mat image;
-      image = imread( argv[1], 1 );
+     if( argc != 2 || !image.data )
+       {
+         printf( "No image data \n" );
+         return -1;
+       }

-      if ( !image.data )
-      {
-          printf("No image data \n");
-          return -1;
-      }
-      namedWindow("Display Image", WINDOW_AUTOSIZE );
-      imshow("Display Image", image);
+     namedWindow( "Display Image", CV_WINDOW_AUTOSIZE );
+     imshow( "Display Image", image );

-      waitKey(0);
+     waitKey(0);

-      return 0;
-  }
+     return 0;
+   }

 Create a CMake file
 ---------------------
@@ -7,24 +7,22 @@ These steps have been tested for Ubuntu 10.04 but should work with other distros
 Required Packages
 =================

-  * GCC 4.4.x or later
-  * CMake 2.6 or higher
-  * Git
-  * GTK+2.x or higher, including headers (libgtk2.0-dev)
-  * pkg-config
-  * Python 2.6 or later and Numpy 1.5 or later with developer packages (python-dev, python-numpy)
-  * ffmpeg or libav development packages: libavcodec-dev, libavformat-dev, libswscale-dev
-  * [optional] libtbb2 libtbb-dev
-  * [optional] libdc1394 2.x
-  * [optional] libjpeg-dev, libpng-dev, libtiff-dev, libjasper-dev, libdc1394-22-dev
-
-The packages can be installed using a terminal and the following commands or by using Synaptic Manager:
+  * GCC 4.4.x or later. This can be installed with:

    .. code-block:: bash

-       [compiler] sudo apt-get install build-essential
-       [required] sudo apt-get install cmake git libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev
-       [optional] sudo apt-get install python-dev python-numpy libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev libjasper-dev libdc1394-22-dev
+       sudo apt-get install build-essential
+
+  * CMake 2.6 or higher;
+  * Git;
+  * GTK+2.x or higher, including headers (libgtk2.0-dev);
+  * pkg-config;
+  * Python 2.6 or later and Numpy 1.5 or later with developer packages (python-dev, python-numpy);
+  * ffmpeg or libav development packages: libavcodec-dev, libavformat-dev, libswscale-dev;
+  * [optional] libdc1394 2.x;
+  * [optional] libjpeg-dev, libpng-dev, libtiff-dev, libjasper-dev.
+
+All the libraries above can be installed via Terminal or by using Synaptic Manager.

 Getting OpenCV Source Code
 ==========================
@@ -5,7 +5,7 @@ Load, Modify, and Save an Image

 .. note::

-   We assume that by now you know how to load an image using :readwriteimagevideo:`imread <imread>` and to display it in a window (using :user_interface:`imshow <imshow>`). Read the :ref:`Display_Image` tutorial otherwise.
+   We assume that by now you know how to load an image using :imread:`imread <>` and to display it in a window (using :imshow:`imshow <>`). Read the :ref:`Display_Image` tutorial otherwise.

 Goals
 ======
@@ -14,9 +14,9 @@ In this tutorial you will learn how to:

 .. container:: enumeratevisibleitemswithsquare

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

 Code
 ======
@@ -63,7 +63,10 @@ Here it is:
 Explanation
 ============

-#. We begin by loading an image using :readwriteimagevideo:`imread <imread>`, located in the path given by *imageName*. For this example, assume you are loading a RGB image.
+#. We begin by:
+
+   * Creating a Mat object to store the image information
+   * Load an image using :imread:`imread <>`, located in the path given by *imageName*. Fort this example, assume you are loading a RGB image.

 #. Now we are going to convert our image from BGR to Grayscale format. OpenCV has a really nice function to do this kind of transformations:

@@ -71,15 +74,15 @@ Explanation

      cvtColor( image, gray_image, CV_BGR2GRAY );

-   As you can see, :miscellaneous_transformations:`cvtColor <cvtcolor>` takes as arguments:
+   As you can see, :cvt_color:`cvtColor <>` takes as arguments:

   .. container:: enumeratevisibleitemswithsquare

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

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

   .. code-block:: cpp

@@ -97,7 +100,7 @@ Explanation
      imshow( imageName, image );
      imshow( "Gray image", gray_image );

-#. Add the *waitKey(0)* function call for the program to wait forever for an user key press.
+#. Add add the *waitKey(0)* function call for the program to wait forever for an user key press.


 Result
@@ -55,7 +55,7 @@ Building the OpenCV library from scratch requires a couple of tools installed be
 .. |TortoiseGit| replace:: TortoiseGit
 .. _TortoiseGit: http://code.google.com/p/tortoisegit/wiki/Download
 .. |Python_Libraries| replace:: Python libraries
-.. _Python_Libraries: http://www.python.org/downloads/
+.. _Python_Libraries: http://www.python.org/getit/
 .. |Numpy| replace:: Numpy
 .. _Numpy: http://numpy.scipy.org/
 .. |IntelTBB| replace:: Intel |copy| Threading Building Blocks (*TBB*)
@@ -81,7 +81,7 @@ Building the OpenCV library from scratch requires a couple of tools installed be

   + An IDE of choice (preferably), or just a C\C++ compiler that will actually make the binary files. Here we will use the `Microsoft Visual Studio <https://www.microsoft.com/visualstudio/en-us>`_. However, you can use any other IDE that has a valid C\C++ compiler.

-   + |CMake|_, which is a neat tool to make the project files (for your chosen IDE) from the OpenCV source files. It will also allow an easy configuration of the OpenCV build files, in order to make binary files that fits exactly to your needs.
+   + |CMake|_, which is a neat tool to make the project files (for your choosen IDE) from the OpenCV source files. It will also allow an easy configuration of the OpenCV build files, in order to make binary files that fits exactly to your needs.

   + Git to acquire the OpenCV source files. A good tool for this is |TortoiseGit|_. Alternatively, you can just download an archived version of the source files from our `page on Sourceforge <http://sourceforge.net/projects/opencvlibrary/files/opencv-win/>`_

@@ -90,25 +90,17 @@ A full list, for the latest version would contain:

 .. code-block:: bash

-   opencv_calib3d249d.lib
-   opencv_contrib249d.lib
-   opencv_core249d.lib
-   opencv_features2d249d.lib
-   opencv_flann249d.lib
-   opencv_gpu249d.lib
-   opencv_highgui249d.lib
-   opencv_imgproc249d.lib
-   opencv_legacy249d.lib
-   opencv_ml249d.lib
-   opencv_nonfree249d.lib
-   opencv_objdetect249d.lib
-   opencv_ocl249d.lib
-   opencv_photo249d.lib
-   opencv_stitching249d.lib
-   opencv_superres249d.lib
-   opencv_ts249d.lib
-   opencv_video249d.lib
-   opencv_videostab249d.lib
+   opencv_core231d.lib
+   opencv_imgproc231d.lib
+   opencv_highgui231d.lib
+   opencv_ml231d.lib
+   opencv_video231d.lib
+   opencv_features2d231d.lib
+   opencv_calib3d231d.lib
+   opencv_objdetect231d.lib
+   opencv_contrib231d.lib
+   opencv_legacy231d.lib
+   opencv_flann231d.lib

 The letter *d* at the end just indicates that these are the libraries required for the debug. Now click ok to save and do the same with a new property inside the Release rule section. Make sure to omit the *d* letters from the library names and to save the property sheets with the save icon above them.

@@ -78,8 +78,6 @@ Make sure your active solution configuration (:menuselection:`Build --> Configur

 Build your solution (:menuselection:`Build --> Build Solution`, or press *F7*).

-Before continuing, do not forget to add the command line argument of your input image to your project (:menuselection:`Right click on project --> Properties --> Configuration Properties --> Debugging` and then set the field ``Command Arguments`` with the location of the image).
-
 Now set a breakpoint on the source line that says

 .. code-block:: c++
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Vladislav Vinogradov	b4845d8c9f	temporary disable performance test for alphaComp function(cherry picked from commit `1ce5165cb7`)	2014-02-14 17:12:31 +04:00
Alexander Smorkalov	ea51396731	Dead code removed as this cannot be null in Java. (cherry picked from commit `dbe7634286`)	2014-02-13 20:13:47 +04:00
Vladislav Vinogradov	aa82f921cc	temporary disable perf test for StereoBeliefPropagation(cherry picked from commit `eb247d826f`)	2014-02-13 20:13:38 +04:00
Vladislav Vinogradov	2da7eae2c4	increase epsilon for AlphaComp sanity test for integer input(cherry picked from commit `9e69e2a07a`)	2014-02-13 20:13:27 +04:00
Alexander Smorkalov	25159d8e81	Application pause/resume fix for Android sample NativeActivity. (cherry picked from commit `7da3e98dfd`)	2014-02-13 17:59:23 +04:00
Alexander Smorkalov	f40ffe4763	LICENSE and README files installation rules added. (cherry picked from commit `e55f2b2602`)	2014-02-12 19:36:52 +04:00
Alexander Smorkalov	116311b7b4	opencv_run_all_tests.sh implemented for Android SDK. (cherry picked from commit `d02c291160`)	2014-02-12 19:36:43 +04:00
Alexander Smorkalov	f1ef3a4865	OpenCV version++.	2014-02-11 10:15:02 +04:00
Vladislav Vinogradov	9997aa8187	decrease input size for several gpu tests to fix "timed out" error: * BruteForceNonLocalMeans * OpticalFlowBM(cherry picked from commit `8b44a42a40`)	2014-02-10 15:48:52 +04:00
Vladislav Vinogradov	f15b42018c	fix nonfree module compilation without CUDA(cherry picked from commit `3e1f74f2ca`)	2014-02-10 15:48:52 +04:00
Alexander Smorkalov	f9e9ae85bd	dynamicuda module disabled in OpenCv.mk for all arches except armeabi-v7a. (cherry picked from commit `b10d4b05ed`)	2014-02-10 15:48:52 +04:00
Alexander Smorkalov	a49beb7c73	Multiple improvements in OpenCV examples build. EMBED_CUDA and FORCE_EMBED_OPENCV flags added to cmake macro add_android_project; INSTALL_CUDA_LIBRARIES option added to OpenCV.mk opencv_dynamicuda library installation with enabled OPENCV_INSTALL_MODULES flag fixed; CUDA initialization apportunity added to OpenCVLoader.initDebug(); Tutorial-4-CUDA sample reimplemented with static OpenCV and CUDA initialization. (cherry picked from commit `6ae4a9b09b`)	2014-02-10 15:48:52 +04:00
Alexander Smorkalov	51dff5b9e8	project.properties file generation fixed for per-component installation. (cherry picked from commit `65b4d77959`)	2014-02-10 15:48:52 +04:00
Alexander Smorkalov	826fc00374	Tests install path fix for Android SDK. (cherry picked from commit `0cd0e4749b`)	2014-02-10 15:48:52 +04:00
Vladislav Vinogradov	c10692deff	save previous values of LOCAL_* variables and restore them at the end(cherry picked from commit `286fe261d0`)	2014-02-10 15:48:52 +04:00
Vladislav Vinogradov	daa7b9ce5f	fix path to CUDA libraries (use targets/armv7-linux-androideabi/lib)(cherry picked from commit `a098fb1803`)	2014-02-10 15:48:52 +04:00
Vladislav Vinogradov	1ab02631b0	update stitching sample (cherry picked from commit `214cbabc40`)	2014-02-10 15:48:52 +04:00
Vladislav Vinogradov	3e755b2290	turn on CUDA part of stitching module on Android for non-dynamic build(cherry picked from commit `a138e5a6a5`)	2014-02-10 15:48:51 +04:00
Vladislav Vinogradov	f15a167df4	turn on CUDA part of nonfree module on Android for non-dynamic build(cherry picked from commit `d8f7377122`)	2014-02-10 15:48:51 +04:00
Ilya Lavrenov	f6367a2ea5	eliminated possible memory leak (cherry picked from commit `e7e63fac6c`)	2014-02-10 15:48:51 +04:00
Vladislav Vinogradov	5f88e2b496	fix #3477 : CV_CAP_PROP_SUPPORTED_PREVIEW_SIZES_STRING property is not supported by all VideoCapture backends. Some backends can return 0.0 or -1.0.(cherry picked from commit `c41e8006c7`)	2014-02-10 15:48:51 +04:00
Seunghoon Park	2c7cf52e3b	fixing bug #3345 . use norm to make sure two matrices are the same. (cherry picked from commit `eb9d7c4dd5`)	2014-02-10 15:48:51 +04:00
Andrey Pavlenko	b7c5083a87	removing duplicated legacy license, the actual instance is in 'opencv/LICENSE' (cherry picked from commit `dca5684145`)	2014-02-10 15:48:51 +04:00
Vladislav Vinogradov	d5d88efd5d	fix GpuMat::copyTo method with mask: fill destination matrix with zeros if it was reallocated(cherry picked from commit `dda999545c`)	2014-02-10 15:48:51 +04:00
Drew Jetter	6cb7a7be18	Fixed bug #3489 : The code assumed that two global variables would be constructed in a particular order, but global variable initialization order is compiler-dependent. (cherry picked from commit `6bf599b1bc`)	2014-02-10 15:48:51 +04:00
Pierre-Emmanuel Viel	cdea6b532f	Fix: freeing previous elements has to be done before loading new parameters to avoid trying to delete unexisting objects if arrays size was modified (cherry picked from commit `3f458c6eb1`)	2014-02-10 15:48:51 +04:00
ComFreek	d01e3529a6	Corrected package name in tutorial See also #2101(cherry picked from commit `ae795e5797`)	2014-02-10 15:48:51 +04:00
Nghia Ho	7c13d3277c	Fixed a valgrind 'Conditional jump or move depends on uninitialised value(s)' on cv::kmeans(...). The original code used points(sampleCount, 1, CV_32FC2), which confused generateCentersPP into thinking it is a 1 dimensional center, instead of 2. As a result it would set only the x variable and leave y unitialised. (cherry picked from commit `601b7d1dd3`)	2014-02-10 15:48:51 +04:00
Robbert Klarenbeek	345b3b0bdd	Fix algorithm setter argument validation for uchar(cherry picked from commit `e21c6e19db`)	2014-02-10 15:48:51 +04:00
Kazuki Matsuda	a65d7d4dd3	Fix typo of SparseMat_<_Tp>::SparseMat_(const SparseMat& m) Fix compilation erros when compiling this constructor. First argument type of "convertTo" should be instance, not a pointer of instance. First pull request was created for master branch. But it should be marged for 2.4. https://github.com/Itseez/opencv/pull/2113 (cherry picked from commit `2ae20c74a2`)	2014-02-10 15:48:51 +04:00
Ilya Lavrenov	5e986f3347	fixed bug #3319 (cherry picked from commit `4f9c081dc3`)	2014-02-10 15:48:50 +04:00
Seunghoon Park	27a8bb471b	fixing bug #3345 . don't use BORDER_ISOLATED alone. it should be combined with some border type (cherry picked from commit `2272a58769`)	2014-02-10 15:48:50 +04:00
Seunghoon Park	7868733002	fixing bug #3345 (cherry picked from commit `b036fc756a`)	2014-02-10 15:48:50 +04:00
Ilya Lavrenov	469aef2e5e	fixed bug #3341 (cherry picked from commit `09d25e11c6`)	2014-02-10 15:48:50 +04:00
Roman Donchenko	5e00fc6afe	Fixed MinGW build by declaring the minimal required Windows version. Also deleted miscellaneous remaining multimon cruft. Deleted #include <winuser.h>, because <windows.h> includes it already. This should have a nice side effect of preventing us from accidentally using any Windows API that's too new. (cherry picked from commit `795c108f2b`)	2014-02-10 15:48:50 +04:00
Vladislav Vinogradov	5170f0b5da	fixed several bugs in CUDA Canny implementation: * out of border access in edgesHysteresisLocalKernel * incorrect usage of atomicAdd(cherry picked from commit `5dbdadb769`)	2014-02-07 20:59:13 +04:00
Vladislav Vinogradov	dc2dbb4173	Revert "disable gpu Canny and HoughCircles perf tests:" This reverts commit `dbce90692a`. (cherry picked from commit `bfc27271e2`)	2014-02-07 20:58:49 +04:00
Vladislav Vinogradov	79e4f7eb78	Revert "disable CUDA generalized Hough Transform" This reverts commit `33d42b740c`. (cherry picked from commit `5d099df578`)	2014-02-07 18:24:57 +04:00
Vladislav Vinogradov	cc73c7000f	fix epsilons for several gpu tests (cherry picked from commit `3e4bb371c8`)	2014-02-07 18:24:44 +04:00
Vladislav Vinogradov	8bb26fa5de	Revert "disable gpu CvtColor.*2HSV tests:" This reverts commit `952027a853`. (cherry picked from commit `b6ba1f226c`)	2014-02-07 18:24:35 +04:00
Vladislav Vinogradov	48612d7c58	Revert "disable gpu Subtract_Array test:" This reverts commit `e91bf95d58`. (cherry picked from commit `da44a2fac1`)	2014-02-07 18:24:23 +04:00
Alexander Smorkalov	8ba84f4b47	Implicit testdata directory permissions setup added. (cherry picked from commit `b86088b89c`)	2014-02-07 18:24:11 +04:00
Alexander Smorkalov	bc653add74	Absolute path to tests in opencv_run_app_tests.sh fixed. (cherry picked from commit `530702c5f2`)	2014-02-06 17:16:21 +04:00
Alexander Smorkalov	215f78eee2	Merge branch 'android_manager_version_inc4' into 2.4.8.1-prep	2014-01-31 22:25:36 +04:00
Vladislav Vinogradov	4425dac7f4	disable gpu CvtColor.*2HSV tests: possible bug in CPU version(cherry picked from commit 3cb8b352e52f85847d98d2b0ece32ba5bdb5c31b)	2014-01-31 22:24:20 +04:00
Vladislav Vinogradov	4f79b9de48	disable gpu Subtract_Array test: possible bug in CPU version(cherry picked from commit 59155c1eefb6f22e362e34a8d73b31841eb3413a)	2014-01-31 22:23:55 +04:00
Vladislav Vinogradov	397ac5e68f	disable gpu Canny and HoughCircles perf tests: it fails because driver terminates CUDA kernels after time out (cherry picked from commit fa5bbb5f8dc1a86cfe004fb258d66e56c90560d6)	2014-01-31 22:23:39 +04:00
Vladislav Vinogradov	43c75c64b5	disable NPP for GpuMat methods and for copyMakeBorder(cherry picked from commit 316d49fc0fb7a609ebb0a65efc207faea6b978a4)	2014-01-31 22:23:22 +04:00
Vladislav Vinogradov	c319625a07	disable some gpu tests if library was built without CUFFT(cherry picked from commit b4b929d27cc25822dd15b5b96b8d335c59d4408c)	2014-01-31 22:23:05 +04:00
Vladislav Vinogradov	a7d0448faa	gpu test output files moved from cwd to temp folder(cherry picked from commit `49731ad530`)	2014-01-31 22:22:49 +04:00
Alexander Smorkalov	ca10e5e8ae	Highgui test output fixes. Useless output to console fixed; Test output files moved from cwd to temp folder. (cherry picked from commit `87935f3560`)	2014-01-31 22:22:33 +04:00
Vladislav Vinogradov	32414afe72	disable performance test for gpu generalized hough(cherry picked from commit `063d8b4211`)	2014-01-31 22:22:14 +04:00
Alexander Smorkalov	ed10f50d25	Reports path fix for opencv_run_all_tests.sh.in script. (cherry picked from commit `3d261e8a01`)	2014-01-31 22:21:57 +04:00
Alexander Smorkalov	48d9be70d5	Android toolchain file sync with original project. Original project: https://github.com/taka-no-me/android-cmake/ Revision: 5db45cfb87fec180b74963d3680dd60d4d8d8c3a (cherry picked from commit `c815043607`)	2014-01-31 22:21:34 +04:00
Alexander Smorkalov	c6b31481b6	OpenCV Manager version++.	2014-01-31 12:15:22 +04:00
Alexander Smorkalov	514b714cc2	opencv_run_all_tests.sh script added to -tests package. (cherry picked from commit `d45350a06a`)	2014-01-29 17:41:59 +04:00
Alexander Smorkalov	7fec87d3f6	Multiple fixes for tests deb package build. Added opencv_testing.sh.in file; opencv_testing.sh installation guarded by OS check. (cherry picked from commit `d9dc5ffa91`)	2014-01-28 17:56:22 +04:00
Alexander Smorkalov	00d555f051	Code review notes fixed. Env setup for testing package implemented using /etc/profile.d; Variable with path for all native samples added; Path for test binaries and test data updated. (cherry picked from commit `39201e68e2`)	2014-01-27 21:37:01 +04:00
Alexander Smorkalov	6cf7d6ef4e	OpenCV C/C++/OCL/CUDA samples install path fixed. Install rools for tests added. (cherry picked from commit `f332cba14b`)	2014-01-27 21:36:43 +04:00
Alexander Smorkalov	3ebdcafdd3	All installed files marked with component names for install customization. (cherry picked from commit `b75cbfde45`) Conflicts: cmake/OpenCVModule.cmake	2014-01-24 17:13:22 +04:00
Alexander Smorkalov	a348f3eeaa	OpenCV version++	2014-01-24 14:49:56 +04:00
Alexander Smorkalov	33f423de04	Improvements in package build. (cherry picked from commit `086792ec06`)	2014-01-24 14:48:51 +04:00
Alexander Smorkalov	d6ba52c3f9	Initial Linux packages build rools for CPack. (cherry picked from commit `7821fe2bde`) Conflicts: cmake/OpenCVModule.cmake	2014-01-24 14:48:19 +04:00
Vladislav Vinogradov	e9638d0997	disable CUDA generalized Hough Transform (cherry picked from commit `33d42b740c`)	2014-01-24 14:46:36 +04:00
Vladislav Vinogradov	5cb0084547	split CUDA Hough sources (cherry picked from commit `d847387694`)	2014-01-24 14:46:16 +04:00