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
Andrey Pavlenko
c34fc180a7
Merge pull request #1762 from jet47:cuda-6.0-npp-fix
2013-12-06 15:56:15 +04:00
Elena Gvozdeva
f5a01f15a5
Fixed test for ocl_flip
2013-12-06 15:53:00 +04:00
Andrey Pavlenko
77d04a2622
Merge pull request #1844 from StevenPuttemans:bugfix_3370
2013-12-06 15:51:59 +04:00
Andrey Pavlenko
1d01c49a06
Merge pull request #1870 from es0m:es0m-2.4-imgproc-samplers
2013-12-06 15:47:39 +04:00
Peter Andreas Entschev
def17f2baa
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.
2013-12-06 09:31:18 -02:00
Andrey Pavlenko
f36858b3a0
Merge pull request #1942 from ilya-lavrenov:warn_fix
2013-12-06 15:26:43 +04:00
Andrey Pavlenko
f0049fa2ed
Merge pull request #1937 from ilya-lavrenov:tapi_integral
2013-12-06 15:25:56 +04:00
Ilya Lavrenov
926cab2baa
fixed warnings
2013-12-06 15:20:29 +04:00
Vladimir Bystricky
44126e350a
Change while(true) to for(;;) for fix compiler warning.
2013-12-06 15:11:26 +04:00
Andrey Pavlenko
72cfff4c59
Merge pull request #1940 from pentschev:ocl_bfm_oclMat_ptr_fix_2.4
2013-12-06 15:05:34 +04:00
Konstantin Matskevich
45dd18955f
Merge pull request #2 from apavlenko/ocl_mt_test
...
minor improvements
2013-12-06 03:03:27 -08:00
Andrey Pavlenko
b0b199ee8a
Merge pull request #1929 from alalek:ocl_haar_amd_beta
2013-12-06 14:56:47 +04:00
Andrey Pavlenko
894724eaf0
minor improvements
2013-12-06 14:49:36 +04:00
Vladimir Bystricky
591b1a7e70
Another fix for disable "conditional expression is constant"
2013-12-06 14:42:06 +04:00
Vladimir Bystricky
3013b469fe
Add check for depths of destination and source image. Fix warning C4127.
2013-12-06 14:21:51 +04:00
Dirk Van Haerenborgh
8a48802dec
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.
2013-12-06 10:20:29 +01:00
Ilya Lavrenov
3eaa8f149b
added cv::intergal to T-API
2013-12-06 13:18:25 +04:00
Konstantin Matskevich
7a78559708
some fixes
2013-12-06 12:12:24 +04:00
Peter Andreas Entschev
3bc952ed34
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.
2013-12-05 19:27:10 -02:00
Elena Gvozdeva
b930028727
Added cv::flip using Transparent API
2013-12-05 17:54:05 +04:00
Andrey Pavlenko
9dea590ada
Merge pull request #1933 from gongzg:fix-ocl-kernel-2.4
2013-12-05 17:05:25 +04:00
Andrey Pavlenko
b16f0a25af
Merge pull request #1925 from vpisarev:ocl_facedetect2
2013-12-05 17:02:37 +04:00
Alexander Alekhin
3dcddad88a
ocl: added workaround into Haar kernels
2013-12-05 16:56:01 +04:00
Andrey Pavlenko
39754bd6f9
Merge pull request #1920 from alalek:ocl_disable_workaround
2013-12-05 16:46:25 +04:00
Vladimir Bystricky
af6134b4b6
Fix issue in boxFilter with destination depth not equal to source depth.
2013-12-05 14:25:15 +04:00
Roman Donchenko
bee4dff89d
Merge pull request #1447 from Siddharthk:master
2013-12-05 12:38:12 +04:00
Vladimir Bystricky
968a898a1b
Add ocl version of boxFilter to the module img_proc
2013-12-05 11:47:17 +04:00
Konstantin Matskevich
0a1ff0d42d
multithreading facedetector
2013-12-05 09:47:36 +04:00
Konstantin Matskevich
e38ba1999b
facedetect
2013-12-05 09:20:36 +04:00
Zhigang Gong
6ce03b0484
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>
2013-12-05 09:35:21 +08:00
Josep Bosch
2153453fd1
Fixed little issue with mouse callback refering to issue 3409. Was using round instead of floor.
2013-12-04 22:32:20 +01:00
Vadim Pisarevsky
828b0b151b
another attempt to fix compile errors
2013-12-04 22:22:36 +04:00
Ilya Lavrenov
eb7ff99f80
fixed cv::remap and cv::convertMaps for map types CV_16SC2 && CV_16UC1
2013-12-04 22:04:31 +04:00
Vadim Pisarevsky
fe11ca886a
trying to eliminate compile problems
2013-12-04 21:56:35 +04:00
Andrey Pavlenko
458ac2592b
Merge pull request #1908 from ilya-lavrenov:tapi_imgproc
2013-12-04 21:41:44 +04:00
Andrey Pavlenko
098d4e6174
Merge pull request #1924 from ilya-lavrenov:svm
2013-12-04 19:56:31 +04:00
Vadim Pisarevsky
ff87385201
refactored CascadeClassifier to hide implementation details (take 2)
2013-12-04 19:00:39 +04:00
Baichuan Su
632b21e090
Modify default setting, using ocl method when have ocl module
2013-12-04 18:26:54 +04:00
Baichuan Su
2cf16db683
Add Macro to decide using ocl method or not.
2013-12-04 18:26:54 +04:00
Baichuan Su
00300baa53
Add OpenCL SVM paths for bagofwords_classification and points_classifier samples.
2013-12-04 18:26:54 +04:00
siddharth
778edff9e1
Added comment in demo file
2013-12-04 19:18:00 +05:30
siddharth
c48ad880f3
Errors resolved
2013-12-04 19:18:00 +05:30
Anna Kogan
944f7bac42
After-merge corrections
2013-12-04 19:18:00 +05:30
siddharth
573e818415
New changes done and removed opencv_extra folder
...
Removed opencv_extra folder inside opencv folder
New changes done
Removed test images
2013-12-04 19:18:00 +05:30
siddharth
33e6c07485
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
2013-12-04 19:18:00 +05:30
siddharth
2f65a0d4ba
Changes done in npr module
2013-12-04 19:18:00 +05:30
siddharth
35d9ca6483
Changes done in cloning module
2013-12-04 19:18:00 +05:30
siddharth
daa9694cab
Changes done in decolorization module
2013-12-04 19:17:59 +05:30
