Alexander Shishkov
|
63235f51f0
|
fixed year in copyright
|
2014-02-17 17:56:12 +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 |
|
Alexander Shishkov
|
cc529d971b
|
removed tabs
|
2014-02-17 17:37:02 +04:00 |
|
Andrey Pavlenko
|
aeeb9f9e25
|
Merge pull request #2334 from alalek:umat_usage_flags_2
|
2014-02-17 17:34:19 +04:00 |
|
Rohit Girdhar
|
a879e1fcd6
|
fixed warnings
|
2014-02-17 19:00:36 +05:30 |
|
Evgeniy
|
8236181c62
|
Added more colorizing options to XLS generating script
|
2014-02-17 17:01:23 +04:00 |
|
Alexander Karsakov
|
01a980aa9e
|
Fixed compilation with IPP on Linux. Added linking with Intel compiler runtime libraries.
|
2014-02-17 16:56:02 +04:00 |
|
Andrey Pavlenko
|
01b225acb0
|
Merge pull request #2340 from ilya-lavrenov:tapi_lab
|
2014-02-17 16:45:40 +04:00 |
|
Rohit Girdhar
|
613a17355d
|
rotRect using points
|
2014-02-17 17:39:13 +05:30 |
|
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 |
|
Roman Donchenko
|
e8d26b02ac
|
Merge pull request #2339 from jet47:gpu-warnings
|
2014-02-17 13:35:15 +04:00 |
|
Roman Donchenko
|
7358b44222
|
Merge pull request #2343 from yashdv:template_matching_doc_fix
|
2014-02-17 13:33:29 +04:00 |
|
Marijan Vukcevich
|
9a98cd6e65
|
Update cap_ios_abstract_camera.mm
AVCaptureVideoPreviewLayer setOrientation is depricated. This fixes the warning and provides backward compatibility.
|
2014-02-17 13:23:25 +04:00 |
|
Alexander Shishkov
|
f60913ddd3
|
small changes in hough circles tutorial
|
2014-02-17 12:55:19 +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
|
947fb74c18
|
Merge pull request #2330 from rohitgirdhar:linux_tutorial_make_j8
|
2014-02-17 12:22:11 +04:00 |
|
Roman Donchenko
|
b6dafed5ba
|
Merge pull request #2342 from yashdv:android_doc_fix
|
2014-02-17 12:21:20 +04:00 |
|
Roman Donchenko
|
8cbb284b7b
|
Merge pull request #2348 from ilya-lavrenov:typo
|
2014-02-17 12:02:59 +04:00 |
|
Roman Donchenko
|
f252687eae
|
Merge pull request #2351 from yashdv:BOW_assert_error
|
2014-02-17 11:58:03 +04:00 |
|
Roman Donchenko
|
9fcb0b2201
|
Merge pull request #2349 from jet47:fix-bug-3552
|
2014-02-17 11:52:01 +04:00 |
|
Roman Donchenko
|
aad289a3a2
|
Merge pull request #2344 from kirill-kornyakov:replace-gittip-button
|
2014-02-17 11:48:03 +04:00 |
|
gleb.sternharz
|
f85aa929f1
|
fix dev by 0 in KL-Divergence
|
2014-02-17 04:08:30 +01:00 |
|
pxli168
|
70d462b352
|
Simplify the code
Simplify the code as @SpecLad suggested.
|
2014-02-17 10:21:18 +08: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 |
|
Kirill Kornyakov
|
ed1aa73dd3
|
Replaced Gittip button
|
2014-02-15 13:10:09 +04:00 |
|
yash
|
cce225f6e9
|
fixed doc/tutorials/imgproc/histograms/template_matching/template_matching.rst
|
2014-02-15 12:48:42 +05:30 |
|
yash
|
e2f5001b11
|
fixed doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
|
2014-02-14 23:04:03 +05:30 |
|
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 |
|
Vladislav Vinogradov
|
8b8c368148
|
fixed two warnings in gpu sources (-Wshadow, -Wno-sign-promo)
|
2014-02-14 17:56:03 +04:00 |
|
Alexander Alekhin
|
d1606b4aa3
|
ocl: added SVM perf test
|
2014-02-14 16:36:46 +04:00 |
|
Roman Donchenko
|
3542da7167
|
Merge pull request #2336 from SpecLad:useOclChanged
|
2014-02-14 16:21:01 +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 |
|