Roman Donchenko
|
6b5ac42a9b
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
modules/features2d/doc/object_categorization.rst
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/image_filtering.rst
modules/gpu/doc/image_processing.rst
modules/gpu/doc/video.rst
modules/imgproc/doc/miscellaneous_transformations.rst
modules/imgproc/doc/object_detection.rst
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/samplers.cpp
modules/ml/doc/k_nearest_neighbors.rst
modules/nonfree/doc/feature_detection.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/photo/doc/inpainting.rst
modules/ts/include/opencv2/ts.hpp
platforms/scripts/camera_build.conf
samples/android/camera-calibration/AndroidManifest.xml
|
2013-08-13 12:56:39 +04:00 |
|
Roman Donchenko
|
dcaf923517
|
Merge remote-tracking branch 'origin/2.4'
Conflicts:
3rdparty/ffmpeg/ffmpeg_version.cmake
cmake/OpenCVFindLibsGrfmt.cmake
cmake/templates/cvconfig.h.cmake
modules/bioinspired/doc/retina/index.rst
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/calib3d/src/precomp.hpp
modules/contrib/src/inputoutput.cpp
modules/contrib/src/precomp.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/include/opencv2/core/types_c.h
modules/core/src/drawing.cpp
modules/core/src/precomp.hpp
modules/core/src/system.cpp
modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst
modules/features2d/doc/common_interfaces_of_feature_detectors.rst
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/features2d/src/precomp.hpp
modules/flann/src/precomp.hpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/image_filtering.rst
modules/gpu/doc/image_processing.rst
modules/gpu/doc/video.rst
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/perf4au/main.cpp
modules/gpu/src/imgproc.cpp
modules/gpu/src/precomp.hpp
modules/gpu/test/test_imgproc.cpp
modules/highgui/CMakeLists.txt
modules/highgui/test/test_precomp.hpp
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/precomp.hpp
modules/java/generator/src/cpp/Mat.cpp
modules/legacy/src/precomp.hpp
modules/ml/doc/k_nearest_neighbors.rst
modules/ml/src/precomp.hpp
modules/nonfree/doc/feature_detection.rst
modules/nonfree/src/precomp.hpp
modules/objdetect/include/opencv2/objdetect/objdetect.hpp
modules/objdetect/src/cascadedetect.cpp
modules/objdetect/src/hog.cpp
modules/objdetect/src/precomp.hpp
modules/objdetect/test/test_latentsvmdetector.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/opencl/objdetect_hog.cl
modules/ocl/src/precomp.hpp
modules/photo/src/precomp.hpp
modules/stitching/src/precomp.hpp
modules/superres/perf/perf_precomp.hpp
modules/superres/src/optical_flow.cpp
modules/superres/src/precomp.hpp
modules/superres/test/test_precomp.hpp
modules/ts/include/opencv2/ts.hpp
modules/video/src/precomp.hpp
modules/videostab/src/precomp.hpp
modules/world/src/precomp.hpp
|
2013-08-06 13:56:49 +04:00 |
|
Vladislav Vinogradov
|
4716f63444
|
fixed gpu performance tests:
used new CV_PERF_TEST_MAIN_WITH_IMPLS mechanism
|
2013-07-16 15:43:04 +04:00 |
|
Vladislav Vinogradov
|
b4d95b1406
|
fixed warnings in gpu modules from VS 2012
|
2013-07-03 22:21:10 +04:00 |
|
Vladislav Vinogradov
|
4e29f0ee6d
|
updated documentation
|
2013-06-18 08:36:49 +04:00 |
|
Vladislav Vinogradov
|
a380c473b9
|
switched to Input/Output Array in reprojectImageTo3D & drawColorDisp
|
2013-06-14 18:17:31 +04:00 |
|
Vladislav Vinogradov
|
3a02e599e0
|
refactored DisparityBilateralFilter
|
2013-06-14 18:17:31 +04:00 |
|
Vladislav Vinogradov
|
be9bb8f18b
|
refactored StereoConstantSpaceBP
|
2013-06-14 18:17:31 +04:00 |
|
Vladislav Vinogradov
|
d0e89337da
|
refactored StereoBeliefPropagation
|
2013-06-14 18:17:31 +04:00 |
|
Vladislav Vinogradov
|
dd6d58f873
|
refactored StereoBM
|
2013-06-14 18:17:30 +04:00 |
|
Vladislav Vinogradov
|
439c3574ed
|
renamed gpu_private.hpp to private.gpu.hpp
|
2013-06-10 12:40:32 +04:00 |
|
Vladislav Vinogradov
|
2dab93c2e8
|
refactored gpu info structures (TargetArchs and DeviceInfo)
now DeviceInfo provides full information about device (from cudaDeviceProp)
|
2013-06-10 12:40:32 +04:00 |
|
Vladislav Vinogradov
|
76f4b02b06
|
refactored gpu::Stream (minor fixes)
|
2013-06-10 12:40:31 +04:00 |
|
Vladislav Vinogradov
|
4c9773d55f
|
renamed gpu headers (made it more consistent)
|
2013-06-10 12:40:30 +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
|
28b1caa730
|
gpustereo module for stereo correspondence
|
2013-04-18 11:33:33 +04:00 |
|