Roman Donchenko
|
4cf9990d4e
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
doc/tutorials/definitions/noContent.rst
doc/tutorials/gpu/gpu-basics-similarity/gpu-basics-similarity.rst
doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
doc/tutorials/introduction/how_to_write_a_tutorial/how_to_write_a_tutorial.rst
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/include/opencv2/core/version.hpp
modules/gpu/CMakeLists.txt
modules/highgui/perf/perf_output.cpp
modules/highgui/test/test_video_io.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/main.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/opencl/moments.cl
modules/ocl/test/main.cpp
modules/ocl/test/test_moments.cpp
modules/python/test/test.py
modules/ts/include/opencv2/ts/ts_perf.hpp
modules/ts/src/precomp.hpp
modules/ts/src/ts_perf.cpp
|
2013-07-03 19:53:21 +04:00 |
|
Kirill Kornyakov
|
cbed07bc18
|
Removed references to YG from samples
|
2013-06-28 12:21:52 +04:00 |
|
Andrey Kamaev
|
e5a33723fc
|
Move C API of opencv_calib3d to separate file
|
2013-04-11 21:00:17 +04:00 |
|
Andrey Kamaev
|
288a0634c2
|
Make imgproc.hpp independent from C API
|
2013-04-08 15:47:28 +04:00 |
|
Alexander Shishkov
|
35f75147b0
|
removed willowgarage.com links
|
2013-04-04 14:33:00 +04:00 |
|
Andrey Kamaev
|
bd0e0b5800
|
Merged the trunk r8589:8653 - all changes related to build warnings
|
2012-06-15 13:04:17 +00:00 |
|
Vadim Pisarevsky
|
9a991a2e10
|
fixed build problems on Windows
|
2011-04-18 15:14:32 +00:00 |
|
Vadim Pisarevsky
|
8347cb8cf7
|
added check for the board size
|
2010-12-04 13:45:58 +00:00 |
|
Gary Bradski
|
b7da9d4be1
|
revamped
|
2010-12-04 08:24:31 +00:00 |
|
Vadim Pisarevsky
|
6a15ff8d13
|
added cvSave(contours) to the contours demo; added rational model demonstration to stereo_calib; fixed formatting in imgproc/types_c.h
|
2010-12-03 19:09:06 +00:00 |
|
Vadim Pisarevsky
|
3fd07809c9
|
make cv::calibrateCamera, cv::stereoCalibrate and their C counterparts return the standard RMS error.
|
2010-11-30 10:27:34 +00:00 |
|
Vadim Pisarevsky
|
eea43c6a46
|
added CV_CALIB_RATIONAL_MODEL for better backward compatibility
|
2010-11-29 20:06:44 +00:00 |
|
Vadim Pisarevsky
|
d61464a756
|
rewrote stereo_calib in C++
|
2010-11-29 13:31:52 +00:00 |
|
Vadim Pisarevsky
|
f2a3e7e312
|
converted some more samples to C++
|
2010-11-28 19:41:55 +00:00 |
|
Vadim Pisarevsky
|
ee3618243d
|
converted some OpenCV C samples to C++
|
2010-11-27 23:15:16 +00:00 |
|