Nicolas Martin
|
67cf0dabea
|
Do not build apple objective-c codes if using gcc
|
2014-02-24 09:44:49 -05:00 |
|
Andrey Pavlenko
|
9c5bd85247
|
Merge pull request #2375 from akarsakov:fix_getGradient
|
2014-02-20 21:41:43 +04:00 |
|
Andrey Pavlenko
|
b96923d5fa
|
Merge pull request #2377 from alalek:tapi_warpers_perf_test
|
2014-02-20 21:40:28 +04:00 |
|
Andrey Pavlenko
|
f04a158268
|
Merge pull request #2383 from ilya-lavrenov:perf_match_template
|
2014-02-20 21:36:30 +04:00 |
|
Ilya Lavrenov
|
804b70b72f
|
ported 2.4 perf tests for matchTemplate
|
2014-02-20 18:11:56 +04:00 |
|
Alexander Karsakov
|
7e4dea968c
|
Fixed typo with indexes in getGradient(x/y) functions.
|
2014-02-20 13:58:31 +04:00 |
|
Roman Donchenko
|
ad66233774
|
Merge pull request #2376 from GrinIara:master
|
2014-02-20 13:43:22 +04:00 |
|
Roman Donchenko
|
61976b8461
|
Merge pull request #2325 from alalek:perf_fix
|
2014-02-20 13:39:54 +04:00 |
|
Alexander Alekhin
|
79eba54a4f
|
some fixes in perf tests
|
2014-02-20 13:29:11 +04:00 |
|
Alexander Alekhin
|
ddd3c062b5
|
TAPI: fix perf test for warpers
|
2014-02-20 13:09:06 +04:00 |
|
GrinIara
|
fa0599448d
|
Fixed compilation error due to missing std::.
|
2014-02-19 17:06:33 +01:00 |
|
Alexander Alekhin
|
bf4f15fb5f
|
TAPI: fix OpenCL warpers and test
|
2014-02-19 15:30:43 +04:00 |
|
Roman Donchenko
|
ccbceb56c4
|
Merge pull request #2144 from nickdademo:pvapi_framestarttriggermode
|
2014-02-19 14:48:57 +04:00 |
|
Roman Donchenko
|
cfc4621587
|
Merge pull request #2291 from xgvargas:extra-note-for-waitKey
|
2014-02-19 14:33:58 +04:00 |
|
Roman Donchenko
|
3782c324c4
|
Merge pull request #2098 from pxli168:patch-1
|
2014-02-18 15:49:19 +04:00 |
|
Roman Donchenko
|
edbff68843
|
Merge pull request #2355 from alekcac:hough_circles_fix
|
2014-02-18 13:36:33 +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 |
|
Gustavo Vargas
|
0d199b4048
|
Update py_image_display.rst
|
2014-02-17 23:22:18 -03:00 |
|
pxli168
|
44ecb727c5
|
Change again.
Opps.
|
2014-02-18 10:13:30 +08: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 |
|
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 |
|