Roman Donchenko [Tue, 17 Dec 2013 10:11:50 +0000 (14:11 +0400)]
Merge pull request #1934 from vbystricky:ocl_boxFilter
Roman Donchenko [Tue, 17 Dec 2013 09:53:59 +0000 (13:53 +0400)]
Merge pull request #1881 from pentschev:defaultNorm_master
Roman Donchenko [Tue, 17 Dec 2013 09:21:47 +0000 (13:21 +0400)]
Merge pull request #1996 from SpecLad:merge-2.4
Roman Donchenko [Tue, 17 Dec 2013 09:19:59 +0000 (13:19 +0400)]
Merge pull request #1993 from StevenPuttemans:feature_2862
Roman Donchenko [Mon, 16 Dec 2013 11:02:42 +0000 (15:02 +0400)]
Fixed build for the TLS-related stuff.
Roman Donchenko [Mon, 16 Dec 2013 11:02:12 +0000 (15:02 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
doc/tutorials/definitions/tocDefinitions.rst
modules/core/include/opencv2/core/core.hpp
modules/core/src/system.cpp
modules/features2d/src/freak.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/cl_context.cpp
modules/ocl/test/test_api.cpp
StevenPuttemans [Mon, 16 Dec 2013 09:47:24 +0000 (10:47 +0100)]
Fixed descripotorsCount to descriptorsCount
See feature 2862
Andrey Pavlenko [Mon, 16 Dec 2013 09:04:21 +0000 (13:04 +0400)]
Merge pull request #1988 from ilya-lavrenov:tapi_umat_convertTo
Roman Donchenko [Mon, 16 Dec 2013 08:11:43 +0000 (12:11 +0400)]
Merge pull request #1990 from AD-530:Issue3164
Matthias Bady [Sun, 15 Dec 2013 21:41:07 +0000 (22:41 +0100)]
fixed init of clCxt
Ilya Lavrenov [Sun, 15 Dec 2013 10:00:24 +0000 (14:00 +0400)]
implemented UMat::convertTo
Andrey Pavlenko [Fri, 13 Dec 2013 15:47:33 +0000 (19:47 +0400)]
Merge pull request #1974 from ilya-lavrenov:tapi_equalizehist
Ilya Lavrenov [Thu, 12 Dec 2013 19:42:54 +0000 (23:42 +0400)]
added cv::equalizeHist to T-API
Andrey Pavlenko [Fri, 13 Dec 2013 15:34:28 +0000 (19:34 +0400)]
Merge pull request #1981 from ilya-lavrenov:tapi_sqrt
Andrey Pavlenko [Fri, 13 Dec 2013 15:29:49 +0000 (19:29 +0400)]
Merge pull request #1983 from ilya-lavrenov:tapi_umat
Ilya Lavrenov [Fri, 13 Dec 2013 13:59:53 +0000 (17:59 +0400)]
fixed UMat sync problems
Andrey Pavlenko [Fri, 13 Dec 2013 12:09:08 +0000 (16:09 +0400)]
Merge pull request #1980 from alalek:ocl_interop_initialization
Alexander Alekhin [Thu, 12 Dec 2013 15:59:22 +0000 (19:59 +0400)]
ocl: add support for initialization from user-provided OpenCL handles
Ilya Lavrenov [Thu, 12 Dec 2013 14:01:30 +0000 (18:01 +0400)]
added cv::sqrt to T-API (using built-in sqrt OpenCL function)
Andrey Pavlenko [Thu, 12 Dec 2013 13:37:09 +0000 (17:37 +0400)]
Merge pull request #1954 from pentschev:ocl_features2d_fast_master
Andrey Pavlenko [Thu, 12 Dec 2013 13:35:01 +0000 (17:35 +0400)]
Merge pull request #1979 from pentschev:ocl_arithm_sqrt_master
Andrey Pavlenko [Thu, 12 Dec 2013 13:27:33 +0000 (17:27 +0400)]
Merge pull request #1889 from alalek:ocl_core_dynamic_runtime
Peter Andreas Entschev [Thu, 12 Dec 2013 00:58:05 +0000 (22:58 -0200)]
OCL: included sqrt matrix operation.
Andrey Pavlenko [Thu, 12 Dec 2013 05:55:49 +0000 (09:55 +0400)]
Merge pull request #1978 from ilya-lavrenov:ocl_min_max
Andrey Pavlenko [Thu, 12 Dec 2013 05:55:33 +0000 (09:55 +0400)]
Merge pull request #1976 from alalek:ocl_multiple_command_queues
Peter Andreas Entschev [Sun, 8 Dec 2013 00:12:13 +0000 (22:12 -0200)]
OCL: including FAST feature detector.
Ilya Lavrenov [Wed, 11 Dec 2013 22:42:24 +0000 (02:42 +0400)]
fixed kernel compilation of cv::min, cv::max for CV_64F
Andrey Pavlenko [Wed, 11 Dec 2013 17:37:10 +0000 (21:37 +0400)]
Merge pull request #1970 from ilya-lavrenov:tapi_checks
Andrey Pavlenko [Wed, 11 Dec 2013 17:25:54 +0000 (21:25 +0400)]
Merge pull request #1971 from ilya-lavrenov:tapi_laplacian
Andrey Pavlenko [Wed, 11 Dec 2013 17:25:31 +0000 (21:25 +0400)]
Merge pull request #1975 from magomimmo:clj-tut
Alexander Alekhin [Wed, 11 Dec 2013 14:49:50 +0000 (18:49 +0400)]
ocl: implemented per-thread OpenCL command queue
Alexander Alekhin [Wed, 11 Dec 2013 14:49:13 +0000 (18:49 +0400)]
core: added TLS support
Andrey Pavlenko [Wed, 11 Dec 2013 13:51:36 +0000 (17:51 +0400)]
Merge pull request #1973 from ilya-lavrenov:ocl_haar_sample
Vladimir Bystricky [Wed, 11 Dec 2013 12:57:47 +0000 (16:57 +0400)]
Fix problems with border extrapolation in kernel. Add Isolated/Nonisolated borders.
Roman Donchenko [Wed, 11 Dec 2013 12:55:26 +0000 (16:55 +0400)]
Merge pull request #1968 from pentschev:fix_indentation_freak_2.4
Alexander Alekhin [Wed, 11 Dec 2013 12:46:08 +0000 (16:46 +0400)]
ocl: disabled test for Split (there are problems with OutputArray and getMatRef)
Andrey Pavlenko [Wed, 11 Dec 2013 12:41:12 +0000 (16:41 +0400)]
Merge pull request #1958 from vbystricky:ocl_filter2D
Mimmmo Cosenza [Wed, 11 Dec 2013 12:35:20 +0000 (13:35 +0100)]
remove Daniele
Mimmmo Cosenza [Wed, 11 Dec 2013 12:30:52 +0000 (13:30 +0100)]
add tutorial content
Mimmmo Cosenza [Wed, 11 Dec 2013 12:28:27 +0000 (13:28 +0100)]
add clojure tutorial
Mimmmo Cosenza [Wed, 11 Dec 2013 12:28:04 +0000 (13:28 +0100)]
add clojure logo
Mimmmo Cosenza [Wed, 11 Dec 2013 12:26:47 +0000 (13:26 +0100)]
add clojure sample
Mimmmo Cosenza [Wed, 11 Dec 2013 12:25:53 +0000 (13:25 +0100)]
add Mimmo Cosenza to Authors
Alexander Alekhin [Thu, 5 Dec 2013 21:18:14 +0000 (01:18 +0400)]
bioinspired: fix ocl test, skip them if OpenCL is not available
Alexander Alekhin [Thu, 21 Nov 2013 09:05:32 +0000 (13:05 +0400)]
core/ocl: replace dynamic runtime
Alexander Alekhin [Fri, 6 Dec 2013 14:45:50 +0000 (18:45 +0400)]
core/ocl: autogenerated files for dynamic runtime
Alexander Alekhin [Fri, 6 Dec 2013 14:41:23 +0000 (18:41 +0400)]
core/ocl: update dynamic runtime
Alexander Alekhin [Thu, 21 Nov 2013 08:17:16 +0000 (12:17 +0400)]
core/ocl: move opencl dynamic runtime from ocl module
Ilya Lavrenov [Wed, 11 Dec 2013 11:08:49 +0000 (15:08 +0400)]
fixed facedetect sample
Vladimir Bystricky [Wed, 11 Dec 2013 10:33:22 +0000 (14:33 +0400)]
Fix error in test
Vladimir Bystricky [Wed, 11 Dec 2013 10:26:33 +0000 (14:26 +0400)]
Fix problems with border extrapolation in kernel. Add Isolated/Nonisolated borders.
Andrey Pavlenko [Wed, 11 Dec 2013 10:06:49 +0000 (14:06 +0400)]
Merge pull request #1972 from alalek:ocl_queue_cleanup_hung
Alexander Alekhin [Tue, 10 Dec 2013 20:31:34 +0000 (00:31 +0400)]
ocl: process termination hung workaround
Ilya Lavrenov [Tue, 10 Dec 2013 16:14:37 +0000 (20:14 +0400)]
added cv::Laplacian, cv::Sobel, cv::Scharr, cv::GaussianBlur to T-API
Ilya Lavrenov [Tue, 10 Dec 2013 12:27:21 +0000 (16:27 +0400)]
more strict checks outside ROI
Andrey Pavlenko [Tue, 10 Dec 2013 14:49:42 +0000 (18:49 +0400)]
Merge pull request #1967 from ilya-lavrenov:tapi_blendLinear
Peter Andreas Entschev [Tue, 10 Dec 2013 10:57:46 +0000 (08:57 -0200)]
Fixing some indentation issues on FREAK source file.
Roman Donchenko [Tue, 10 Dec 2013 10:39:35 +0000 (14:39 +0400)]
Merge pull request #1961 from SpecLad:merge-2.4
Ilya Lavrenov [Sun, 8 Dec 2013 19:16:17 +0000 (23:16 +0400)]
added cv::blendLinear
Roman Donchenko [Mon, 9 Dec 2013 12:31:31 +0000 (16:31 +0400)]
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
Roman Donchenko [Tue, 10 Dec 2013 08:13:15 +0000 (12:13 +0400)]
Merge pull request #1960 from ilya-lavrenov:tapi_bilateral
Roman Donchenko [Mon, 9 Dec 2013 13:25:33 +0000 (17:25 +0400)]
Merge pull request #1959 from botverse:2.4
Roman Donchenko [Mon, 9 Dec 2013 12:56:06 +0000 (16:56 +0400)]
Merge pull request #1956 from ilya-lavrenov:tapi_split_merge
Roman Donchenko [Mon, 9 Dec 2013 12:21:15 +0000 (16:21 +0400)]
Merge pull request #1930 from alalek:cmake_msvs_subfolders
Ilya Lavrenov [Mon, 9 Dec 2013 12:03:25 +0000 (16:03 +0400)]
added cv::bilateralFilter to T-API
Peter Andreas Entschev [Wed, 27 Nov 2013 19:58:40 +0000 (17:58 -0200)]
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.
Alfonso (the fonz) de la Osa [Mon, 9 Dec 2013 10:55:44 +0000 (10:55 +0000)]
--no-display property fix in stereo_match.cpp sample
Roman Donchenko [Mon, 9 Dec 2013 10:10:59 +0000 (14:10 +0400)]
Merge pull request #1855 from Nerei:master
Roman Donchenko [Mon, 9 Dec 2013 10:07:09 +0000 (14:07 +0400)]
Merge pull request #1883 from philippefoubert:branch_matx_inv
Andrey Pavlenko [Mon, 9 Dec 2013 09:25:41 +0000 (13:25 +0400)]
Merge pull request #1948 from ilya-lavrenov:tapi_norm
Roman Donchenko [Mon, 9 Dec 2013 09:14:15 +0000 (13:14 +0400)]
Merge pull request #1946 from asmorkalov:android_manager_version_inc3
Andrey Pavlenko [Mon, 9 Dec 2013 08:44:25 +0000 (12:44 +0400)]
Merge pull request #1944 from ilya-lavrenov:minor_commits
Vladimir Bystricky [Mon, 9 Dec 2013 07:31:55 +0000 (11:31 +0400)]
Fix build errors on Linux system
Vladimir Bystricky [Mon, 9 Dec 2013 07:10:48 +0000 (11:10 +0400)]
Fix build errors on Linux system
Vladimir Bystricky [Mon, 9 Dec 2013 06:45:23 +0000 (10:45 +0400)]
Add ocl version of filter2D to the module img_proc
Ilya Lavrenov [Sun, 8 Dec 2013 10:45:25 +0000 (14:45 +0400)]
added cv::split to T-API
Ilya Lavrenov [Fri, 6 Dec 2013 15:04:50 +0000 (19:04 +0400)]
added cv::norm to T-API
Ilya Lavrenov [Sat, 7 Dec 2013 21:32:17 +0000 (01:32 +0400)]
added cv::merge to T-API
Anatoly Baksheev [Sat, 7 Dec 2013 15:07:24 +0000 (19:07 +0400)]
fixed -Wshadow and other warnings, added rvec test
Anatoly Baksheev [Sat, 30 Nov 2013 14:02:57 +0000 (18:02 +0400)]
compilation
Anatoly Baksheev [Thu, 28 Nov 2013 08:10:28 +0000 (12:10 +0400)]
fixed ocv_module_disable()
Anatoly Baksheev [Tue, 26 Nov 2013 11:40:57 +0000 (15:40 +0400)]
minor insignificant corrections
Anatoly Baksheev [Tue, 26 Nov 2013 09:29:50 +0000 (13:29 +0400)]
fixed shadow error and added ocv_disable_module
Anatoly Baksheev [Sun, 24 Nov 2013 19:26:03 +0000 (23:26 +0400)]
updating Viz cmake (switched to WITH_VTK option)
Anatoly Baksheev [Sun, 24 Nov 2013 16:59:54 +0000 (20:59 +0400)]
fixed bug with deletion from std::map
Anatoly Baksheev [Sun, 24 Nov 2013 16:10:14 +0000 (20:10 +0400)]
removed VizAccessor from docs
Anatoly Baksheev [Sun, 24 Nov 2013 16:06:54 +0000 (20:06 +0400)]
removed unused code
Anatoly Baksheev [Sun, 24 Nov 2013 16:06:32 +0000 (20:06 +0400)]
VizAccessor is now private and renamed to VizStorage
Anatoly Baksheev [Sun, 24 Nov 2013 14:15:37 +0000 (18:15 +0400)]
added Viz::tutorial2 test
Anatoly Baksheev [Thu, 21 Nov 2013 17:20:20 +0000 (21:20 +0400)]
Added Affine3<T>::rvec()
Anatoly Baksheev [Fri, 22 Nov 2013 10:12:33 +0000 (14:12 +0400)]
compilation
Anatoly Baksheev [Tue, 19 Nov 2013 08:39:19 +0000 (12:39 +0400)]
removed CV_EXPORTS from cv::Afiine
Anatoly Baksheev [Tue, 19 Nov 2013 08:14:24 +0000 (12:14 +0400)]
fixed warning
Anatoly Baksheev [Mon, 18 Nov 2013 10:50:05 +0000 (14:50 +0400)]
switched from unnecessarily 'dobule' to 'float' in some places (commonly for widget scale)
Anatoly Baksheev [Mon, 18 Nov 2013 10:38:12 +0000 (14:38 +0400)]
removed Ptr typedef from Viz3d. It is deprecated since Viz3d itseez is a shared pointer
Alexander Alekhin [Wed, 4 Dec 2013 23:23:52 +0000 (03:23 +0400)]
cmake: allow source_group to preserve file-system tree (for MSVS)
Ilya Lavrenov [Fri, 6 Dec 2013 11:52:34 +0000 (15:52 +0400)]
fixed warnings
Alexander Smorkalov [Fri, 6 Dec 2013 14:01:15 +0000 (18:01 +0400)]
OpenCV Manager version++.
Roman Donchenko [Fri, 6 Dec 2013 13:56:59 +0000 (17:56 +0400)]
Merge pull request #1945 from apavlenko:2.4_version_update
Roman Donchenko [Fri, 6 Dec 2013 13:50:44 +0000 (17:50 +0400)]
Merge pull request #1941 from vhdirk:gst1x_default