platform/upstream/opencv.git
10 years agobioinspired: fix ocl test, skip them if OpenCL is not available
Alexander Alekhin [Thu, 5 Dec 2013 21:18:14 +0000 (01:18 +0400)]
bioinspired: fix ocl test, skip them if OpenCL is not available

10 years agocore/ocl: replace dynamic runtime
Alexander Alekhin [Thu, 21 Nov 2013 09:05:32 +0000 (13:05 +0400)]
core/ocl: replace dynamic runtime

10 years agocore/ocl: autogenerated files for dynamic runtime
Alexander Alekhin [Fri, 6 Dec 2013 14:45:50 +0000 (18:45 +0400)]
core/ocl: autogenerated files for dynamic runtime

10 years agocore/ocl: update dynamic runtime
Alexander Alekhin [Fri, 6 Dec 2013 14:41:23 +0000 (18:41 +0400)]
core/ocl: update dynamic runtime

10 years agocore/ocl: move opencl dynamic runtime from ocl module
Alexander Alekhin [Thu, 21 Nov 2013 08:17:16 +0000 (12:17 +0400)]
core/ocl: move opencl dynamic runtime from ocl module

10 years agoMerge pull request #1972 from alalek:ocl_queue_cleanup_hung
Andrey Pavlenko [Wed, 11 Dec 2013 10:06:49 +0000 (14:06 +0400)]
Merge pull request #1972 from alalek:ocl_queue_cleanup_hung

10 years agoocl: process termination hung workaround
Alexander Alekhin [Tue, 10 Dec 2013 20:31:34 +0000 (00:31 +0400)]
ocl: process termination hung workaround

10 years agoMerge pull request #1967 from ilya-lavrenov:tapi_blendLinear
Andrey Pavlenko [Tue, 10 Dec 2013 14:49:42 +0000 (18:49 +0400)]
Merge pull request #1967 from ilya-lavrenov:tapi_blendLinear

10 years agoMerge pull request #1961 from SpecLad:merge-2.4
Roman Donchenko [Tue, 10 Dec 2013 10:39:35 +0000 (14:39 +0400)]
Merge pull request #1961 from SpecLad:merge-2.4

10 years agoadded cv::blendLinear
Ilya Lavrenov [Sun, 8 Dec 2013 19:16:17 +0000 (23:16 +0400)]
added cv::blendLinear

10 years agoMerge remote-tracking branch 'origin/2.4' into merge-2.4
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

10 years agoMerge pull request #1960 from ilya-lavrenov:tapi_bilateral
Roman Donchenko [Tue, 10 Dec 2013 08:13:15 +0000 (12:13 +0400)]
Merge pull request #1960 from ilya-lavrenov:tapi_bilateral

10 years agoMerge pull request #1956 from ilya-lavrenov:tapi_split_merge
Roman Donchenko [Mon, 9 Dec 2013 12:56:06 +0000 (16:56 +0400)]
Merge pull request #1956 from ilya-lavrenov:tapi_split_merge

10 years agoMerge pull request #1930 from alalek:cmake_msvs_subfolders
Roman Donchenko [Mon, 9 Dec 2013 12:21:15 +0000 (16:21 +0400)]
Merge pull request #1930 from alalek:cmake_msvs_subfolders

10 years agoadded cv::bilateralFilter to T-API
Ilya Lavrenov [Mon, 9 Dec 2013 12:03:25 +0000 (16:03 +0400)]
added cv::bilateralFilter to T-API

10 years agoMerge pull request #1855 from Nerei:master
Roman Donchenko [Mon, 9 Dec 2013 10:10:59 +0000 (14:10 +0400)]
Merge pull request #1855 from Nerei:master

10 years agoMerge pull request #1883 from philippefoubert:branch_matx_inv
Roman Donchenko [Mon, 9 Dec 2013 10:07:09 +0000 (14:07 +0400)]
Merge pull request #1883 from philippefoubert:branch_matx_inv

10 years agoMerge pull request #1948 from ilya-lavrenov:tapi_norm
Andrey Pavlenko [Mon, 9 Dec 2013 09:25:41 +0000 (13:25 +0400)]
Merge pull request #1948 from ilya-lavrenov:tapi_norm

10 years agoMerge pull request #1946 from asmorkalov:android_manager_version_inc3
Roman Donchenko [Mon, 9 Dec 2013 09:14:15 +0000 (13:14 +0400)]
Merge pull request #1946 from asmorkalov:android_manager_version_inc3

