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
|
909d6fcf51
|
Move legacy part of opencv_contrib to separate header
|
2013-04-12 19:37:40 +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 |
|
Andrey Kamaev
|
199a35a105
|
Move C API of opencv_video to separate file
|
2013-04-11 17:38:33 +04:00 |
|
Andrey Kamaev
|
69648f0a6f
|
Make photo.hpp independent from C API
|
2013-04-08 15:47:29 +04:00 |
|
Andrey Kamaev
|
288a0634c2
|
Make imgproc.hpp independent from C API
|
2013-04-08 15:47:28 +04:00 |
|
Andrey Kamaev
|
517062039e
|
Make core/internal.hpp a private header
|
2013-04-01 17:29:10 +04:00 |
|
Andrey Kamaev
|
2b1ef95415
|
Completely separate C and C++ API of OpenCV core
|
2013-04-01 15:24:34 +04:00 |
|
Andrey Kamaev
|
89356ff16d
|
Move non-CV functionality from core.hpp to separate utility.hpp header
|
2013-03-20 17:56:06 +04:00 |
|
Andrey Kamaev
|
ad5cddc007
|
Main module headers are moved 1 level up
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>
Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
|
2013-03-13 17:26:56 +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
|
1618ed0a37
|
update the old and the new-style headers after moving some old stuff to the legacy
|
2010-11-26 18:01:16 +00:00 |
|
Marius Muja
|
16b1f61c83
|
Updated FLANN to version 1.5
|
2010-10-12 19:47:50 +00:00 |
|
Vadim Pisarevsky
|
bdd10c11f3
|
temporarily comment off the warnings about obsolete cxcore.h, cv.h etc.
|
2010-06-11 18:43:20 +00:00 |
|
Jose Luis Blanco
|
1e5f012e7f
|
- Added a Warning macro compatible with GCC & MSVC to cv.h
- Fixed extra text after #endif
|
2010-05-27 09:55:46 +00:00 |
|
Victor Erukhimov
|
b4c56aa184
|
Added for backward compatibility
|
2010-05-27 06:23:54 +00:00 |
|
Victor Erukhimov
|
c4631573a4
|
cv::cvflann -> cv::flann
|
2010-05-26 19:50:20 +00:00 |
|
Victor Erukhimov
|
97c598c0bc
|
Fixing a compiler problem of a prev rev
|
2010-05-26 12:45:29 +00:00 |
|
Victor Erukhimov
|
13523fd53a
|
Fixing compiler errors for outlet_pose_estimation
|
2010-05-26 12:34:48 +00:00 |
|
Victor Erukhimov
|
eff42cdabd
|
Added deprecation warning for gcc
|
2010-05-25 15:28:23 +00:00 |
|
Victor Erukhimov
|
201d4a068d
|
Added a warning for deprecated headers
|
2010-05-25 13:47:12 +00:00 |
|
Victor Erukhimov
|
600a55e5ac
|
Added headers for backward compatibility
|
2010-05-25 13:46:43 +00:00 |
|
Vadim Pisarevsky
|
127d6649a1
|
"atomic bomb" commit. Reorganized OpenCV directory structure
|
2010-05-11 17:44:00 +00:00 |
|