Merge commit '43aec5ad' into merge-2.4

Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVLegacyOptions.cmake
	modules/contrib/src/retina.cpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/video.rst
	modules/gpu/src/speckle_filtering.cpp
	modules/python/src2/cv2.cv.hpp
	modules/python/test/test2.py
	samples/python/watershed.py

diff --cc 3rdparty/ffmpeg/ffmpeg_version.cmake
Simple merge

diff --cc CMakeLists.txt
Simple merge

diff --cc apps/haartraining/CMakeLists.txt
Simple merge

diff --cc apps/haartraining/_cvcommon.h
Simple merge

diff --cc apps/haartraining/performance.cpp
Simple merge

diff --cc apps/traincascade/CMakeLists.txt
Simple merge

diff --cc cmake/OpenCVCompilerOptions.cmake
Simple merge

diff --cc doc/_themes/blue/static/default.css_t
Simple merge

diff --cc doc/check_docs.py
Simple merge

diff --cc doc/tutorials/core/interoperability_with_OpenCV_1/interoperability_with_OpenCV_1.rst
Simple merge

diff --cc doc/tutorials/features2d/feature_description/feature_description.rst
Simple merge

diff --cc doc/tutorials/features2d/trackingmotion/corner_subpixeles/corner_subpixeles.rst
Simple merge

diff --cc doc/tutorials/features2d/trackingmotion/good_features_to_track/good_features_to_track.rst
Simple merge

diff --cc doc/tutorials/features2d/trackingmotion/harris_detector/harris_detector.rst
Simple merge

diff --cc doc/tutorials/imgproc/histograms/histogram_calculation/histogram_calculation.rst
Simple merge

diff --cc doc/tutorials/imgproc/histograms/template_matching/template_matching.rst
Simple merge

diff --cc doc/tutorials/imgproc/imgtrans/canny_detector/canny_detector.rst
Simple merge

diff --cc doc/tutorials/imgproc/imgtrans/hough_lines/hough_lines.rst
Simple merge

diff --cc doc/tutorials/imgproc/imgtrans/remap/remap.rst
Simple merge

diff --cc doc/tutorials/imgproc/imgtrans/warp_affine/warp_affine.rst
Simple merge

diff --cc doc/tutorials/imgproc/opening_closing_hats/opening_closing_hats.rst
Simple merge

diff --cc doc/tutorials/imgproc/pyramids/pyramids.rst
Simple merge

diff --cc doc/tutorials/imgproc/shapedescriptors/bounding_rects_circles/bounding_rects_circles.rst
Simple merge

diff --cc doc/tutorials/imgproc/shapedescriptors/bounding_rotated_ellipses/bounding_rotated_ellipses.rst
Simple merge

diff --cc doc/tutorials/imgproc/shapedescriptors/find_contours/find_contours.rst
Simple merge

diff --cc doc/tutorials/imgproc/shapedescriptors/hull/hull.rst
Simple merge

diff --cc doc/tutorials/imgproc/shapedescriptors/moments/moments.rst
Simple merge

diff --cc doc/tutorials/imgproc/shapedescriptors/point_polygon_test/point_polygon_test.rst
Simple merge

diff --cc doc/tutorials/introduction/linux_eclipse/linux_eclipse.rst
Simple merge

diff --cc doc/tutorials/introduction/linux_install/linux_install.rst
index e8b96da,1e02b64..afa2951
--- 1/doc/tutorials/introduction/linux_install/linux_install.rst
--- 2/doc/tutorials/introduction/linux_install/linux_install.rst
+++ b/doc/tutorials/introduction/linux_install/linux_install.rst
@@@ -80,4 -80,3 +80,5 @@@ Building OpenCV from Source Using CMake
  .. note::
  
     If the size of the created library is a critical issue (like in case of an Android build) you can use the ``install/strip`` command to get the smallest size as possible. The *stripped* version appears to be twice as small. However, we do not recommend using this unless those extra megabytes do really matter.
 +
++   If the size of the created library is a critical issue (like in case of an Android build) you can use the ``install/strip`` command to get the smallest size as possible. The *stripped* version appears to be twice as small. However, we do not recommend using this unless those extra megabytes do really matter.

diff --cc doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst
Simple merge

