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
|
aef347e7b3
|
Removed references to opencv.itseez.com
|
2013-06-28 12:48:12 +04:00 |
|
Andrey Kamaev
|
8f32902ce6
|
Minimize usages of legacy C API inside the library
|
2013-04-16 12:00:02 +04:00 |
|
Andrey Kamaev
|
3b364330ad
|
Merge branch '2.4'
|
2013-04-12 15:35:38 +04:00 |
|
Andrey Kamaev
|
0738ea7d0f
|
Make highgui.hpp independent from C API
|
2013-04-08 15:47:29 +04:00 |
|
Siva Prasad Varma
|
e2df8c7e62
|
Fix bug #2590
replaced wrong check to correct check
|
2013-04-05 19:09:09 +05:30 |
|
Andrey Kamaev
|
89356ff16d
|
Move non-CV functionality from core.hpp to separate utility.hpp header
|
2013-03-20 17:56:06 +04:00 |
|
Marina Kolpakova
|
b156e2f7ed
|
added FREAK (by Kirell Benzi, Raphael Ortiz, Alexandre Alahi and Pierre Vandergheynst)
|
2012-06-28 16:46:29 +00:00 |
|
Andrey Kamaev
|
ec3a7665b0
|
Fixed FREAK on Android
|
2012-06-25 11:19:11 +00:00 |
|
Vadim Pisarevsky
|
74707ec7ae
|
added FREAK (by Kirell Benzi, Raphael Ortiz, Alexandre Alahi and Pierre Vandergheynst)
|
2012-06-24 01:37:55 +00:00 |
|