Merged the trunk r8408:8457 (inclusive)
authorAndrey Kamaev <no@email>
Wed, 30 May 2012 08:47:34 +0000 (08:47 +0000)
committerAndrey Kamaev <no@email>
Wed, 30 May 2012 08:47:34 +0000 (08:47 +0000)
commit949c4edf41719fd78daed26fa9357207379347c5
treef188be97cd7d4b8dcac7542bc657188399bc59b4
parent7b5a45eac48a84733f483b2c27b937b24434253c
Merged the trunk r8408:8457 (inclusive)
42 files changed:
3rdparty/tbb/CMakeLists.txt
3rdparty/tbb/version_string.tmp
3rdparty/tbb/version_string.ver [new file with mode: 0644]
CMakeLists.txt
cmake/OpenCVCompilerOptions.cmake
cmake/OpenCVDetectCXXCompiler.cmake
modules/contrib/include/opencv2/contrib/contrib.hpp
modules/contrib/src/detection_based_tracker.cpp
modules/contrib/src/facerec.cpp
modules/core/doc/basic_structures.rst
modules/core/doc/operations_on_arrays.rst
modules/core/src/lapack.cpp
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/highgui/CMakeLists.txt
modules/highgui/src/cap_pvapi.cpp
modules/imgproc/doc/filtering.rst
modules/imgproc/doc/geometric_transformations.rst
modules/imgproc/perf/perf_blur.cpp
modules/imgproc/perf/perf_cornerEigenValsAndVecs.cpp
modules/imgproc/perf/perf_cornerHarris.cpp
modules/imgproc/perf/perf_goodFeaturesToTrack.cpp
modules/imgproc/src/corner.cpp
modules/imgproc/src/smooth.cpp
modules/ml/src/data.cpp
modules/objdetect/doc/cascade_classification.rst
modules/python/src2/cv2.cpp
modules/video/doc/motion_analysis_and_object_tracking.rst
modules/video/src/lkpyramid.cpp
samples/android/face-detection/CMakeLists.txt
samples/android/face-detection/jni/Android.mk [new file with mode: 0644]
samples/android/face-detection/jni/Application.mk [new file with mode: 0644]
samples/android/face-detection/jni/DetectionBaseTracker.cpp [new file with mode: 0644]
samples/android/face-detection/jni/DetectionBaseTracker.h [new file with mode: 0644]
samples/android/face-detection/src/org/opencv/samples/fd/DetectionBaseTracker.java [new file with mode: 0644]
samples/android/face-detection/src/org/opencv/samples/fd/FdActivity.java
samples/android/face-detection/src/org/opencv/samples/fd/FdView.java
samples/python2/common.py
samples/python2/gaussian_mix.py
samples/python2/lk_homography.py
samples/python2/lk_track.py
samples/python2/video_dmtx.py
samples/python2/video_threaded.py [new file with mode: 0644]