10 years agoMerge pull request #1944 from ilya-lavrenov:minor_commits
Andrey Pavlenko [Mon, 9 Dec 2013 08:44:25 +0000 (12:44 +0400)]
Merge pull request #1944 from ilya-lavrenov:minor_commits

10 years agoadded cv::split to T-API
Ilya Lavrenov [Sun, 8 Dec 2013 10:45:25 +0000 (14:45 +0400)]
added cv::split to T-API

10 years agoadded cv::norm to T-API
Ilya Lavrenov [Fri, 6 Dec 2013 15:04:50 +0000 (19:04 +0400)]
added cv::norm to T-API

10 years agoadded cv::merge to T-API
Ilya Lavrenov [Sat, 7 Dec 2013 21:32:17 +0000 (01:32 +0400)]
added cv::merge to T-API

10 years agofixed -Wshadow and other warnings, added rvec test
Anatoly Baksheev [Sat, 7 Dec 2013 15:07:24 +0000 (19:07 +0400)]
fixed -Wshadow and other warnings, added rvec test

10 years agocompilation
Anatoly Baksheev [Sat, 30 Nov 2013 14:02:57 +0000 (18:02 +0400)]
compilation

10 years agofixed ocv_module_disable()
Anatoly Baksheev [Thu, 28 Nov 2013 08:10:28 +0000 (12:10 +0400)]
fixed ocv_module_disable()

10 years agominor insignificant corrections
Anatoly Baksheev [Tue, 26 Nov 2013 11:40:57 +0000 (15:40 +0400)]
minor insignificant corrections

10 years agofixed shadow error and added ocv_disable_module
Anatoly Baksheev [Tue, 26 Nov 2013 09:29:50 +0000 (13:29 +0400)]
fixed shadow error and added ocv_disable_module

10 years agoupdating Viz cmake (switched to WITH_VTK option)
Anatoly Baksheev [Sun, 24 Nov 2013 19:26:03 +0000 (23:26 +0400)]
updating Viz cmake (switched to WITH_VTK option)

10 years agofixed bug with deletion from std::map
Anatoly Baksheev [Sun, 24 Nov 2013 16:59:54 +0000 (20:59 +0400)]
fixed bug with deletion from std::map

10 years agoremoved VizAccessor from docs
Anatoly Baksheev [Sun, 24 Nov 2013 16:10:14 +0000 (20:10 +0400)]
removed VizAccessor from docs

10 years agoremoved unused code
Anatoly Baksheev [Sun, 24 Nov 2013 16:06:54 +0000 (20:06 +0400)]
removed unused code

10 years agoVizAccessor is now private and renamed to VizStorage
Anatoly Baksheev [Sun, 24 Nov 2013 16:06:32 +0000 (20:06 +0400)]
VizAccessor is now private and renamed to VizStorage

10 years agoadded Viz::tutorial2 test
Anatoly Baksheev [Sun, 24 Nov 2013 14:15:37 +0000 (18:15 +0400)]
added Viz::tutorial2 test

10 years agoAdded Affine3<T>::rvec()
Anatoly Baksheev [Thu, 21 Nov 2013 17:20:20 +0000 (21:20 +0400)]
Added Affine3<T>::rvec()

10 years agocompilation
Anatoly Baksheev [Fri, 22 Nov 2013 10:12:33 +0000 (14:12 +0400)]
compilation

10 years agoremoved CV_EXPORTS from cv::Afiine
Anatoly Baksheev [Tue, 19 Nov 2013 08:39:19 +0000 (12:39 +0400)]
removed CV_EXPORTS from cv::Afiine

10 years agofixed warning
Anatoly Baksheev [Tue, 19 Nov 2013 08:14:24 +0000 (12:14 +0400)]
fixed warning

10 years agoswitched from unnecessarily 'dobule' to 'float' in some places (commonly for widget...
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)

10 years agoremoved Ptr typedef from Viz3d. It is deprecated since Viz3d itseez is a shared pointer
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

10 years agocmake: allow source_group to preserve file-system tree (for MSVS)
Alexander Alekhin [Wed, 4 Dec 2013 23:23:52 +0000 (03:23 +0400)]
cmake: allow source_group to preserve file-system tree (for MSVS)

10 years agofixed warnings
Ilya Lavrenov [Fri, 6 Dec 2013 11:52:34 +0000 (15:52 +0400)]
fixed warnings

10 years agoOpenCV Manager version++.
Alexander Smorkalov [Fri, 6 Dec 2013 14:01:15 +0000 (18:01 +0400)]
OpenCV Manager version++.

10 years agoMerge pull request #1945 from apavlenko:2.4_version_update
Roman Donchenko [Fri, 6 Dec 2013 13:56:59 +0000 (17:56 +0400)]
Merge pull request #1945 from apavlenko:2.4_version_update

