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 |
|
Alexander Smorkalov
|
91c519467d
|
WinRT build fix for samples and static libs.
|
2013-06-25 03:36:07 -07:00 |
|
Andrey Kamaev
|
b8ed00bd64
|
Compile OpenCV with GCC visibility set to hidden
|
2013-05-13 18:33:20 +04:00 |
|
Andrey Kamaev
|
29cfeb7cee
|
Fix build of apps and samples
|
2013-03-22 22:14:36 +04:00 |
|
Andrey Kamaev
|
bd0e0b5800
|
Merged the trunk r8589:8653 - all changes related to build warnings
|
2012-06-15 13:04:17 +00:00 |
|
Andrey Kamaev
|
49a1ba6038
|
Set stricter warning rules for gcc
|
2012-06-07 17:21:29 +00:00 |
|
Vadim Pisarevsky
|
4985c1b632
|
fixed hundreds of warnings from MSVC 2010.
|
2012-03-16 21:21:04 +00:00 |
|
Maria Dimashova
|
e6009c1614
|
added sample on color generation and updated sample on lsvm
|
2011-10-06 09:43:43 +00:00 |
|
Maria Dimashova
|
bbdf14b9bb
|
added overlapThreshold param to sample
|
2011-10-05 13:37:24 +00:00 |
|
Maria Dimashova
|
ea454e6ee4
|
uncommented the samples parts compiled under MSVC
|
2011-10-04 06:32:18 +00:00 |
|
Maria Dimashova
|
a2ff919a6b
|
added sample for c++ version of latent svm
|
2011-10-03 16:53:30 +00:00 |
|