Pierre-Emmanuel Viel
0d19685f95
Move templates in dist.h in order to share them between KMeansIndex and HierarchicalClusteringIndex classes.
2013-12-18 20:48:34 +01:00
Pierre-Emmanuel Viel
fa749de0dc
As some processed distances are already ^2, use template to select whether or not we have to ^2 in KMeanspp
2013-12-18 20:48:25 +01:00
Pierre-Emmanuel Viel
5aeeaa6fce
Apply to KMeansIndex KMeanspp the same modification as in HierarchicalClusteringIndex
2013-12-18 20:48:15 +01:00
Pierre-Emmanuel Viel
45e0e5f8e9
Pick centers in KMeans++ with a probability proportional to their distance^2, instead of simple distance, to previous centers
2013-12-18 20:48:02 +01:00
Andrey Pavlenko
459e7d4a80
Merge pull request #2015 from apavlenko:2.4_fix_ts_rng-fill
2013-12-18 19:13:22 +04:00
Roman Donchenko
400fea8626
Merge pull request #2011 from ilya-lavrenov:dft_dct
2013-12-18 17:36:18 +04:00
Andrey Pavlenko
a9687a341e
adding more than 4 channels random Mats support
...
if `Scalar:all` is used, Mats with 5+ channels cause errors
2013-12-18 17:27:39 +04:00
Andrey Pavlenko
ae9d24d433
Merge pull request #2013 from apavlenko:2.4_fd_sample
2013-12-18 17:05:18 +04:00
Andrey Pavlenko
8c60498673
adding timing for multi-threaded case
2013-12-18 17:02:39 +04:00
Andrey Pavlenko
e719bee2b8
minor refactoring, no functional changes
2013-12-18 00:15:02 +04:00
Ilya Lavrenov
3a6d248bee
typo
2013-12-17 17:41:28 +04:00
Roman Donchenko
5d5527d03e
Merge pull request #1987 from pentschev:cv_completesymm_template_2.4
2013-12-17 13:17:25 +04:00
Roman Donchenko
e88253ccad
Merge pull request #1990 from AD-530:Issue3164
2013-12-16 12:11:43 +04:00
Peter Andreas Entschev
f44de302a0
cv::completeSymm fixed to work with any OpenCV data type and multiple channels.
2013-12-15 20:56:55 -02:00
Matthias Bady
b7c97f6e30
fixed init of clCxt
2013-12-15 22:41:07 +01:00
Andrey Pavlenko
10849d1c7a
Merge pull request #1980 from alalek:ocl_interop_initialization
2013-12-13 16:09:09 +04:00
Alexander Alekhin
17ca7f9545
ocl: add support for initialization from user-provided OpenCL handles
2013-12-12 19:59:22 +04:00
Andrey Pavlenko
658282fcbe
Merge pull request #1976 from alalek:ocl_multiple_command_queues
2013-12-12 09:55:33 +04:00
Andrey Pavlenko
ee270d1a18
Merge pull request #1975 from magomimmo:clj-tut
2013-12-11 21:25:31 +04:00
Alexander Alekhin
740b1f235e
ocl: implemented per-thread OpenCL command queue
2013-12-11 19:12:09 +04:00
Alexander Alekhin
a118577a57
core: added TLS support
2013-12-11 18:50:11 +04:00
Roman Donchenko
ce503c64bf
Merge pull request #1968 from pentschev:fix_indentation_freak_2.4
2013-12-11 16:55:26 +04:00
Mimmmo Cosenza
00a180185e
remove Daniele
2013-12-11 13:35:20 +01:00
Mimmmo Cosenza
1c639befe6
add tutorial content
2013-12-11 13:30:52 +01:00
Mimmmo Cosenza
b1899e5489
add clojure tutorial
2013-12-11 13:28:27 +01:00
Mimmmo Cosenza
6f292d8036
add clojure logo
2013-12-11 13:28:04 +01:00
Mimmmo Cosenza
f07e9e7c5f
add clojure sample
2013-12-11 13:26:47 +01:00
Mimmmo Cosenza
2784fd7b27
add Mimmo Cosenza to Authors
2013-12-11 13:25:53 +01:00
Peter Andreas Entschev
c289c8a700
Fixing some indentation issues on FREAK source file.
2013-12-10 08:57:46 -02:00
Roman Donchenko
13c058ecf8
Merge pull request #1959 from botverse:2.4
2013-12-09 17:25:33 +04:00
Alfonso (the fonz) de la Osa
df0c43321d
--no-display property fix in stereo_match.cpp sample
2013-12-09 10:55:44 +00:00
Roman Donchenko
8f10ca5180
Merge pull request #1946 from asmorkalov:android_manager_version_inc3
2013-12-09 13:14:16 +04:00
Alexander Smorkalov
9f04222a75
OpenCV Manager version++.
2013-12-06 18:53:03 +04:00
Roman Donchenko
060e58d080
Merge pull request #1945 from apavlenko:2.4_version_update
2013-12-06 17:56:59 +04:00
Andrey Pavlenko
b5936648ca
Merge pull request #1943 from pentschev:ocl_oclMat_ptr_remove_2.4
2013-12-06 16:59:02 +04:00
Andrey Pavlenko
f2cf9dd8bf
updating version to 2.4.7.2
2013-12-06 16:21:22 +04:00
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