10 years agoMerge pull request #1941 from vhdirk:gst1x_default
Roman Donchenko [Fri, 6 Dec 2013 13:50:44 +0000 (17:50 +0400)]
Merge pull request #1941 from vhdirk:gst1x_default

10 years agoMerge pull request #1943 from pentschev:ocl_oclMat_ptr_remove_2.4
Andrey Pavlenko [Fri, 6 Dec 2013 12:59:02 +0000 (16:59 +0400)]
Merge pull request #1943 from pentschev:ocl_oclMat_ptr_remove_2.4

10 years agoMerge pull request #1936 from ElenaGvozdeva:ocl_flip
Andrey Pavlenko [Fri, 6 Dec 2013 12:40:29 +0000 (16:40 +0400)]
Merge pull request #1936 from ElenaGvozdeva:ocl_flip

10 years agoupdating version to 2.4.7.2
Andrey Pavlenko [Fri, 6 Dec 2013 12:21:22 +0000 (16:21 +0400)]
updating version to 2.4.7.2

10 years agoMerge pull request #1927 from JBosch:issue3409
Andrey Pavlenko [Fri, 6 Dec 2013 12:06:03 +0000 (16:06 +0400)]
Merge pull request #1927 from JBosch:issue3409

10 years agoMerge pull request #1872 from KonstantinMatskevich:ocl_mt_test
Andrey Pavlenko [Fri, 6 Dec 2013 12:00:10 +0000 (16:00 +0400)]
Merge pull request #1872 from KonstantinMatskevich:ocl_mt_test

10 years agoMerge pull request #1762 from jet47:cuda-6.0-npp-fix
Andrey Pavlenko [Fri, 6 Dec 2013 11:56:14 +0000 (15:56 +0400)]
Merge pull request #1762 from jet47:cuda-6.0-npp-fix

10 years agoFixed test for ocl_flip
Elena Gvozdeva [Fri, 6 Dec 2013 11:53:00 +0000 (15:53 +0400)]
Fixed test for ocl_flip

10 years agoMerge pull request #1844 from StevenPuttemans:bugfix_3370
Andrey Pavlenko [Fri, 6 Dec 2013 11:51:59 +0000 (15:51 +0400)]
Merge pull request #1844 from StevenPuttemans:bugfix_3370

10 years agoMerge pull request #1870 from es0m:es0m-2.4-imgproc-samplers
Andrey Pavlenko [Fri, 6 Dec 2013 11:47:39 +0000 (15:47 +0400)]
Merge pull request #1870 from es0m:es0m-2.4-imgproc-samplers

10 years agoRemoving ocl::oclMat::ptr() method.
Peter Andreas Entschev [Fri, 6 Dec 2013 11:31:18 +0000 (09:31 -0200)]
Removing ocl::oclMat::ptr() method.

The method ocl::oclMat::ptr() is being removed because it returns a pointer to a row of oclMat::data. The data attribute is a cl_mem structure and cannot be iterated outside an OpenCL kernel.

10 years agoMerge pull request #1942 from ilya-lavrenov:warn_fix
Andrey Pavlenko [Fri, 6 Dec 2013 11:26:43 +0000 (15:26 +0400)]
Merge pull request #1942 from ilya-lavrenov:warn_fix

10 years agoMerge pull request #1937 from ilya-lavrenov:tapi_integral
Andrey Pavlenko [Fri, 6 Dec 2013 11:25:56 +0000 (15:25 +0400)]
Merge pull request #1937 from ilya-lavrenov:tapi_integral

10 years agofixed warnings
Ilya Lavrenov [Fri, 6 Dec 2013 09:29:53 +0000 (13:29 +0400)]
fixed warnings

10 years agoMerge pull request #1940 from pentschev:ocl_bfm_oclMat_ptr_fix_2.4
Andrey Pavlenko [Fri, 6 Dec 2013 11:05:34 +0000 (15:05 +0400)]
Merge pull request #1940 from pentschev:ocl_bfm_oclMat_ptr_fix_2.4

10 years agoMerge pull request #2 from apavlenko/ocl_mt_test
Konstantin Matskevich [Fri, 6 Dec 2013 11:03:27 +0000 (03:03 -0800)]
Merge pull request #2 from apavlenko/ocl_mt_test

minor improvements

10 years agoMerge pull request #1929 from alalek:ocl_haar_amd_beta
Andrey Pavlenko [Fri, 6 Dec 2013 10:56:47 +0000 (14:56 +0400)]
Merge pull request #1929 from alalek:ocl_haar_amd_beta