diff --cc include/opencv/cv.h
index 5a517dc,77d0971..1ed020a
--- 1/include/opencv/cv.h
--- 2/include/opencv/cv.h
+++ b/include/opencv/cv.h
@@@ -72,5 -75,8 +72,4 @@@
  #define CV_IMPL extern "C"
  #endif //CV_IMPL
  
 -#if defined(__cplusplus)
 -#include "opencv2/core/internal.hpp"
 -#endif //__cplusplus
 -
  #endif // __OPENCV_OLD_CV_H_
- 

diff --cc modules/androidcamera/include/camera_activity.hpp
Simple merge

diff --cc modules/calib3d/src/epnp.cpp
Simple merge

diff --cc modules/calib3d/src/p3p.cpp
Simple merge

diff --cc modules/calib3d/src/solvepnp.cpp
Simple merge

diff --cc modules/calib3d/test/test_affine3d_estimator.cpp
Simple merge

diff --cc modules/calib3d/test/test_cameracalibration_badarg.cpp
Simple merge

diff --cc modules/calib3d/test/test_chessboardgenerator.cpp
Simple merge

diff --cc modules/calib3d/test/test_precomp.hpp
Simple merge

diff --cc modules/calib3d/test/test_reproject_image_to_3d.cpp
Simple merge

diff --cc modules/calib3d/test/test_solvepnp_ransac.cpp
Simple merge

diff --cc modules/contrib/src/adaptiveskindetector.cpp
Simple merge

diff --cc modules/contrib/src/bowmsctrainer.cpp
Simple merge

diff --cc modules/contrib/src/chowliutree.cpp
Simple merge

diff --cc modules/contrib/src/colortracker.cpp
Simple merge

diff --cc modules/contrib/src/detection_based_tracker.cpp
Simple merge

diff --cc modules/contrib/src/featuretracker.cpp
Simple merge

diff --cc modules/contrib/src/fuzzymeanshifttracker.cpp
Simple merge

diff --cc modules/contrib/src/hybridtracker.cpp
Simple merge

diff --cc modules/contrib/src/lda.cpp
Simple merge

diff --cc modules/contrib/src/logpolar_bsm.cpp
Simple merge

diff --cc modules/contrib/src/stereovar.cpp
Simple merge

diff --cc modules/contrib/test/test_precomp.hpp
Simple merge

diff --cc modules/core/doc/basic_structures.rst
Simple merge

diff --cc modules/core/doc/core.rst
Simple merge

diff --cc modules/core/doc/dynamic_structures.rst
Simple merge

diff --cc modules/core/doc/old_basic_structures.rst
Simple merge

diff --cc modules/core/src/convert.cpp
Simple merge

diff --cc modules/core/src/lapack.cpp
Simple merge

diff --cc modules/core/src/stat.cpp
Simple merge

diff --cc modules/core/test/test_io.cpp
Simple merge

diff --cc modules/core/test/test_math.cpp
Simple merge

diff --cc modules/features2d/perf/perf_fast.cpp
Simple merge

diff --cc modules/features2d/src/bagofwords.cpp
Simple merge

diff --cc modules/features2d/src/evaluation.cpp
Simple merge

diff --cc modules/features2d/test/test_brisk.cpp
Simple merge

diff --cc modules/features2d/test/test_fast.cpp
Simple merge

diff --cc modules/features2d/test/test_keypoints.cpp
Simple merge

diff --cc modules/features2d/test/test_mser.cpp
Simple merge

diff --cc modules/flann/src/flann.cpp
Simple merge

diff --cc modules/gpu/doc/data_structures.rst
Simple merge

diff --cc modules/gpu/src/calib3d.cpp
Simple merge

diff --cc modules/highgui/doc/qt_new_functions.rst
Simple merge

diff --cc modules/highgui/doc/reading_and_writing_images_and_video.rst
Simple merge

diff --cc modules/highgui/perf/perf_input.cpp
Simple merge

diff --cc modules/highgui/src/cap_avfoundation.mm
Simple merge

diff --cc modules/highgui/src/cap_ffmpeg_api.hpp
Simple merge

diff --cc modules/highgui/src/cap_qtkit.mm
Simple merge

diff --cc modules/highgui/src/grfmt_bmp.cpp
Simple merge

