Roman Donchenko
|
c05bfe9d6d
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/ocl/src/opencl/stereobp.cl
modules/ocl/src/stereobp.cpp
|
2013-07-08 18:47:38 +04:00 |
|
Roman Donchenko
|
6faf00b8e5
|
Merge pull request #696 from znah:detect_method
|
2013-06-13 12:01:59 +04:00 |
|
Andrey Kamaev
|
e5a33723fc
|
Move C API of opencv_calib3d to separate file
|
2013-04-11 21:00:17 +04:00 |
|
Andrey Kamaev
|
ae4e76395f
|
Make flann headers independent from OpenCV C API
|
2013-04-08 15:47:29 +04:00 |
|
Andrey Kamaev
|
2b1ef95415
|
Completely separate C and C++ API of OpenCV core
|
2013-04-01 15:24:34 +04:00 |
|
Andrey Kamaev
|
49f6dad13f
|
Move cv::KeyPoint and cv::DMatch to core
|
2013-03-26 16:08:43 +04:00 |
|
Alexander Mordvintsev
|
4d510be2c9
|
added compute function to Feature2D (dirty workaround for #2699)
|
2013-03-23 14:06:33 +04:00 |
|
Andrey Kamaev
|
be7bbe3aa9
|
Drop cv:: prefix from cv::String used inside the cv namespace
|
2013-03-22 22:14:50 +04:00 |
|
Andrey Kamaev
|
762aefd71b
|
Compile opencv_test_core with cv::String instead of std::string
All tests passed!
|
2013-03-22 22:14:22 +04:00 |
|
Andrey Kamaev
|
ad5cddc007
|
Main module headers are moved 1 level up
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>
Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
|
2013-03-13 17:26:56 +04:00 |
|