10 years agominor improvements
Andrey Pavlenko [Fri, 6 Dec 2013 10:49:36 +0000 (14:49 +0400)]
minor improvements

10 years agoEnable GStreamer 1.x support by default.
Dirk Van Haerenborgh [Fri, 6 Dec 2013 09:20:29 +0000 (10:20 +0100)]
Enable GStreamer 1.x support by default.

GStreamer 1.x is universally available, and with 0.10 being deprecated,
there should be no reason to default to 0.10 stil.

10 years agoadded cv::intergal to T-API
Ilya Lavrenov [Thu, 5 Dec 2013 15:43:50 +0000 (19:43 +0400)]
added cv::intergal to T-API

10 years agosome fixes
Konstantin Matskevich [Fri, 6 Dec 2013 08:12:24 +0000 (12:12 +0400)]
some fixes

10 years agoocl::BruteForceMatcher fix wrong use of oclMat::ptr().
Peter Andreas Entschev [Thu, 5 Dec 2013 21:27:10 +0000 (19:27 -0200)]
ocl::BruteForceMatcher fix wrong use of oclMat::ptr().

The oclMat::ptr() method was mistakenly used in ocl::BruteForceMatcher to pass a pointer to a oclMat object. The ptr() method returns a uchar pointer to the cl_mem data structure and this method will be removed.

10 years agoAdded cv::flip using Transparent API
Elena Gvozdeva [Thu, 5 Dec 2013 10:36:45 +0000 (14:36 +0400)]
Added cv::flip using Transparent API

10 years agoMerge pull request #1933 from gongzg:fix-ocl-kernel-2.4
Andrey Pavlenko [Thu, 5 Dec 2013 13:05:25 +0000 (17:05 +0400)]
Merge pull request #1933 from gongzg:fix-ocl-kernel-2.4

10 years agoMerge pull request #1925 from vpisarev:ocl_facedetect2
Andrey Pavlenko [Thu, 5 Dec 2013 13:02:37 +0000 (17:02 +0400)]
Merge pull request #1925 from vpisarev:ocl_facedetect2

10 years agoocl: added workaround into Haar kernels
Alexander Alekhin [Thu, 5 Dec 2013 09:52:26 +0000 (13:52 +0400)]
ocl: added workaround into Haar kernels

10 years agoMerge pull request #1920 from alalek:ocl_disable_workaround
Andrey Pavlenko [Thu, 5 Dec 2013 12:46:25 +0000 (16:46 +0400)]
Merge pull request #1920 from alalek:ocl_disable_workaround

10 years agoMerge pull request #1447 from Siddharthk:master
Roman Donchenko [Thu, 5 Dec 2013 08:38:12 +0000 (12:38 +0400)]
Merge pull request #1447 from Siddharthk:master

10 years agomultithreading facedetector
Konstantin Matskevich [Mon, 2 Dec 2013 07:15:46 +0000 (11:15 +0400)]
multithreading facedetector

10 years agofacedetect
Konstantin Matskevich [Fri, 22 Nov 2013 10:47:58 +0000 (14:47 +0400)]
facedetect

10 years agoFixed some implicitly type conversions between vector and scalar data type.
Zhigang Gong [Tue, 3 Dec 2013 02:49:51 +0000 (10:49 +0800)]
Fixed some implicitly type conversions between vector and scalar data type.

There are some mixed implicitly/explicitly type conversion between
scalar and vector. Although the spec allows those conversion, I prefer
to make them consistent and use explicitly all the cases.

Signed-off-by: Zhigang Gong <zhigang.gong@intel.com>
10 years agoFixed little issue with mouse callback refering to issue 3409. Was using round instea...
Josep Bosch [Wed, 4 Dec 2013 21:32:20 +0000 (22:32 +0100)]
Fixed little issue with mouse callback refering to issue 3409. Was using round instead of floor.

10 years agoanother attempt to fix compile errors
Vadim Pisarevsky [Wed, 4 Dec 2013 18:22:36 +0000 (22:22 +0400)]
another attempt to fix compile errors

10 years agotrying to eliminate compile problems
Vadim Pisarevsky [Wed, 4 Dec 2013 17:56:35 +0000 (21:56 +0400)]
trying to eliminate compile problems

10 years agoMerge pull request #1908 from ilya-lavrenov:tapi_imgproc
Andrey Pavlenko [Wed, 4 Dec 2013 17:41:44 +0000 (21:41 +0400)]
Merge pull request #1908 from ilya-lavrenov:tapi_imgproc

