 Roman Donchenko
|
2c4bbb313c
|
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
|
2013-08-27 13:26:44 +04:00 |
|
|
Roman Donchenko
|
3c137f7a04
|
Converted tabs to spaces.
|
2013-08-21 18:59:26 +04:00 |
|
|
Roman Donchenko
|
e9a28f66ee
|
Normalized file endings.
|
2013-08-21 18:59:25 +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
|
1ca8f33b4e
|
Merge branch '2.4'
|
2013-03-21 23:11:54 +04:00 |
|
|
Andrey Kamaev
|
6846f881a2
|
Move OpenCL SURF to nonfree module
|
2013-03-21 17:59:35 +04:00 |
|
|
Andrey Kamaev
|
891d7da6ee
|
Merge branch '2.4'
|
2013-02-28 11:17:06 +04:00 |
|
 yao
|
0ac7f0d374
|
Simplify the bind texture logic of interpolate frame function
|
2013-02-26 17:12:03 +08:00 |
|
|
Andrey Kamaev
|
2a6fb2867e
|
Remove all using directives for STL namespace and members
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
|
2013-02-25 15:04:17 +04:00 |
|
|
yao
|
f1a5c1328c
|
remove the empty implementation when HAVE_OPENCL not defined
|
2013-02-23 20:50:03 +08:00 |
|
|
Andrey Kamaev
|
9509dfd1de
|
Fix OpenCL build warnings
|
2013-01-25 16:19:59 +04:00 |
|
 NikoKJ
|
9ccdd17376
|
eliminate all the warnings on win32 and win64
add a new function abssum
fix the bug of test and perf because someone remove non-free module from cmakelist.txt
|
2012-10-30 13:01:42 +04:00 |
|
 OpenCV Buildbot
|
04384a71e4
|
Normalize line endings and whitespace
|
2012-10-17 15:32:23 +04:00 |
|
|
niko
|
97156897b2
|
format files to ANSI C style with coolformat
change the download channels to oclchannles()
fix bugs of arithm functions
perf fix of bilateral
bug fix of split test case
add build_warps functions
|
2012-10-11 16:22:47 +08:00 |
|