Roman Donchenko
0fb629915f
Merge pull request #1763 from SpecLad:cv-func
2013-11-08 12:29:50 +04:00
Baichuan Su
9a0d06247a
Fix the whitespace warning.
2013-11-07 15:04:17 -08:00
Ilya Lavrenov
760b718981
added CV_16SC2 && CV_16UC1 map types support to ocl::remap (INTER_LINEAR mode)
2013-11-08 01:42:48 +04:00
Baichuan Su
99a00d3dd9
Fix merge conflicts
2013-11-07 09:56:59 -08:00
Baichuan Su
befcbf56fe
A minor fix.
2013-11-07 08:52:40 -08:00
Baichuan Su
f0de1a08b8
Fix ocl::calcHarris not support CV_32FC1 bug.
2013-11-07 08:52:39 -08:00
Roman Donchenko
07db81a4bb
Merge pull request #1760 from ilya-lavrenov:ocl_remap_nn
2013-11-07 17:29:16 +04:00
Roman Donchenko
2c38be079e
Enabled CV_Assert and such to print the function name with Visual C++.
...
Also, I made a separate macro for the current function name, which
helps simplify a lot of code that uses it.
2013-11-07 17:22:02 +04:00
Konstantin Matskevich
e9edfd1c54
update
2013-11-07 17:21:56 +04:00
Roman Donchenko
641bb7ac6b
Merge pull request #1737 from vrabaud:2.4
2013-11-07 12:03:30 +04:00
Bo Hu
c88fa27b1d
Removed trailing whitespace in cap_qtkit.mm.
2013-11-06 13:33:17 -08:00
Bo Hu
114579c33b
Added proper testing of the end of quicktime video files.
...
CvCaptureFile::grabFrame() always returns 1 regardless, which causes
dead loop when relying on the return value of VideoCapture::read().
2013-11-06 13:32:11 -08:00
Ilya Lavrenov
fa15769f39
added CV_16SC2 && CV_16UC1 maps support to ocl::remap (nearest neighbour only)
2013-11-06 23:14:04 +04:00
Ilya Lavrenov
56d943388d
speeded up ocl::distanceToCenters
2013-11-06 20:02:31 +04:00
Andrey Pavlenko
296f76a135
Merge pull request #1756 from alalek:ocl_workaround_memory_leaks_with_subbuffer
2013-11-06 18:26:39 +04:00
Andrey Pavlenko
9afe65e5c0
Merge pull request #1758 from apavlenko:adaptive_bilateral_filter
2013-11-06 18:09:49 +04:00
Roman Donchenko
bca63083a8
Merge pull request #1757 from asmorkalov:android_manager_version_inc2
2013-11-06 17:50:20 +04:00
Harris Gasparakis
a1de91a4fd
Cleaned up adaptive bilateral filtering, added support for gaussian interpolation, updated sample and docs
2013-11-06 16:48:50 +04:00
Konstantin Matskevich
5304e9f259
extending openCL info dump
2013-11-06 15:20:05 +04:00
Roman Donchenko
370235c07b
Merge pull request #1711 from SpecLad:cap-broken-mat
2013-11-06 14:53:08 +04:00
Alexander Smorkalov
24f369c4ac
Android Manager Version++.
2013-11-06 14:24:18 +04:00
Alexander Alekhin
03646e7e01
ocl: workaround for subbuffer memory leaks
2013-11-06 14:02:41 +04:00
Andrey Pavlenko
43c9157220
Merge pull request #1750 from alalek:ocl_update_documentation
2013-11-06 13:32:00 +04:00
Andrey Pavlenko
a3fa7a243d
Merge pull request #1740 from ilya-lavrenov:ocl_corners
2013-11-06 13:31:44 +04:00
Andrey Pavlenko
95767676b7
Merge pull request #1739 from pengx17:2.4_ocl_overload_haar
2013-11-06 13:31:11 +04:00
Roman Donchenko
5c44afa427
Merge pull request #1743 from ilya-lavrenov:ocl_repeat
2013-11-06 13:24:22 +04:00
peng xiao
53d1873776
Revert back test image.
2013-11-06 11:19:26 +08:00
Alexander Alekhin
3952a0df44
ocl: update comments in ocl.hpp
2013-11-05 23:53:52 +04:00
Alexander Alekhin
5a333bfff4
ocl: update documentation
2013-11-05 23:53:51 +04:00
Andrey Pavlenko
be37d99567
Merge pull request #1752 from alalek:ocl_memory_cleanup_workaround
2013-11-05 23:49:37 +04:00
Andrey Pavlenko
14c3560750
Merge pull request #1751 from ilya-lavrenov:ocl_copyMakeBorder_test_fix
2013-11-05 23:49:12 +04:00
Andrey Pavlenko
14b2eed17b
Merge pull request #1745 from alalek:ocl_fix_svm_with_blas
2013-11-05 23:48:42 +04:00
Alexander Alekhin
691d5f4187
ocl: memory cleanup workaround: clFinish() before clReleaseMemObject() + 64kb memory guard
2013-11-05 19:43:07 +04:00
Roman Donchenko
f2241e3d26
Merge pull request #1749 from SpecLad:update-ignore
2013-11-05 19:41:29 +04:00
Ilya Lavrenov
e544e34eed
fixed ocl::copyMakeBorder accuracy test
2013-11-05 18:23:34 +04:00
Alexander Alekhin
7704dbf866
ocl: svm: restore non BLAS version
2013-11-05 15:15:26 +04:00
Alexander Alekhin
9a63508f50
Revert "disable SVM when AMD BLAS is not available"
...
This reverts commit d63a38e9bf
.
Conflicts:
modules/ocl/test/test_ml.cpp
2013-11-05 15:13:30 +04:00
Vincent Rabaud
0b1df62215
add VERBATIM as advised by @SpecLad
2013-11-05 12:02:22 +01:00
Vincent Rabaud
3b0108e4c1
fix the crash as suggested by @SpecLad
2013-11-05 11:18:20 +01:00
Ilya Lavrenov
e7e7e04dce
came back to relative error
2013-11-05 14:17:31 +04:00
Roman Donchenko
4203979c87
Sorted .gitignore.
2013-11-05 13:41:42 +04:00
Roman Donchenko
ec77434190
Update .gitignore.
...
* OpenCV4Tegra/ is no longer relevant.
* We should only ignore the particular refman.rst that we generate.
2013-11-05 13:37:01 +04:00
Ilya Lavrenov
2df53d97c5
added ocl::repeat
2013-11-05 12:23:20 +04:00
peng xiao
2a111f7a6c
Let perf/accuracy test of ocl haar uses detectMultiScale api.
...
Fix image to be used by perf test.
2013-11-05 10:40:27 +08:00
Ilya Lavrenov
c89dfd333c
fixed warnings in OpenCL kernels
2013-11-04 15:30:00 +04:00
Ilya Lavrenov
a8426e1c12
fixed ocl::cornerHarris, ocl::cornerMinEigenVal and their accuracy tests
2013-11-04 15:16:00 +04:00
peng xiao
8c1eb5bf0e
Overload detectMultiScale API for ocl::haar.
2013-11-04 14:59:28 +08:00
Vincent Rabaud
e1b2f593d6
fix crash when path has spaces
...
The paths are defined properly with an escape "\ " but you cannot have an escape and
quotes when piping (otherwise, escapes are understood as 2 characters).
So just remove the quotes.
2013-11-01 19:30:58 +01:00
Andrey Pavlenko
dd942df08b
Merge pull request #1736 from alalek:ocl_fix_corner_memory_access
2013-11-01 18:37:35 +04:00
Andrey Pavlenko
2767be9a5e
Merge pull request #1731 from perping:2.4_haar
2013-11-01 16:46:18 +04:00