10 years agoMerge pull request #1924 from ilya-lavrenov:svm
Andrey Pavlenko [Wed, 4 Dec 2013 15:56:31 +0000 (19:56 +0400)]
Merge pull request #1924 from ilya-lavrenov:svm

10 years agorefactored CascadeClassifier to hide implementation details (take 2)
Vadim Pisarevsky [Wed, 4 Dec 2013 15:00:39 +0000 (19:00 +0400)]
refactored CascadeClassifier to hide implementation details (take 2)

10 years agoModify default setting, using ocl method when have ocl module
Baichuan Su [Tue, 12 Nov 2013 05:13:25 +0000 (13:13 +0800)]
Modify default setting, using ocl method when have ocl module

10 years agoAdd Macro to decide using ocl method or not.
Baichuan Su [Mon, 11 Nov 2013 03:46:07 +0000 (11:46 +0800)]
Add Macro to decide using ocl method or not.

10 years agoAdd OpenCL SVM paths for bagofwords_classification and points_classifier samples.
Baichuan Su [Sat, 9 Nov 2013 00:42:39 +0000 (08:42 +0800)]
Add OpenCL SVM paths for bagofwords_classification and points_classifier samples.

10 years agoAdded comment in demo file
siddharth [Wed, 4 Dec 2013 13:42:43 +0000 (19:12 +0530)]
Added comment in demo file

10 years agoErrors resolved
siddharth [Fri, 22 Nov 2013 18:07:41 +0000 (23:37 +0530)]
Errors resolved

10 years agoAfter-merge corrections
Anna Kogan [Thu, 21 Nov 2013 11:45:53 +0000 (15:45 +0400)]
After-merge corrections

10 years agoNew changes done and removed opencv_extra folder
siddharth [Wed, 6 Nov 2013 14:59:01 +0000 (20:29 +0530)]
New changes done and removed opencv_extra folder

Removed opencv_extra folder inside opencv folder

New changes done

Removed test images

10 years agoRemoved build errors and removed test images
siddharth [Mon, 21 Oct 2013 14:24:32 +0000 (19:54 +0530)]
Removed build errors and removed test images

Removed conflict

Error fix 1

Error fix 2

Error fix 3

Error fix 3

Error fix 4

Error fix 5

Error fix 6

Error fix 7

Error fix 8

Error fix 9

Error fix 10

Error fix 11

Error fix 12

Errors fixed

Removed opencv_extra folder inside opencv folder

10 years agoChanges done in npr module
siddharth [Thu, 17 Oct 2013 15:44:31 +0000 (21:14 +0530)]
Changes done in npr module

10 years agoChanges done in cloning module
siddharth [Wed, 9 Oct 2013 16:19:57 +0000 (21:49 +0530)]
Changes done in cloning module

10 years agoChanges done in decolorization module
siddharth [Mon, 7 Oct 2013 14:00:13 +0000 (19:30 +0530)]
Changes done in decolorization module

10 years agoRevert Back
siddharth [Tue, 1 Oct 2013 15:43:41 +0000 (21:13 +0530)]
Revert Back

10 years agoUpdate to remove Android error
siddharth [Tue, 1 Oct 2013 14:52:10 +0000 (20:22 +0530)]
Update to remove Android error

10 years agoChanged STL in contrast_preserve file
siddharth [Tue, 1 Oct 2013 13:05:53 +0000 (18:35 +0530)]
Changed STL in contrast_preserve file

10 years agowhitespaces removed and other minor changes to fix build error
siddharth [Sat, 14 Sep 2013 13:42:25 +0000 (19:12 +0530)]
whitespaces removed and other minor changes to fix build error

Update 1

update 2

Update 3

Update 4

Update 5

update 6

Update 7

Update 8

Update 9

Update 10

Update 11

Update 12

Update 13

Update 14

Update 15

Update 16

Update 17

Update 18

Update 19

Update 20

Update 21

Update 22

Removed Headers

Update 23

Update 24

Update 25

Update 26

Update 27

Update 28

10 years agocloning_gui.cpp updated
siddharth [Sat, 14 Sep 2013 13:29:55 +0000 (18:59 +0530)]
cloning_gui.cpp updated

10 years agoerrors in samples/cpp removed
siddharth [Sat, 14 Sep 2013 11:36:26 +0000 (17:06 +0530)]
errors in samples/cpp removed

10 years agocloning_demo error removed
siddharth [Sat, 14 Sep 2013 11:17:44 +0000 (16:47 +0530)]
cloning_demo error removed

10 years agorenamed
siddharth [Fri, 13 Sep 2013 12:58:03 +0000 (18:28 +0530)]
renamed