Roman Donchenko
|
bcf4307345
|
Merge pull request #2356 from SpecLad:merge-2.4
|
11 years ago |
Andrey Pavlenko
|
9885a671ee
|
Merge pull request #2346 from ilya-lavrenov:umat_tests_cleanup
|
11 years ago |
|
Andrey Pavlenko
|
47d9b933f6
|
Merge pull request #2345 from ilya-lavrenov:tapi_3cn_perf
|
11 years ago |
|
Andrey Pavlenko
|
aeeb9f9e25
|
Merge pull request #2334 from alalek:umat_usage_flags_2
|
11 years ago |
|
Andrey Pavlenko
|
01b225acb0
|
Merge pull request #2340 from ilya-lavrenov:tapi_lab
|
11 years ago |
|
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
|
11 years ago |
|
Roman Donchenko
|
a6d64e254f
|
Merge pull request #2354 from gleb-sternharz:Branch_2.4.8
|
11 years ago |
|
Roman Donchenko
|
a0bb74a086
|
Merge pull request #2337 from pmoulon:master
|
11 years ago |
|
Roman Donchenko
|
cfcf07acfa
|
Merge pull request #2328 from rohitgirdhar:bugfix_blobdetector_kpt_radius
|
11 years ago |
|
Roman Donchenko
|
947fb74c18
|
Merge pull request #2330 from rohitgirdhar:linux_tutorial_make_j8
|
11 years ago |
|
Roman Donchenko
|
b6dafed5ba
|
Merge pull request #2342 from yashdv:android_doc_fix
|
11 years ago |
|
Roman Donchenko
|
8cbb284b7b
|
Merge pull request #2348 from ilya-lavrenov:typo
|
11 years ago |
|
Roman Donchenko
|
f252687eae
|
Merge pull request #2351 from yashdv:BOW_assert_error
|
11 years ago |
|
Roman Donchenko
|
9fcb0b2201
|
Merge pull request #2349 from jet47:fix-bug-3552
|
11 years ago |
|
Roman Donchenko
|
aad289a3a2
|
Merge pull request #2344 from kirill-kornyakov:replace-gittip-button
|
11 years ago |
gleb.sternharz
|
f85aa929f1
|
fix dev by 0 in KL-Divergence
|
11 years ago |
yash
|
1a89a03c7c
|
Fixed CV_ASSERT condition in the code for bag of words
|
11 years ago |
Ilya Lavrenov
|
c8e22c04c8
|
extended performance test
|
11 years ago |
Vladislav Vinogradov
|
150e522bee
|
fix bug #3552:
replace std::swap with own code
|
11 years ago |
|
Ilya Lavrenov
|
510680a5df
|
typo
|
11 years ago |
|
Ilya Lavrenov
|
7629bb78a4
|
extended performance tests to test 3 channels
|
11 years ago |
|
Ilya Lavrenov
|
9b627a5e9f
|
disabled 'reshape', 'copyTo' test
|
11 years ago |
|
Ilya Lavrenov
|
7ce2c3574a
|
restored lost in PR #1735 umat tests
|
11 years ago |
|
Ilya Lavrenov
|
4f36bc29d9
|
cleaned-up UMat tests
|
11 years ago |
Kirill Kornyakov
|
ed1aa73dd3
|
Replaced Gittip button
|
11 years ago |
|
yash
|
e2f5001b11
|
fixed doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
|
11 years ago |
|
Ilya Lavrenov
|
8150c1b7e4
|
added [s|l]rgb <-> lab conversion
|
11 years ago |
|
Roman Donchenko
|
3542da7167
|
Merge pull request #2336 from SpecLad:useOclChanged
|
11 years ago |
|
Roman Donchenko
|
e0d991cf46
|
Merge pull request #2335 from jet47:gpu-alphacomp-test
|
11 years ago |
|
Andrey Pavlenko
|
0fc248fb70
|
Merge pull request #2326 from vpisarev:ocl_ch3
|
11 years ago |
Alexander Alekhin
|
95e38e457f
|
core/umat: usage flags (with proposals from PR #2195)
|
11 years ago |
|
Roman Donchenko
|
fa272c43c2
|
Merge pull request #2323 from stuart8c:issue2601_2.4_fix_16bit_tiff_reading_on_big_endian_host
|
11 years ago |
Pierre Moulon
|
8829e9f6c8
|
Fix a typo error
|
11 years ago |
|
Pierre Moulon
|
f3f8b843b6
|
Fix a typo error
|
11 years ago |
|
Roman Donchenko
|
a1de9e9ad5
|
Merge pull request #2329 from ilya-lavrenov:macosx_ogl
|
11 years ago |
|
Roman Donchenko
|
88f993dbda
|
Deleted an assignment to a variable that doesn't exist.
|
11 years ago |
|
Vladislav Vinogradov
|
1ce5165cb7
|
temporary disable performance test for alphaComp function
|
11 years ago |
|
Andrey Pavlenko
|
534bec3a90
|
Merge pull request #2315 from ilya-lavrenov:nlmeans_perf
|
11 years ago |
|
Andrey Pavlenko
|
d68c688f22
|
Merge pull request #1735 from KonstantinMatskevich:umat_tests
|
11 years ago |
|
Roman Donchenko
|
3def7778dc
|
Merge pull request #2062 from cook:bug3440
|
11 years ago |
Stuart Cunningham
|
1454843b81
|
Fix build of libtiff on big endian host due to defined but empty WORDS_BIGENDIAN macro
|
11 years ago |
|
Ilya Lavrenov
|
b92a46c130
|
some more fixes
|
11 years ago |
Yantao Xie
|
6b00c4e337
|
Use CMAKE_CFG_INTDIR meta-variable to get the library output directory of the opencv_matlab.
|
11 years ago |
|
Roman Donchenko
|
ecbe843061
|
Merge pull request #2333 from asmorkalov:java_dead_code_fix
|
11 years ago |
|
Roman Donchenko
|
b4a535272c
|
Merge pull request #2332 from jet47:gpu-fixes
|
11 years ago |
Alexander Smorkalov
|
dbe7634286
|
Dead code removed as this cannot be null in Java.
|
11 years ago |
|
Roman Donchenko
|
b8d8b0568c
|
Merge pull request #2331 from asmorkalov:android_native_activity_finish
|
11 years ago |
Vadim Pisarevsky
|
630bdbf42f
|
fixed OpenCL kernel flag in resize (thanks to Ilya L)
|
11 years ago |
|
Vladislav Vinogradov
|
eb247d826f
|
temporary disable perf test for StereoBeliefPropagation
|
11 years ago |
|
Vladislav Vinogradov
|
9e69e2a07a
|
increase epsilon for AlphaComp sanity test for integer input
|
11 years ago |