diff --cc modules/highgui/src/window_QT.cpp
Simple merge

diff --cc modules/highgui/test/test_fourcc.cpp
Simple merge

diff --cc modules/highgui/test/test_positioning.cpp
Simple merge

diff --cc modules/imgproc/doc/filtering.rst
Simple merge

diff --cc modules/imgproc/doc/geometric_transformations.rst
Simple merge

diff --cc modules/imgproc/perf/perf_cornerEigenValsAndVecs.cpp
Simple merge

diff --cc modules/imgproc/perf/perf_cornerHarris.cpp
Simple merge

diff --cc modules/imgproc/perf/perf_filter2d.cpp
Simple merge

diff --cc modules/imgproc/src/morph.cpp
Simple merge

diff --cc modules/imgproc/test/test_distancetransform.cpp
Simple merge

diff --cc modules/java/android_test/src/org/opencv/test/imgproc/ImgprocTest.java
Simple merge

diff --cc modules/java/generator/src/cpp/common.h
Simple merge

diff --cc modules/java/generator/src/cpp/core_manual.cpp
Simple merge

diff --cc modules/java/generator/src/cpp/jni_part.cpp
Simple merge

diff --cc modules/java/generator/src/cpp/utils.cpp
Simple merge

diff --cc modules/legacy/doc/common_interfaces_of_descriptor_extractors.rst
Simple merge

diff --cc modules/legacy/doc/common_interfaces_of_generic_descriptor_matchers.rst
Simple merge

diff --cc modules/legacy/doc/histograms.rst
Simple merge

diff --cc modules/legacy/doc/motion_analysis.rst
Simple merge

diff --cc modules/legacy/doc/planar_subdivisions.rst
Simple merge

diff --cc modules/legacy/src/_vm.h
Simple merge

diff --cc modules/legacy/src/bgfg_gaussmix.cpp
Simple merge

diff --cc modules/legacy/src/blobtrackpostprockalman.cpp
Simple merge

diff --cc modules/legacy/src/calibfilter.cpp
Simple merge

diff --cc modules/legacy/src/dpstereo.cpp
Simple merge

diff --cc modules/legacy/src/epilines.cpp
Simple merge

diff --cc modules/legacy/src/features2d.cpp
Simple merge

diff --cc modules/legacy/src/lcm.cpp
Simple merge

diff --cc modules/legacy/src/testseq.cpp
Simple merge

diff --cc modules/legacy/src/trifocal.cpp
Simple merge

diff --cc modules/legacy/src/vecfacetracking.cpp
Simple merge

diff --cc modules/legacy/test/test_bruteforcematcher.cpp
Simple merge

diff --cc modules/legacy/test/test_optflow.cpp
Simple merge

diff --cc modules/ml/src/ertrees.cpp
Simple merge

diff --cc modules/ml/src/svm.cpp
Simple merge

diff --cc modules/ml/test/test_emknearestkmeans.cpp
Simple merge

diff --cc modules/nonfree/test/test_detectors.cpp
Simple merge

diff --cc modules/objdetect/doc/latent_svm.rst
Simple merge

diff --cc modules/objdetect/src/cascadedetect.hpp
Simple merge

diff --cc modules/objdetect/src/featurepyramid.cpp
Simple merge

diff --cc modules/objdetect/src/haar.cpp
Simple merge

diff --cc modules/ocl/doc/image_filtering.rst
Simple merge

diff --cc modules/ocl/include/opencv2/ocl/private/util.hpp
Simple merge

