Roman Donchenko
|
78be4f66f7
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
CMakeLists.txt
modules/calib3d/src/calibration.cpp
modules/ocl/src/cl_programcache.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
samples/ocl/adaptive_bilateral_filter.cpp
samples/ocl/bgfg_segm.cpp
samples/ocl/clahe.cpp
samples/ocl/facedetect.cpp
samples/ocl/pyrlk_optical_flow.cpp
samples/ocl/squares.cpp
samples/ocl/surf_matcher.cpp
samples/ocl/tvl1_optical_flow.cpp
|
2013-10-28 13:38:25 +04:00 |
|
Roman Donchenko
|
f82eb0f79c
|
Add better OpenMP detection and make an option to enable it.
Bug report and inspiration: http://code.opencv.org/issues/3328
|
2013-10-22 18:47:37 +04:00 |
|
Roman Donchenko
|
9b92545ce6
|
War on Whitespace, master edition: trailing spaces.
|
2013-08-27 13:57:24 +04:00 |
|
Andrey Kamaev
|
67073daf19
|
Merge branch '2.4'
|
2013-04-05 21:11:59 +04:00 |
|
Andrey Kamaev
|
fa64f28c6b
|
Fix binary directory used in CMake try_compile commands
Old paths can have problems with cross-compilation
|
2013-04-04 15:43:49 +04:00 |
|
Andrey Kamaev
|
262fc929aa
|
Merge branch '2.4'
|
2013-02-18 15:35:42 +04:00 |
|
Andrey Kamaev
|
c7df17e77b
|
Detect and report parallel framework used
|
2013-02-13 15:09:30 +04:00 |
|
Anatoly Baksheev
|
275ab53ebc
|
Added default Eigen search path to support Eigen that comes with PCL
|
2012-10-23 15:12:39 +04:00 |
|
Andrey Kamaev
|
7225f89ea2
|
Revert opencv_videostab to the state of 2.4.2
|
2012-10-17 02:09:43 +04:00 |
|
Vadim Pisarevsky
|
e625d86485
|
added C= support; modified threading logic in threshold
|
2012-10-10 15:36:32 +04:00 |
|
Vadim Pisarevsky
|
a63669f819
|
fixed linking CLP in the case of MinGW (patch #1872)
|
2012-10-08 22:24:38 +04:00 |
|
Andrey Kamaev
|
ece71d6a06
|
Remove misused REQUIRED keyword from CMake scripts
|
2012-09-17 13:21:20 +04:00 |
|
Andrey Kamaev
|
200a81746e
|
Improve Eigen search
Should now automatically detect it during Android build
|
2012-09-10 18:15:29 +04:00 |
|
Andrey Kamaev
|
ca6d2fe76b
|
Moved 3rd-party libraries detection to separate cmake files
|
2012-05-25 13:12:02 +00:00 |
|