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
|
e9a28f66ee
|
Normalized file endings.
|
2013-08-21 18:59:25 +04:00 |
|
Andrey Kamaev
|
715fa3303e
|
Move cv::Mat out of core.hpp
|
2013-04-01 15:24:34 +04:00 |
|
Maria Dimashova
|
0b4e96d89c
|
updated thresholds in EM test after cv::EM fixing
|
2012-07-11 13:52:19 +00:00 |
|
Andrey Kamaev
|
d9c74f63e1
|
All tests writing temporary files are updated to use cv::tempfile() function
|
2012-06-25 11:24:06 +00:00 |
|
Andrey Kamaev
|
d48d7b2b46
|
Updated warning options for GCC; fixed new warnings.
|
2012-06-20 12:27:02 +00:00 |
|
Andrey Kamaev
|
f2d3b9b4a1
|
Warning fixes continued
|
2012-06-09 15:00:04 +00:00 |
|
Vadim Pisarevsky
|
d5a0088bbe
|
merged 2.4 into trunk
|
2012-04-30 14:33:52 +00:00 |
|
Vadim Pisarevsky
|
2fd1e2ea57
|
merged all the latest changes from 2.4 to trunk
|
2012-04-13 21:50:59 +00:00 |
|
Maria Dimashova
|
8d9d964550
|
added smoke test on EM, fixed EM reading #1570 (thanks to mr.pppoe),
|
2012-03-29 08:55:43 +00:00 |
|
Maria Dimashova
|
008a1c91fd
|
fixed em test
|
2012-03-29 07:01:57 +00:00 |
|
Vadim Pisarevsky
|
2d2b8a496e
|
renamed "None()" to "noArray()" to avoid conflicts with X11 (ticket #1122)
|
2011-06-08 06:55:04 +00:00 |
|
Vadim Pisarevsky
|
0c877f62e9
|
replaced "const InputArray&" => "InputArray"; made InputArray and OutputArray references. added "None()" constant (no array()).
|
2011-06-06 14:51:27 +00:00 |
|
Vadim Pisarevsky
|
abeeb40d46
|
a big patch; use special proxy types (Input/OutputArray, Input/OutputArrayOfArrays) for passing in vectors, matrices etc.
|
2011-04-17 13:14:45 +00:00 |
|
Vadim Pisarevsky
|
061b49e0b2
|
reworked nearly all of the OpenCV tests (except for opencv_gpu tests) - they now use the Google Test engine.
|
2011-02-09 20:55:11 +00:00 |
|