third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
a3bde36c84
opencv/modules
History
Roman Donchenko a3bde36c84 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/calib3d/include/opencv2/calib3d/calib3d.hpp
	modules/contrib/doc/facerec/facerec_api.rst
	modules/contrib/include/opencv2/contrib/contrib.hpp
	modules/contrib/src/facerec.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/highgui/src/loadsave.cpp
	modules/imgproc/src/pyramids.cpp
	modules/ocl/include/opencv2/ocl/cl_runtime/cl_runtime.hpp
	modules/python/src2/gen.py
	modules/python/test/test.py
	modules/superres/test/test_superres.cpp
	samples/cpp/facerec_demo.cpp
2014-07-08 14:33:56 +04:00
..
androidcamera
calib3d Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-07-08 14:33:56 +04:00
core Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-07-08 14:33:56 +04:00
cuda Don't build CUDA modules stubs by default (use -DBUILD_CUDA_STUBS=ON if need them) 2014-06-16 11:18:52 +04:00
cudaarithm Don't build CUDA modules stubs by default (use -DBUILD_CUDA_STUBS=ON if need them) 2014-06-16 11:18:52 +04:00
cudabgsegm Don't build CUDA modules stubs by default (use -DBUILD_CUDA_STUBS=ON if need them) 2014-06-16 11:18:52 +04:00
cudacodec Don't build CUDA modules stubs by default (use -DBUILD_CUDA_STUBS=ON if need them) 2014-06-16 11:18:52 +04:00
cudafeatures2d Don't build CUDA modules stubs by default (use -DBUILD_CUDA_STUBS=ON if need them) 2014-06-16 11:18:52 +04:00
cudafilters Don't build CUDA modules stubs by default (use -DBUILD_CUDA_STUBS=ON if need them) 2014-06-16 11:18:52 +04:00
cudaimgproc Don't build CUDA modules stubs by default (use -DBUILD_CUDA_STUBS=ON if need them) 2014-06-16 11:18:52 +04:00
cudalegacy
cudaoptflow Don't build CUDA modules stubs by default (use -DBUILD_CUDA_STUBS=ON if need them) 2014-06-16 11:18:52 +04:00
cudastereo Don't build CUDA modules stubs by default (use -DBUILD_CUDA_STUBS=ON if need them) 2014-06-16 11:18:52 +04:00
cudawarping Don't build CUDA modules stubs by default (use -DBUILD_CUDA_STUBS=ON if need them) 2014-06-16 11:18:52 +04:00
cudev
features2d Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-07-08 14:33:56 +04:00
flann Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-07-08 14:33:56 +04:00
highgui Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-07-08 14:33:56 +04:00
imgproc Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-07-08 14:33:56 +04:00
java Add AKAZE support for the Java wrapper 2014-06-03 18:41:58 +09:00
matlab Changing #include to generic video.hpp 2014-06-11 02:00:21 -05:00
ml Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-06-02 13:43:28 +04:00
nonfree
objdetect Merge pull request #2856 from sanchom:master 2014-07-02 14:22:56 +00:00
optim Merge pull request #2784 from saree90:bugfix_Simplex 2014-06-12 21:41:10 +04:00
photo
python Merge pull request #2917 from mmaraya:bug_3872 2014-07-01 16:40:08 +00:00
shape
stitching
superres ocl: fix mac and superres test 2014-07-02 11:54:20 +04:00
ts fixed warnings 2014-06-09 15:54:10 +04:00
video fix according review 2014-05-30 15:44:51 +04:00
videostab Update global_motion.cpp 2014-06-10 17:31:18 +03:00
viz Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-07-08 14:33:56 +04:00
world
CMakeLists.txt
refman.rst.in