Roman Donchenko
90c28d254f
Merge pull request #1961 from SpecLad:merge-2.4
11 years ago
Ilya Lavrenov
c9e6ed7a29
added cv::blendLinear
11 years ago
Roman Donchenko
464a010f53
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/operations.hpp
modules/core/include/opencv2/core/version.hpp
modules/core/src/gpumat.cpp
modules/cudaimgproc/src/color.cpp
modules/features2d/src/orb.cpp
modules/imgproc/src/samplers.cpp
modules/ocl/include/opencv2/ocl/matrix_operations.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
samples/ocl/facedetect.cpp
11 years ago
Roman Donchenko
5c72c74b09
Merge pull request #1960 from ilya-lavrenov:tapi_bilateral
11 years ago
Roman Donchenko
13c058ecf8
Merge pull request #1959 from botverse:2.4
11 years ago
Roman Donchenko
9d87f9c974
Merge pull request #1956 from ilya-lavrenov:tapi_split_merge
11 years ago
Roman Donchenko
f3ba1a361e
Merge pull request #1930 from alalek:cmake_msvs_subfolders
11 years ago
Ilya Lavrenov
93c6fe66ce
added cv::bilateralFilter to T-API
11 years ago
Peter Andreas Entschev
6f3163f62d
DescriptorExtractor: added defaultNorm() to return default norm type.
...
Added the defaultNorm() method to the DescriptorExtractor class. This method returns the default norm type for each descriptor type. The tests and C/C++ samples were updated to get the norm type directly from the DescriptorExtractor inherited classes.
This was reported in feature report #2182 (http://code.opencv.org/issues/2182 ). It will make it possible to get the norm type usually applied matching method for each descriptor, instead of passing it manually.
11 years ago
Alfonso (the fonz) de la Osa
df0c43321d
--no-display property fix in stereo_match.cpp sample
11 years ago
Roman Donchenko
24465bbd05
Merge pull request #1855 from Nerei:master
11 years ago
Roman Donchenko
8db53c1760
Merge pull request #1883 from philippefoubert:branch_matx_inv
11 years ago
Andrey Pavlenko
0dfa188ca5
Merge pull request #1948 from ilya-lavrenov:tapi_norm
11 years ago
Roman Donchenko
8f10ca5180
Merge pull request #1946 from asmorkalov:android_manager_version_inc3
11 years ago
Andrey Pavlenko
041ad1f4cd
Merge pull request #1944 from ilya-lavrenov:minor_commits
11 years ago
Vladimir Bystricky
8d8f5665f1
Fix build errors on Linux system
11 years ago
Vladimir Bystricky
179a43ef63
Fix build errors on Linux system
11 years ago
Vladimir Bystricky
29ba7730ed
Add ocl version of filter2D to the module img_proc
11 years ago
Anatoly Baksheev
262f70f3ab
cv::format declaration in default headers
11 years ago
Ilya Lavrenov
c16c9a2e8e
added cv::split to T-API
11 years ago
Ilya Lavrenov
b6c33bf86b
added cv::norm to T-API
11 years ago
Ilya Lavrenov
cd3f7fbf05
added cv::merge to T-API
11 years ago
Anatoly Baksheev
4c66b87698
fixed -Wshadow and other warnings, added rvec test
11 years ago
Anatoly Baksheev
f62ffa2aea
compilation
11 years ago
Anatoly Baksheev
f9ca6cfd22
fixed ocv_module_disable()
11 years ago
Anatoly Baksheev
a54ef70c04
minor insignificant corrections
11 years ago
Anatoly Baksheev
546c084fe6
fixed shadow error and added ocv_disable_module
11 years ago
Anatoly Baksheev
0e88733b13
updating Viz cmake (switched to WITH_VTK option)
11 years ago
Anatoly Baksheev
3830a0b5b2
fixed bug with deletion from std::map
11 years ago
Anatoly Baksheev
a6ab9be5a6
removed VizAccessor from docs
11 years ago
Anatoly Baksheev
fb62a66b69
removed unused code
11 years ago
Anatoly Baksheev
b88fdc73d6
VizAccessor is now private and renamed to VizStorage
11 years ago
Anatoly Baksheev
d970d58308
added Viz::tutorial2 test
11 years ago
Anatoly Baksheev
ace71cef3f
Added Affine3<T>::rvec()
11 years ago
Anatoly Baksheev
9f1f5aed53
compilation
11 years ago
Anatoly Baksheev
a9c7aa92d9
removed CV_EXPORTS from cv::Afiine
11 years ago
Anatoly Baksheev
177f7eb339
fixed warning
11 years ago
Anatoly Baksheev
0895616576
switched from unnecessarily 'dobule' to 'float' in some places (commonly for widget scale)
11 years ago
Anatoly Baksheev
b560cc35d9
removed Ptr typedef from Viz3d. It is deprecated since Viz3d itseez is a shared pointer
11 years ago
Alexander Alekhin
0eb2be762a
cmake: allow source_group to preserve file-system tree (for MSVS)
11 years ago
GregoryMorse
68d8f6410f
Update system.cpp
...
Cleaned up to use the preferred namespace code. This can be further simplified by using the HString/HStringReference classes from wrl\wrappers\corewrappers.h
11 years ago
Vadim Pisarevsky
fdf1996e2e
added old=>new cascade conversion function
11 years ago
Ilya Lavrenov
73aa43d2ca
fixed warnings
11 years ago
Alexander Smorkalov
9f04222a75
OpenCV Manager version++.
11 years ago
Roman Donchenko
060e58d080
Merge pull request #1945 from apavlenko:2.4_version_update
11 years ago
Roman Donchenko
d368bf5210
Merge pull request #1941 from vhdirk:gst1x_default
11 years ago
Andrey Pavlenko
b5936648ca
Merge pull request #1943 from pentschev:ocl_oclMat_ptr_remove_2.4
11 years ago
Andrey Pavlenko
a0c296fcdb
Merge pull request #1936 from ElenaGvozdeva:ocl_flip
11 years ago
Andrey Pavlenko
f2cf9dd8bf
updating version to 2.4.7.2
11 years ago
Andrey Pavlenko
7069b4b761
Merge pull request #1927 from JBosch:issue3409
11 years ago