diff --cc modules/ocl/perf/perf_calib3d.cpp
index f9fe654,ff6c6f2..7b14988
--- 1/modules/ocl/perf/perf_calib3d.cpp
--- 2/modules/ocl/perf/perf_calib3d.cpp
+++ b/modules/ocl/perf/perf_calib3d.cpp
@@@ -48,30 -48,30 +48,30 @@@
  ///////////// StereoMatchBM ////////////////////////
  PERFTEST(StereoMatchBM)
  {
-       Mat left_image = imread(abspath("aloeL.jpg"), cv::IMREAD_GRAYSCALE);
-       Mat right_image = imread(abspath("aloeR.jpg"), cv::IMREAD_GRAYSCALE);
-       Mat disp,dst;
-       ocl::oclMat d_left, d_right,d_disp;
-       int n_disp= 128;
-       int winSize =19;
+     Mat left_image = imread(abspath("aloeL.jpg"), cv::IMREAD_GRAYSCALE);
+     Mat right_image = imread(abspath("aloeR.jpg"), cv::IMREAD_GRAYSCALE);
+     Mat disp,dst;
+     ocl::oclMat d_left, d_right,d_disp;
+     int n_disp= 128;
+     int winSize =19;
  
-       SUBTEST << left_image.cols << 'x' << left_image.rows << "; aloeL.jpg ;"<< right_image.cols << 'x' << right_image.rows << "; aloeR.jpg ";
+     SUBTEST << left_image.cols << 'x' << left_image.rows << "; aloeL.jpg ;"<< right_image.cols << 'x' << right_image.rows << "; aloeR.jpg ";
  
 -    StereoBM bm(0, n_disp, winSize);
 -    bm(left_image, right_image, dst);
 +      Ptr<StereoBM> bm = createStereoBM(n_disp, winSize);
 +      bm->compute(left_image, right_image, dst);
  
 -    CPU_ON;
 -    bm(left_image, right_image, dst);
 -    CPU_OFF;
 +      CPU_ON;
 +      bm->compute(left_image, right_image, dst);
 +      CPU_OFF;
  
-       d_left.upload(left_image);
-       d_right.upload(right_image);
+     d_left.upload(left_image);
+     d_right.upload(right_image);
  
-       ocl::StereoBM_OCL d_bm(0, n_disp, winSize);
+     ocl::StereoBM_OCL d_bm(0, n_disp, winSize);
  
-       WARMUP_ON;
-       d_bm(d_left, d_right, d_disp);
-       WARMUP_OFF;
+     WARMUP_ON;
+     d_bm(d_left, d_right, d_disp);
+     WARMUP_OFF;
  
      cv::Mat ocl_mat;
      d_disp.download(ocl_mat);

diff --cc modules/ocl/perf/perf_canny.cpp
Simple merge

diff --cc modules/ocl/src/blend.cpp
Simple merge

diff --cc modules/ocl/src/columnsum.cpp
Simple merge

diff --cc modules/ocl/src/interpolate_frames.cpp
Simple merge

diff --cc modules/ocl/src/kmeans.cpp
Simple merge

diff --cc modules/ocl/src/pyrdown.cpp
Simple merge

diff --cc modules/ocl/src/pyrup.cpp
Simple merge

diff --cc modules/ocl/test/test_imgproc.cpp
Simple merge

diff --cc modules/ocl/test/test_kmeans.cpp
index ab4e340,1ea0b1c..008acfa
--- 1/modules/ocl/test/test_kmeans.cpp
--- 2/modules/ocl/test/test_kmeans.cpp
+++ b/modules/ocl/test/test_kmeans.cpp
@@@ -119,9 -119,9 +119,9 @@@ TEST_P(Kmeans, Mat)
              1, flags, centers);
  
          ocl::kmeans(d_src, K, d_labels,
 -            TermCriteria( CV_TERMCRIT_EPS+CV_TERMCRIT_ITER, 100, 0),
 +            TermCriteria( TermCriteria::EPS + TermCriteria::MAX_ITER, 100, 0),
              1, flags, d_centers);
-   
+ 
          Mat dd_labels(d_labels);
          Mat dd_centers(d_centers);
          if(flags & KMEANS_USE_INITIAL_LABELS)

diff --cc modules/ocl/test/test_optflow.cpp
Simple merge

diff --cc modules/ocl/test/utility.cpp
Simple merge

diff --cc modules/photo/src/arrays.hpp
Simple merge

diff --cc modules/photo/src/denoising.cpp
index d61a05f,4762eda..b8bae12
--- 1/modules/photo/src/denoising.cpp
--- 2/modules/photo/src/denoising.cpp
+++ b/modules/photo/src/denoising.cpp
@@@ -236,7 -236,5 +236,5 @@@ void cv::fastNlMeansDenoisingColoredMul
      Mat dst_lab(srcImgs[0].size(), srcImgs[0].type());
      mixChannels(l_ab_denoised, 2, &dst_lab, 1, from_to, 3);
  
 -    cvtColor(dst_lab, dst, CV_Lab2LBGR);
 +    cvtColor(dst_lab, dst, COLOR_Lab2LBGR);
  }
