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 |
|
Vladislav Vinogradov
|
3eeaa9189c
|
Revert "Revert "Merge pull request #836 from jet47:gpu-modules""
|
2013-06-07 13:05:39 +04:00 |
|
Andrey Kamaev
|
416fb50594
|
Revert "Merge pull request #836 from jet47:gpu-modules"
This reverts commit fba72cb60d, reversing
changes made to 02131ffb62.
|
2013-04-18 15:03:50 +04:00 |
|
Vladislav Vinogradov
|
564f609885
|
fixed samples compilation
|
2013-04-18 13:28:34 +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
|
0738ea7d0f
|
Make highgui.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
|
89356ff16d
|
Move non-CV functionality from core.hpp to separate utility.hpp header
|
2013-03-20 17:56:06 +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 |
|
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 |
|
Vladislav Vinogradov
|
d38ca09738
|
added gpu::printCudaDeviceInfo to all samples
|
2012-01-30 07:20:09 +00:00 |
|
Vladislav Vinogradov
|
11a5e78042
|
fixed gpu samples build
|
2011-10-31 12:39:06 +00:00 |
|
Alexey Spizhevoy
|
a2090a44db
|
Updated CLI for GPU samples
|
2011-10-24 08:34:15 +00:00 |
|
Alexey Spizhevoy
|
ea01adb9c9
|
fixed writing video in HOG sample
|
2011-01-14 08:08:02 +00:00 |
|
Alexey Spizhevoy
|
4dfbf99dd5
|
cosmetic changes in gpu module, decreased matchTemplate test running time
|
2011-01-12 09:30:08 +00:00 |
|
Alexey Spizhevoy
|
1a34fa30f4
|
video writing via cmd args in hog sample added
|
2010-12-30 07:19:32 +00:00 |
|
Alexey Spizhevoy
|
ab543b5085
|
updated gpu hog sample
|
2010-12-29 16:08:56 +00:00 |
|
Alexey Spizhevoy
|
2f13e4ce58
|
refactored hog, added camera support into hog_sample
|
2010-12-29 15:45:01 +00:00 |
|
Alexey Spizhevoy
|
edce202065
|
added first version of stereo match sample on gpu
|
2010-12-21 07:35:46 +00:00 |
|
Alexey Spizhevoy
|
a2ace58bb0
|
gpu hog sample: added support of writing video
|
2010-12-20 12:29:57 +00:00 |
|
Alexey Spizhevoy
|
0036cabaf2
|
fixed total FPS evaluation in the GPU HOG sample
|
2010-12-07 07:56:30 +00:00 |
|
Alexey Spizhevoy
|
df48ad76b0
|
added support of gamama_correction parameter into gpu::HOGDescriptor, updated tests
|
2010-12-03 11:11:44 +00:00 |
|
Anatoly Baksheev
|
0e43976259
|
1) more convenient naming for samples gpu
2) added mask support to device 'transform' function
3) sample hog gpu: waitKey(1) -> waitKey(3), in other case image is not displayed.
|
2010-11-24 09:43:17 +00:00 |
|
Anatoly Baksheev
|
790cd2ef28
|
just for more convenient naming
|
2010-11-24 09:36:18 +00:00 |
|