Ilya Lavrenov
|
891dbeabba
|
implemented OpenCL version of cv::fastNlMeansDenoising
|
2014-02-18 14:32:03 +04:00 |
|
Ilya Lavrenov
|
d27068f79a
|
some more refactoring
|
2014-02-18 14:32:03 +04:00 |
|
Ilya Lavrenov
|
e16d89e8d6
|
some refactoring
|
2014-02-18 14:32:03 +04:00 |
|
Andrey Pavlenko
|
b3cfe6b446
|
Merge pull request #2341 from alalek:ocl_fix_error_processing
|
2014-02-18 13:27:38 +04:00 |
|
Andrey Pavlenko
|
ff9a0815b9
|
Merge pull request #2352 from ilya-lavrenov:flann
|
2014-02-18 13:24:41 +04:00 |
|
Roman Donchenko
|
2409812803
|
Merge pull request #2347 from Chechli:master
|
2014-02-18 12:57:26 +04:00 |
|
Roman Donchenko
|
139a262072
|
Merge pull request #2367 from jet47:fix-3544
|
2014-02-18 12:15:49 +04:00 |
|
Roman Donchenko
|
bcf4307345
|
Merge pull request #2356 from SpecLad:merge-2.4
|
2014-02-18 12:14:57 +04:00 |
|
Chechli
|
768da4d95a
|
Update hough_circles.cpp
|
2014-02-18 08:50:33 +01:00 |
|
Vladislav Vinogradov
|
afd99c9c81
|
fix bug #3544:
add "opencv2/core/utility.hpp" header to precomp.hpp
|
2014-02-18 10:45:47 +04:00 |
|
Ilya Lavrenov
|
6ad7b64912
|
some more changes
|
2014-02-17 21:57:33 +04:00 |
|
Andrey Pavlenko
|
9885a671ee
|
Merge pull request #2346 from ilya-lavrenov:umat_tests_cleanup
|
2014-02-17 17:53:05 +04:00 |
|
Andrey Pavlenko
|
47d9b933f6
|
Merge pull request #2345 from ilya-lavrenov:tapi_3cn_perf
|
2014-02-17 17:38:26 +04:00 |
|
Andrey Pavlenko
|
aeeb9f9e25
|
Merge pull request #2334 from alalek:umat_usage_flags_2
|
2014-02-17 17:34:19 +04:00 |
|
Andrey Pavlenko
|
01b225acb0
|
Merge pull request #2340 from ilya-lavrenov:tapi_lab
|
2014-02-17 16:45:40 +04:00 |
|
Roman Donchenko
|
029ffb7c2d
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/core/src/gl_core_3_1.cpp
modules/core/src/opencl/convert.cl
modules/cudaimgproc/src/cuda/canny.cu
modules/cudastereo/perf/perf_stereo.cpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/test/test_denoising.cpp
modules/ocl/src/opencl/imgproc_resize.cl
samples/cpp/Qt_sample/main.cpp
|
2014-02-17 15:24:05 +04:00 |
|
Roman Donchenko
|
a6d64e254f
|
Merge pull request #2354 from gleb-sternharz:Branch_2.4.8
|
2014-02-17 15:00:47 +04:00 |
|
Chechli
|
9211d1ac2d
|
Update hough_circles.cpp
|
2014-02-17 09:50:32 +01:00 |
|
Chechli
|
640a45d359
|
Update precomp.hpp
|
2014-02-17 09:48:51 +01:00 |
|
Roman Donchenko
|
a0bb74a086
|
Merge pull request #2337 from pmoulon:master
|
2014-02-17 12:24:48 +04:00 |
|
Roman Donchenko
|
cfcf07acfa
|
Merge pull request #2328 from rohitgirdhar:bugfix_blobdetector_kpt_radius
|
2014-02-17 12:23:59 +04:00 |
|
Roman Donchenko
|
8cbb284b7b
|
Merge pull request #2348 from ilya-lavrenov:typo
|
2014-02-17 12:02:59 +04:00 |
|
gleb.sternharz
|
f85aa929f1
|
fix dev by 0 in KL-Divergence
|
2014-02-17 04:08:30 +01:00 |
|
Ilya Lavrenov
|
f74ef644bc
|
changed the signature of add method according to the base class
|
2014-02-17 02:39:38 +04:00 |
|
yash
|
1a89a03c7c
|
Fixed CV_ASSERT condition in the code for bag of words
|
2014-02-16 22:33:30 +05:30 |
|
Chechli
|
10465c546a
|
Update hough_circles.cpp
|
2014-02-16 13:26:00 +01:00 |
|
Ilya Lavrenov
|
c8e22c04c8
|
extended performance test
|
2014-02-16 13:42:25 +04:00 |
|
Vladislav Vinogradov
|
150e522bee
|
fix bug #3552:
replace std::swap with own code
|
2014-02-16 12:17:17 +04:00 |
|
Ilya Lavrenov
|
510680a5df
|
typo
|
2014-02-16 01:42:02 +04:00 |
|
Ilya Lavrenov
|
7629bb78a4
|
extended performance tests to test 3 channels
|
2014-02-16 01:31:33 +04:00 |
|
Chechli
|
72e4f72a75
|
Update hough_circles.cpp
|
2014-02-15 17:31:14 +01:00 |
|
Ilya Lavrenov
|
9b627a5e9f
|
disabled 'reshape', 'copyTo' test
|
2014-02-15 20:17:42 +04:00 |
|
Ilya Lavrenov
|
7ce2c3574a
|
restored lost in PR #1735 umat tests
|
2014-02-15 16:09:55 +04:00 |
|
Ilya Lavrenov
|
4f36bc29d9
|
cleaned-up UMat tests
|
2014-02-15 15:51:52 +04:00 |
|
Alexander Alekhin
|
915fb632fd
|
core/ocl: change error processing for missed function
|
2014-02-14 19:50:58 +04:00 |
|
Ilya Lavrenov
|
8150c1b7e4
|
added [s|l]rgb <-> lab conversion
|
2014-02-14 18:45:56 +04:00 |
|
Roman Donchenko
|
e0d991cf46
|
Merge pull request #2335 from jet47:gpu-alphacomp-test
|
2014-02-14 16:20:45 +04:00 |
|
Andrey Pavlenko
|
0fc248fb70
|
Merge pull request #2326 from vpisarev:ocl_ch3
|
2014-02-14 15:49:36 +04:00 |
|
Alexander Alekhin
|
95e38e457f
|
core/umat: usage flags (with proposals from PR #2195)
|
2014-02-14 15:40:16 +04:00 |
|
Roman Donchenko
|
fa272c43c2
|
Merge pull request #2323 from stuart8c:issue2601_2.4_fix_16bit_tiff_reading_on_big_endian_host
|
2014-02-14 15:37:09 +04:00 |
|
Pierre Moulon
|
8829e9f6c8
|
Fix a typo error
|
2014-02-14 12:22:53 +01:00 |
|
Roman Donchenko
|
a1de9e9ad5
|
Merge pull request #2329 from ilya-lavrenov:macosx_ogl
|
2014-02-14 14:38:37 +04:00 |
|
Vladislav Vinogradov
|
1ce5165cb7
|
temporary disable performance test for alphaComp function
|
2014-02-14 14:27:43 +04:00 |
|
Andrey Pavlenko
|
534bec3a90
|
Merge pull request #2315 from ilya-lavrenov:nlmeans_perf
|
2014-02-14 13:24:12 +04:00 |
|
Andrey Pavlenko
|
d68c688f22
|
Merge pull request #1735 from KonstantinMatskevich:umat_tests
|
2014-02-14 12:37:47 +04:00 |
|
Roman Donchenko
|
3def7778dc
|
Merge pull request #2062 from cook:bug3440
|
2014-02-14 12:09:03 +04:00 |
|
Yantao Xie
|
6b00c4e337
|
Use CMAKE_CFG_INTDIR meta-variable to get the library output directory of the opencv_matlab.
|
2014-02-13 23:53:58 +08:00 |
|
Roman Donchenko
|
ecbe843061
|
Merge pull request #2333 from asmorkalov:java_dead_code_fix
|
2014-02-13 19:21:56 +04:00 |
|
Alexander Smorkalov
|
dbe7634286
|
Dead code removed as this cannot be null in Java.
|
2014-02-13 18:17:47 +04:00 |
|
Vadim Pisarevsky
|
630bdbf42f
|
fixed OpenCL kernel flag in resize (thanks to Ilya L)
|
2014-02-13 17:37:42 +04:00 |
|