- 
- 

diff --cc modules/stitching/src/motion_estimators.cpp
Simple merge

diff --cc modules/stitching/src/seam_finders.cpp
Simple merge

diff --cc modules/superres/src/btv_l1_ocl.cpp
Simple merge

diff --cc modules/video/src/bgfg_gaussmix.cpp
Simple merge

diff --cc modules/video/src/kalman.cpp
Simple merge

diff --cc modules/video/src/simpleflow.cpp
Simple merge

diff --cc modules/videostab/src/precomp.hpp
index 6911074,5febaaa..aa6026d
--- 1/modules/videostab/src/precomp.hpp
--- 2/modules/videostab/src/precomp.hpp
+++ b/modules/videostab/src/precomp.hpp
@@@ -64,5 -59,24 +64,4 @@@ inline float intensity(const cv::Point3
      return 0.3f*bgr.x + 0.59f*bgr.y + 0.11f*bgr.z;
  }
  
 -template <typename T> inline T& at(int index, T *items, int size)
 -{
 -    return items[cv::borderInterpolate(index, size, cv::BORDER_WRAP)];
 -}
 -
 -template <typename T> inline const T& at(int index, const T *items, int size)
 -{
 -    return items[cv::borderInterpolate(index, size, cv::BORDER_WRAP)];
 -}
 -
 -template <typename T> inline T& at(int index, std::vector<T> &items)
 -{
 -    return at(index, &items[0], static_cast<int>(items.size()));
 -}
 -
 -template <typename T> inline const T& at(int index, const std::vector<T> &items)
 -{
 -    return items[cv::borderInterpolate(index, static_cast<int>(items.size()), cv::BORDER_WRAP)];
 -}
 -
  #endif
- 

diff --cc samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionActivity.java
Simple merge

diff --cc samples/android/hello-android/main.cpp
Simple merge

diff --cc samples/c/adaptiveskindetector.cpp
Simple merge

diff --cc samples/c/blobtrack_sample.cpp
Simple merge

diff --cc samples/cpp/CMakeLists.txt
Simple merge

diff --cc samples/cpp/OpenEXRimages_HighDynamicRange_Retina_toneMapping.cpp
Simple merge

diff --cc samples/cpp/OpenEXRimages_HighDynamicRange_Retina_toneMapping_video.cpp
Simple merge

diff --cc samples/cpp/bgfg_gmg.cpp
Simple merge

diff --cc samples/cpp/calibration_artificial.cpp
Simple merge

diff --cc samples/cpp/dft.cpp
Simple merge

diff --cc samples/cpp/houghlines.cpp
Simple merge

diff --cc samples/cpp/phase_corr.cpp
Simple merge

diff --cc samples/cpp/retinaDemo.cpp
Simple merge

diff --cc samples/cpp/stereo_calib.cpp
Simple merge

diff --cc samples/cpp/stitching.cpp
Simple merge

diff --cc samples/cpp/stitching_detailed.cpp
Simple merge

diff --cc samples/cpp/tutorial_code/ImgProc/Morphology_2.cpp
Simple merge

diff --cc samples/cpp/tutorial_code/ImgProc/Pyramids.cpp
Simple merge

diff --cc samples/cpp/tutorial_code/ImgTrans/Sobel_Demo.cpp
Simple merge

diff --cc samples/cpp/tutorial_code/ImgTrans/copyMakeBorder_demo.cpp
Simple merge

diff --cc samples/cpp/tutorial_code/ShapeDescriptors/moments_demo.cpp
Simple merge

diff --cc samples/cpp/tutorial_code/ShapeDescriptors/pointPolygonTest_demo.cpp
Simple merge

diff --cc samples/cpp/tutorial_code/TrackingMotion/cornerDetector_Demo.cpp
Simple merge

diff --cc samples/cpp/tutorial_code/TrackingMotion/cornerSubPix_Demo.cpp
Simple merge

