Roman Donchenko
|
3443fd85cd
|
Merge pull request #984 from albenoit:master
|
2013-07-16 11:57:52 +04:00 |
|
Roman Donchenko
|
4cf9990d4e
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
doc/tutorials/definitions/noContent.rst
doc/tutorials/gpu/gpu-basics-similarity/gpu-basics-similarity.rst
doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
doc/tutorials/introduction/how_to_write_a_tutorial/how_to_write_a_tutorial.rst
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/include/opencv2/core/version.hpp
modules/gpu/CMakeLists.txt
modules/highgui/perf/perf_output.cpp
modules/highgui/test/test_video_io.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/main.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/opencl/moments.cl
modules/ocl/test/main.cpp
modules/ocl/test/test_moments.cpp
modules/python/test/test.py
modules/ts/include/opencv2/ts/ts_perf.hpp
modules/ts/src/precomp.hpp
modules/ts/src/ts_perf.cpp
|
2013-07-03 19:53:21 +04:00 |
|
Alexander Smorkalov
|
ee591efb9f
|
Build fix for Windows RT.
|
2013-06-25 03:35:58 -07:00 |
|
alexandre benoit
|
c39159069e
|
last warnings solved
|
2013-06-13 07:36:37 +02:00 |
|
alexandre benoit
|
2c1fb5fd71
|
minor correction after buildbot warnings
|
2013-06-13 06:55:35 +02:00 |
|
alexandre benoit
|
7bff79bbeb
|
updated demos and tutorial regarding the Retina class transfer to bioinspired module.
|
2013-06-12 22:43:36 +02:00 |
|
alexandre benoit
|
cdbbe0dfbe
|
1. created module bioinspired. 2.transfered Retina module into the new module bioinspired. 3. added a fast tone mapping method to Retina interface and wrapped existing reinafilter dedicated method
|
2013-06-12 22:40:43 +02:00 |
|
Andrey Kamaev
|
b8ed00bd64
|
Compile OpenCV with GCC visibility set to hidden
|
2013-05-13 18:33:20 +04:00 |
|
Vadim Pisarevsky
|
f1e8f69d2c
|
Merge pull request #861 from albenoit:master
|
2013-05-12 12:53:14 +04:00 |
|
Brian McKinnon
|
36745a80c3
|
Added #include <limits> to files that were missing it.
|
2013-05-06 22:45:11 -04:00 |
|
alexandre benoit
|
a5acc9ee1f
|
nicer interface with the use of InputArray and OutptArray instated of (const Mat&)
|
2013-05-03 11:45:13 +02:00 |
|
alexandre benoit
|
b58d9f1c2a
|
enhancing documentation
|
2013-05-01 19:35:32 +02:00 |
|
alexandre benoit
|
f5d2d7b29b
|
enhancing documentation
|
2013-05-01 13:58:53 +02:00 |
|
alexandre benoit
|
cf6e833169
|
trying to solve valarray pointer access problem, enhancing documentation
|
2013-05-01 11:47:26 +02:00 |
|
alexandre benoit
|
9adde75be3
|
updated doc+minor typo/buildbot reports correction
|
2013-04-30 20:26:00 +02:00 |
|
alexandre benoit
|
9c26387ce0
|
updated sources to correct buildbot warnings
|
2013-04-30 17:32:47 +02:00 |
|
alexandre benoit
|
25b482f1c9
|
updated/corrected documentation
|
2013-04-30 16:52:47 +02:00 |
|
alexandre benoit
|
a659e287fb
|
minor error correction
|
2013-04-30 14:52:14 +02:00 |
|
alexandre benoit
|
80e65e08b5
|
updated doc and interface code to solve compile warnings and errors
|
2013-04-30 14:40:03 +02:00 |
|
alexandre benoit
|
b70b5a3011
|
corrections required for portability. To be validated by buildbot
|
2013-04-30 13:13:50 +02:00 |
|
alexandre benoit
|
1976b3d9b6
|
updated doc
|
2013-04-29 20:08:13 +02:00 |
|
alexandre benoit
|
72742f5316
|
resolved conflicts, updated retina class interface and optimized a heavy retinacolor process
|
2013-04-29 19:06:35 +02:00 |
|
alexandre benoit
|
9549949228
|
minor chnges for conflict removal
|
2013-04-29 15:12:44 +02:00 |
|
albenoit
|
9e1ce1ed52
|
Merge pull request #2 from albenoit/retina_devel
Retina devel
|
2013-04-27 13:47:30 -07:00 |
|
alexandre benoit
|
737046916c
|
activated parallelized gradient computation
|
2013-04-27 21:30:35 +02:00 |
|
alexandre benoit
|
3b15eefcad
|
forgot method name update
|
2013-04-27 21:22:57 +02:00 |
|
alexandre benoit
|
b62d101115
|
updated retina interface for cleaner use, following OpenCV standards
|
2013-04-27 21:13:45 +02:00 |
|
Andrey Kamaev
|
909d6fcf51
|
Move legacy part of opencv_contrib to separate header
|
2013-04-12 19:37:40 +04:00 |
|
Andrey Kamaev
|
3b364330ad
|
Merge branch '2.4'
|
2013-04-12 15:35:38 +04:00 |
|
Andrey Kamaev
|
5e048d1fa5
|
Move C API of opencv_objdetect to separate file
Also move cv::linemod to own header
|
2013-04-12 14:37:01 +04:00 |
|
Andrey Kamaev
|
e5a33723fc
|
Move C API of opencv_calib3d to separate file
|
2013-04-11 21:00:17 +04:00 |
|
Roman Donchenko
|
57d4c86b2b
|
Fixed the shebang lines on the Python scripts.
Also, removed the one from modules/python/src2/cv.py and cleared its
executable bit, since it's not a script.
|
2013-04-11 18:37:23 +04:00 |
|
Andrey Kamaev
|
199a35a105
|
Move C API of opencv_video to separate file
|
2013-04-11 17:38:33 +04:00 |
|
Andrey Kamaev
|
c98c246fc2
|
Move border type constants and Moments class to core module
|
2013-04-10 19:14:24 +04:00 |
|
Andrey Kamaev
|
0738ea7d0f
|
Make highgui.hpp independent from C API
|
2013-04-08 15:47:29 +04:00 |
|
Andrey Kamaev
|
67073daf19
|
Merge branch '2.4'
|
2013-04-05 21:11:59 +04:00 |
|
Alexander Shishkov
|
382695ba5a
|
removed links to the http://opencv.willowgarage.com/
|
2013-04-04 13:44:28 +04:00 |
|
Andrey Kamaev
|
940eedfb27
|
Finalize core headers reorganization
|
2013-04-03 14:10:03 +04:00 |
|
Andrey Kamaev
|
727a339455
|
Merge pull request #730 from vpisarev:ba_fix
|
2013-04-02 15:24:12 +04:00 |
|
Andrey Kamaev
|
517062039e
|
Make core/internal.hpp a private header
|
2013-04-01 17:29:10 +04:00 |
|
Andrey Kamaev
|
715fa3303e
|
Move cv::Mat out of core.hpp
|
2013-04-01 15:24:34 +04:00 |
|
Vadim Pisarevsky
|
10702c6d75
|
fixes in bundle adjustment code by Nils Hasler
|
2013-04-01 15:20:35 +04:00 |
|
Andrey Kamaev
|
db45e04d58
|
Merge pull request #720 from taka-no-me:drop_sort
|
2013-04-01 15:14:45 +04:00 |
|
Vladislav Vinogradov
|
d27d091e59
|
fixed mind/maxd search in CvFuzzyMeanShiftTracker::SearchWindow::initDepthValues
|
2013-04-01 11:53:05 +04:00 |
|
Andrey Kamaev
|
cc6bdfb045
|
Remove inline sorting algorithms from core headers
|
2013-03-28 17:22:50 +04:00 |
|
Andrey Kamaev
|
49f6dad13f
|
Move cv::KeyPoint and cv::DMatch to core
|
2013-03-26 16:08:43 +04:00 |
|
Andrey Kamaev
|
33ef7990b0
|
Update documentation
|
2013-03-22 22:14:54 +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
|
2ad7b97f1c
|
All modules (except ocl and gpu) compiles and pass tests
|
2013-03-22 22:14:26 +04:00 |
|
Andrey Kamaev
|
82d7292ee7
|
Merge pull request #680 from vpisarev:c2cpp_video_take2
|
2013-03-22 19:34:53 +04:00 |
|