Roman Donchenko
90c28d254f
Merge pull request #1961 from SpecLad:merge-2.4
2013-12-10 14:39:35 +04:00
Ilya Lavrenov
c9e6ed7a29
added cv::blendLinear
2013-12-10 13:07:52 +04:00
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
2013-12-10 12:51:00 +04:00
Roman Donchenko
5c72c74b09
Merge pull request #1960 from ilya-lavrenov:tapi_bilateral
2013-12-10 12:13:15 +04:00
Roman Donchenko
13c058ecf8
Merge pull request #1959 from botverse:2.4
2013-12-09 17:25:33 +04:00
Roman Donchenko
9d87f9c974
Merge pull request #1956 from ilya-lavrenov:tapi_split_merge
2013-12-09 16:56:06 +04:00
Roman Donchenko
f3ba1a361e
Merge pull request #1930 from alalek:cmake_msvs_subfolders
2013-12-09 16:21:16 +04:00
Ilya Lavrenov
93c6fe66ce
added cv::bilateralFilter to T-API
2013-12-09 16:03:25 +04:00
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.
2013-12-09 09:54:42 -02:00
Alfonso (the fonz) de la Osa
df0c43321d
--no-display property fix in stereo_match.cpp sample
2013-12-09 10:55:44 +00:00
Roman Donchenko
24465bbd05
Merge pull request #1855 from Nerei:master
2013-12-09 14:13:40 +04:00
Roman Donchenko
8db53c1760
Merge pull request #1883 from philippefoubert:branch_matx_inv
2013-12-09 14:07:10 +04:00
Andrey Pavlenko
0dfa188ca5
Merge pull request #1948 from ilya-lavrenov:tapi_norm
2013-12-09 13:25:41 +04:00
Roman Donchenko
8f10ca5180
Merge pull request #1946 from asmorkalov:android_manager_version_inc3
2013-12-09 13:14:16 +04:00
Andrey Pavlenko
041ad1f4cd
Merge pull request #1944 from ilya-lavrenov:minor_commits
2013-12-09 12:44:26 +04:00
Vladimir Bystricky
8d8f5665f1
Fix build errors on Linux system
2013-12-09 11:31:55 +04:00
Vladimir Bystricky
179a43ef63
Fix build errors on Linux system
2013-12-09 11:10:48 +04:00
Vladimir Bystricky
29ba7730ed
Add ocl version of filter2D to the module img_proc
2013-12-09 10:45:23 +04:00
Ilya Lavrenov
c16c9a2e8e
added cv::split to T-API
2013-12-08 16:30:17 +04:00
Ilya Lavrenov
b6c33bf86b
added cv::norm to T-API
2013-12-08 15:27:48 +04:00
Ilya Lavrenov
cd3f7fbf05
added cv::merge to T-API
2013-12-08 13:49:28 +04:00
Anatoly Baksheev
4c66b87698
fixed -Wshadow and other warnings, added rvec test
2013-12-07 20:33:50 +04:00
Anatoly Baksheev
f62ffa2aea
compilation
2013-12-07 18:58:29 +04:00
Anatoly Baksheev
f9ca6cfd22
fixed ocv_module_disable()
2013-12-07 18:58:28 +04:00
Anatoly Baksheev
a54ef70c04
minor insignificant corrections
2013-12-07 18:58:28 +04:00
Anatoly Baksheev
546c084fe6
fixed shadow error and added ocv_disable_module
2013-12-07 18:58:27 +04:00
Anatoly Baksheev
0e88733b13
updating Viz cmake (switched to WITH_VTK option)
2013-12-07 18:58:27 +04:00
Anatoly Baksheev
3830a0b5b2
fixed bug with deletion from std::map
2013-12-07 18:50:47 +04:00
Anatoly Baksheev
a6ab9be5a6
removed VizAccessor from docs
2013-12-07 18:50:47 +04:00
Anatoly Baksheev
fb62a66b69
removed unused code
2013-12-07 18:50:46 +04:00
Anatoly Baksheev
b88fdc73d6
VizAccessor is now private and renamed to VizStorage
2013-12-07 18:50:46 +04:00
Anatoly Baksheev
d970d58308
added Viz::tutorial2 test
2013-12-07 18:50:45 +04:00
Anatoly Baksheev
ace71cef3f
Added Affine3<T>::rvec()
2013-12-07 18:50:45 +04:00
Anatoly Baksheev
9f1f5aed53
compilation
2013-12-07 18:50:44 +04:00
Anatoly Baksheev
a9c7aa92d9
removed CV_EXPORTS from cv::Afiine
2013-12-07 18:50:44 +04:00
Anatoly Baksheev
177f7eb339
fixed warning
2013-12-07 18:50:43 +04:00
Anatoly Baksheev
0895616576
switched from unnecessarily 'dobule' to 'float' in some places (commonly for widget scale)
2013-12-07 18:50:43 +04:00
Anatoly Baksheev
b560cc35d9
removed Ptr typedef from Viz3d. It is deprecated since Viz3d itseez is a shared pointer
2013-12-07 18:50:42 +04:00
Alexander Alekhin
0eb2be762a
cmake: allow source_group to preserve file-system tree (for MSVS)
2013-12-07 14:38:59 +04:00
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
2013-12-07 15:40:30 +08:00
Vadim Pisarevsky
fdf1996e2e
added old=>new cascade conversion function
2013-12-07 01:51:35 +04:00
Ilya Lavrenov
73aa43d2ca
fixed warnings
2013-12-07 01:05:07 +04:00
Alexander Smorkalov
9f04222a75
OpenCV Manager version++.
2013-12-06 18:53:03 +04:00
Roman Donchenko
060e58d080
Merge pull request #1945 from apavlenko:2.4_version_update
2013-12-06 17:56:59 +04:00
Roman Donchenko
d368bf5210
Merge pull request #1941 from vhdirk:gst1x_default
2013-12-06 17:50:44 +04:00
Andrey Pavlenko
b5936648ca
Merge pull request #1943 from pentschev:ocl_oclMat_ptr_remove_2.4
2013-12-06 16:59:02 +04:00
Andrey Pavlenko
a0c296fcdb
Merge pull request #1936 from ElenaGvozdeva:ocl_flip
2013-12-06 16:40:30 +04:00
Andrey Pavlenko
f2cf9dd8bf
updating version to 2.4.7.2
2013-12-06 16:21:22 +04:00
Andrey Pavlenko
7069b4b761
Merge pull request #1927 from JBosch:issue3409
2013-12-06 16:06:03 +04:00
Andrey Pavlenko
0e3553130a
Merge pull request #1872 from KonstantinMatskevich:ocl_mt_test
2013-12-06 16:00:10 +04:00