diff --cc samples/cpp/tutorial_code/TrackingMotion/goodFeaturesToTrack_Demo.cpp
index a0f6d12,f20669f..b45d60a
--- 1/samples/cpp/tutorial_code/TrackingMotion/goodFeaturesToTrack_Demo.cpp
--- 2/samples/cpp/tutorial_code/TrackingMotion/goodFeaturesToTrack_Demo.cpp
+++ b/samples/cpp/tutorial_code/TrackingMotion/goodFeaturesToTrack_Demo.cpp
@@@ -87,7 -87,6 +87,6 @@@ void goodFeaturesToTrack_Demo( int, voi
       { circle( copy, corners[i], r, Scalar(rng.uniform(0,255), rng.uniform(0,255), rng.uniform(0,255)), -1, 8, 0 ); }
  
    /// Show what you got
 -  namedWindow( source_window, CV_WINDOW_AUTOSIZE );
 +  namedWindow( source_window, WINDOW_AUTOSIZE );
    imshow( source_window, copy );
  }
- 

diff --cc samples/cpp/tutorial_code/core/Matrix/Drawing_1.cpp
Simple merge

diff --cc samples/cpp/tutorial_code/core/discrete_fourier_transform/discrete_fourier_transform.cpp
Simple merge

diff --cc samples/cpp/tutorial_code/core/how_to_scan_images/how_to_scan_images.cpp
Simple merge

diff --cc samples/cpp/tutorial_code/core/mat_mask_operations/mat_mask_operations.cpp
Simple merge

diff --cc samples/cpp/tutorial_code/core/mat_the_basic_image_container/mat_the_basic_image_container.cpp
Simple merge

diff --cc samples/cpp/tutorial_code/gpu/gpu-basics-similarity/gpu-basics-similarity.cpp
Simple merge

diff --cc samples/cpp/tutorial_code/introduction/display_image/display_image.cpp
index 44ef32c,8990bac..847cd8f
--- 1/samples/cpp/tutorial_code/introduction/display_image/display_image.cpp
--- 2/samples/cpp/tutorial_code/introduction/display_image/display_image.cpp
+++ b/samples/cpp/tutorial_code/introduction/display_image/display_image.cpp
@@@ -22,9 -22,9 +22,9 @@@ int main( int argc, char** argv 
          return -1;
      }
  
 -    namedWindow( "Display window", CV_WINDOW_AUTOSIZE );// Create a window for display.
 -    imshow( "Display window", image );                   // Show our image inside it.
 +    namedWindow( "Display window", WINDOW_AUTOSIZE ); // Create a window for display.
 +    imshow( "Display window", image );                // Show our image inside it.
  
 -    waitKey(0);                                                                                        // Wait for a keystroke in the window
 +    waitKey(0); // Wait for a keystroke in the window
      return 0;
- }
+ }

diff --cc samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
Simple merge

diff --cc samples/gpu/hog.cpp
Simple merge

diff --cc samples/gpu/houghlines.cpp
Simple merge

diff --cc samples/gpu/stereo_match.cpp
Simple merge

diff --cc samples/ocl/facedetect.cpp
Simple merge

diff --cc samples/ocl/tvl1_optical_flow.cpp
Simple merge

diff --cc samples/python2/asift.py
Simple merge

diff --cc samples/python2/calibrate.py
Simple merge

diff --cc samples/python2/camshift.py
index 910fd82,bc96588..7fb51fc
--- 1/samples/python2/camshift.py
--- 2/samples/python2/camshift.py
+++ b/samples/python2/camshift.py
@@@ -117,10 -113,7 +117,9 @@@ class App(object)
  
  if __name__ == '__main__':
      import sys
 -    try: video_src = sys.argv[1]
 -    except: video_src = 0
 +    try:
 +        video_src = sys.argv[1]
 +    except: 
 +        video_src = 0
      print __doc__
      App(video_src).run()
- 

diff --cc samples/python2/common.py
Simple merge

diff --cc samples/python2/deconvolution.py
Simple merge

diff --cc samples/python2/demo.py
Simple merge

diff --cc samples/python2/distrans.py
Simple merge

diff --cc samples/python2/edge.py
Simple merge

diff --cc samples/python2/facedetect.py
Simple merge

diff --cc samples/python2/hist.py
Simple merge

diff --cc samples/python2/inpaint.py
Simple merge

diff --cc samples/python2/lappyr.py
Simple merge

diff --cc samples/python2/opt_flow.py
Simple merge