Roman Donchenko
ce503c64bf
Merge pull request #1968 from pentschev:fix_indentation_freak_2.4
11 years ago
Peter Andreas Entschev
c289c8a700
Fixing some indentation issues on FREAK source file.
11 years ago
Roman Donchenko
13c058ecf8
Merge pull request #1959 from botverse:2.4
11 years ago
Alfonso (the fonz) de la Osa
df0c43321d
--no-display property fix in stereo_match.cpp sample
11 years ago
Roman Donchenko
8f10ca5180
Merge pull request #1946 from asmorkalov:android_manager_version_inc3
11 years ago
Alexander Smorkalov
9f04222a75
OpenCV Manager version++.
11 years ago
Roman Donchenko
060e58d080
Merge pull request #1945 from apavlenko:2.4_version_update
11 years ago
Andrey Pavlenko
b5936648ca
Merge pull request #1943 from pentschev:ocl_oclMat_ptr_remove_2.4
11 years ago
Andrey Pavlenko
f2cf9dd8bf
updating version to 2.4.7.2
11 years ago
Andrey Pavlenko
7069b4b761
Merge pull request #1927 from JBosch:issue3409
11 years ago
Andrey Pavlenko
0e3553130a
Merge pull request #1872 from KonstantinMatskevich:ocl_mt_test
11 years ago
Andrey Pavlenko
c34fc180a7
Merge pull request #1762 from jet47:cuda-6.0-npp-fix
11 years ago
Andrey Pavlenko
77d04a2622
Merge pull request #1844 from StevenPuttemans:bugfix_3370
11 years ago
Andrey Pavlenko
1d01c49a06
Merge pull request #1870 from es0m:es0m-2.4-imgproc-samplers
11 years ago
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.
11 years ago
Andrey Pavlenko
72cfff4c59
Merge pull request #1940 from pentschev:ocl_bfm_oclMat_ptr_fix_2.4
11 years ago
Konstantin Matskevich
45dd18955f
Merge pull request #2 from apavlenko/ocl_mt_test
...
minor improvements
11 years ago
Andrey Pavlenko
b0b199ee8a
Merge pull request #1929 from alalek:ocl_haar_amd_beta
11 years ago
Andrey Pavlenko
894724eaf0
minor improvements
11 years ago
Konstantin Matskevich
7a78559708
some fixes
11 years ago
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.
11 years ago
Andrey Pavlenko
9dea590ada
Merge pull request #1933 from gongzg:fix-ocl-kernel-2.4
11 years ago
Alexander Alekhin
3dcddad88a
ocl: added workaround into Haar kernels
11 years ago
Andrey Pavlenko
39754bd6f9
Merge pull request #1920 from alalek:ocl_disable_workaround
11 years ago
Konstantin Matskevich
0a1ff0d42d
multithreading facedetector
11 years ago
Konstantin Matskevich
e38ba1999b
facedetect
11 years ago
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>
11 years ago
Josep Bosch
2153453fd1
Fixed little issue with mouse callback refering to issue 3409. Was using round instead of floor.
11 years ago
Andrey Pavlenko
098d4e6174
Merge pull request #1924 from ilya-lavrenov:svm
11 years ago
Baichuan Su
632b21e090
Modify default setting, using ocl method when have ocl module
11 years ago
Baichuan Su
2cf16db683
Add Macro to decide using ocl method or not.
11 years ago
Baichuan Su
00300baa53
Add OpenCL SVM paths for bagofwords_classification and points_classifier samples.
11 years ago
Roman Donchenko
d8a4d3a2eb
Merge pull request #1921 from SpecLad:defined-msc-ver
11 years ago
Roman Donchenko
3e1586a1c6
Merge pull request #1919 from SpecLad:platfrom
11 years ago
Roman Donchenko
fa2cd93ecf
Merge pull request #1915 from jet47:gpu-color-test-fix
11 years ago
Alexander Alekhin
7b551af424
ocl: try to disable clFinish workaround
11 years ago
Roman Donchenko
11c7053b0f
Fixed a -Wundef warning in cl_platform.h.
...
_MSC_VER -> defined _MSC_VER. Fixes building with MinGW.
Similar to fbc91c5ee
.
11 years ago
Andrey Pavlenko
8752414718
Merge pull request #1911 from apavlenko:2.4_fix_vc12
11 years ago
Roman Donchenko
3509018bd6
Merge pull request #1916 from alalek:ocl_moments_fix_perf
11 years ago
Andrey Pavlenko
1966e7cea9
fixing compilation on Linux
11 years ago
Roman Donchenko
2b31055914
Fixed the "platfrom" typo everywhere.
11 years ago
Andrey Pavlenko
b5dbe9e04b
Added patch from master for fixing VS2013 in 3rd party lib OpenEXR
11 years ago
Alexander Alekhin
c962a9d61c
ocl:perf: fix moments test for plain impl
11 years ago
Vladislav Vinogradov
adb2040980
added additional check in cv::gpu::demosaicing that source is not empty
11 years ago
Vladislav Vinogradov
14ee306b9e
fix gpu test for Demosaicing:
...
check that input images was loaded correctly
11 years ago
Roman Donchenko
df136339ff
Merge pull request #1907 from severin-lemaignan:emscripten-2.4
11 years ago
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
11 years ago
Séverin Lemaignan
9ce9fc3361
Ensure compilation to Javascript with Emscripten
11 years ago
Andrey Pavlenko
3ff1620086
Merge pull request #1899 from berak:b_3171_24
11 years ago
Andrey Pavlenko
8db6d9f9b2
Merge pull request #1906 from asmorkalov:android_ocl_warn_fix
11 years ago