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
|
8fdab9f631
|
Merge branch '2.4'
|
2013-04-17 12:07:17 +04:00 |
|
Andrey Kamaev
|
96b008cd29
|
Eliminate the need of ::testsing::ValuesIn() for CV_ENUM
Also cv::, cv::gpu:: and cv::ocl:: namespace prefixes can be safely omitted
inside CV_ENUM and CV_FLAGS
|
2013-04-15 19:39:49 +04: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 |
|
OpenCV Buildbot
|
81f826db2b
|
Normalize line endings and whitespace
|
2012-10-17 15:57:49 +04:00 |
|
OpenCV Buildbot
|
04384a71e4
|
Normalize line endings and whitespace
|
2012-10-17 15:32:23 +04:00 |
|
Vadim Pisarevsky
|
06a13d9ba0
|
replaced jpegs with png's. Accuracy tests pass; performance tests were not tried yet
|
2012-10-02 23:07:46 +04:00 |
|
Andrey Kamaev
|
a33d67f48a
|
Updated sanity checks for some imgproc perf tests
|
2012-05-24 15:42:07 +00:00 |
|
Vadim Pisarevsky
|
d5a0088bbe
|
merged 2.4 into trunk
|
2012-04-30 14:33:52 +00:00 |
|
Kirill Kornyakov
|
49f29aeb6a
|
Created perf tests for cornerHarris, cornerEigenValsAndVecs, goodFeaturesToTrack, adaptiveThreshold, HoughLines.
|
2012-01-16 13:35:16 +00:00 |
|