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
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
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
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
Andrey Pavlenko
9dea590ada
Merge pull request #1933 from gongzg:fix-ocl-kernel-2.4
2013-12-05 17:05:25 +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
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
Ilya Lavrenov
eb7ff99f80
fixed cv::remap and cv::convertMaps for map types CV_16SC2 && CV_16UC1
2013-12-04 22:04:31 +04:00
Andrey Pavlenko
098d4e6174
Merge pull request #1924 from ilya-lavrenov:svm
2013-12-04 19:56:31 +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
Roman Donchenko
d8a4d3a2eb
Merge pull request #1921 from SpecLad:defined-msc-ver
2013-12-04 15:46:56 +04:00
Roman Donchenko
3e1586a1c6
Merge pull request #1919 from SpecLad:platfrom
2013-12-04 13:55:45 +04:00
Roman Donchenko
fa2cd93ecf
Merge pull request #1915 from jet47:gpu-color-test-fix
2013-12-04 13:55:28 +04:00
Alexander Alekhin
7b551af424
ocl: try to disable clFinish workaround
2013-12-04 13:00:37 +04:00
Roman Donchenko
11c7053b0f
Fixed a -Wundef warning in cl_platform.h.
...
_MSC_VER -> defined _MSC_VER. Fixes building with MinGW.
Similar to fbc91c5ee
2013-12-04 12:39:20 +04:00
Andrey Pavlenko
8752414718
Merge pull request #1911 from apavlenko:2.4_fix_vc12
2013-12-03 19:20:05 +04:00
Roman Donchenko
3509018bd6
Merge pull request #1916 from alalek:ocl_moments_fix_perf
2013-12-03 17:58:04 +04:00
Andrey Pavlenko
1966e7cea9
fixing compilation on Linux
2013-12-03 17:46:09 +04:00
Roman Donchenko
2b31055914
Fixed the "platfrom" typo everywhere.
2013-12-03 17:33:28 +04:00
Andrey Pavlenko
b5dbe9e04b
Added patch from master for fixing VS2013 in 3rd party lib OpenEXR
2013-12-03 16:08:57 +04:00
Alexander Alekhin
c962a9d61c
ocl:perf: fix moments test for plain impl
2013-12-03 16:02:55 +04:00
Vladislav Vinogradov
adb2040980
added additional check in cv::gpu::demosaicing that source is not empty
2013-12-03 15:55:47 +04:00
Vladislav Vinogradov
14ee306b9e
fix gpu test for Demosaicing:
...
check that input images was loaded correctly
2013-12-03 15:55:10 +04:00
Roman Donchenko
df136339ff
Merge pull request #1907 from severin-lemaignan:emscripten-2.4
2013-12-03 13:38:10 +04:00
Andrey Pavlenko
bd9d3dd561
fixing build of 2.4 branch with VC12 (aka 2013)
...
(master branch was fixed before, no need to merge this to master!)
- disable openexr (numerous undefined std::min & std::max)
- workaround for two compilator bugs
2013-12-03 13:16:44 +04:00
Séverin Lemaignan
9ce9fc3361
Ensure compilation to Javascript with Emscripten
2013-12-03 09:18:59 +01:00
Andrey Pavlenko
3ff1620086
Merge pull request #1899 from berak:b_3171_24
2013-12-03 11:32:31 +04:00
Andrey Pavlenko
8db6d9f9b2
Merge pull request #1906 from asmorkalov:android_ocl_warn_fix
2013-12-03 11:20:48 +04:00
Andrey Pavlenko
368bac7af6
Merge pull request #1744 from liuxing6666:2.4_fix_harris_test
2013-12-02 20:38:49 +04:00
Andrey Pavlenko
19ceab13f2
Merge pull request #1590 from ilya-lavrenov:cmd_parser_fix
2013-12-02 20:07:47 +04:00
Roman Donchenko
790f53f12a
Merge pull request #1887 from jet47:android-cuda-6.0
2013-12-02 18:53:26 +04:00
Roman Donchenko
f7f194e5dd
Merge pull request #1797 from moodoki:bugfix_3344
2013-12-02 17:53:34 +04:00
Alexander Smorkalov
eab7603096
Warning fixes and suppression in ocl module for gcc 4.6 from Android NDK.
2013-12-02 17:51:29 +04:00
Roman Donchenko
838961a289
Merge pull request #1897 from berak:b_3393_24
2013-12-02 17:11:56 +04:00
Roman Donchenko
fb568755a1
Merge pull request #1898 from berak:b_3349_24
2013-12-02 14:14:41 +04:00
Roman Donchenko
0bbd768d9d
Merge pull request #1884 from asmorkalov:winrt_img_proc_sample
2013-12-02 12:27:51 +04:00
