Zac Stewart
f36a9f745f
Remove extraneous colon before ':basicstructures:'
2013-08-30 06:34:23 -04:00
abidrahmank
7fd8a19fe8
warning corrections
2013-08-30 15:58:10 +05:30
Roman Donchenko
114bec52fe
Merge pull request #1363 from ilya-lavrenov:ocl_enable_tests
2013-08-30 12:24:24 +04:00
Roman Donchenko
72e11f9066
Merge pull request #1370 from ilya-lavrenov:ocl_decor
2013-08-30 12:21:27 +04:00
abidrahmank
14af369640
Python bindings for KeyPoint methods
...
Usage:
import numpy as np
import cv2
img = cv2.imread('messi5.jpg',0)
sift = cv2.SIFT()
kp = sift.detect(img)
pts = cv2.KeyPoint_convert(kp)
kps = cv2.KeyPoint_convert(pts.reshape(-1,1,2))
overlap = cv2.KeyPoint_overlap(kp[0],kp[1])
2013-08-30 11:11:06 +05:30
kdrobnyh
f4aa7ff919
Add IPP support in meanStdDev, minMaxIdx, norm functions
2013-08-29 21:09:19 +04:00
kdrobnyh
dc1eb583b4
Merge pull request #5 from Itseez/2.4
...
Some changes in OpenCV
2013-08-29 07:53:46 -07:00
ilya-lavrenov
a6084d2970
enabled some tests that failed before OCL_TEST_CYCLE*() macroses were defined and for some tests was disabled SANITY_CHECK, because plain and ocl results must not be completely equal
2013-08-29 18:39:09 +04:00
ilya-lavrenov
968c095403
gpu -> ocl
2013-08-29 18:32:06 +04:00
Roman Donchenko
53818f0f5f
Merge pull request #1361 from asmorkalov:winrt_api_container
2013-08-29 18:09:06 +04:00
Roman Donchenko
78a6692e53
Merge pull request #1359 from asmorkalov:winrt_tiff_api_fix
2013-08-29 18:07:58 +04:00
kdrobnyh
7a7aa148d4
Add IPP support in compare function
2013-08-29 17:55:57 +04:00
Roman Donchenko
fc37df05ec
Merge pull request #1366 from asmorkalov:ocv_autobuffer_fix
2013-08-29 16:35:38 +04:00
Roman Donchenko
86f4cd253a
Merge pull request #1309 from pengx17:master_retina_ocl
2013-08-29 16:26:55 +04:00
Alexander Smorkalov
5af2cc6223
AutoBuffer with initial zero size fixed.
2013-08-29 15:03:53 +04:00
Vadim Pisarevsky
f12702be24
fixed bugs in rectangular morphology case
2013-08-28 19:53:40 +04:00
Alexander Smorkalov
ebe7f00cb4
/apicontainer added to linker flags on WinRT to fix api test issues.
2013-08-28 08:36:57 -07:00
Roman Donchenko
90cf8fbd60
Merge pull request #1338 from asmorkalov:android_tegra_detector
2013-08-28 19:02:09 +04:00
Roman Donchenko
e958767a8b
Merge pull request #1343 from asmorkalov:android_img_manipulations_fix
2013-08-28 19:01:15 +04:00
Alexander Smorkalov
3036ec4b89
LibTIFF Win32 API back-end disabled for Windows RT.
2013-08-28 07:31:46 -07:00
Roman Donchenko
11dcd4f4f3
Merge pull request #1356 from SpecLad:homography-uninit
2013-08-28 18:05:10 +04:00
Vadim Pisarevsky
771feb61c2
fixed building OpenCV with IPP 6.x (different DFT API); added Canny and rectangular morphology (based on Alex Kapustin patches)
2013-08-28 17:00:26 +04:00
Alexander Smorkalov
aa00b5a0ab
New Tegra detector with Android 4.3 support added. Manager version++.
2013-08-28 15:22:14 +04:00
Alexander Smorkalov
8d4cbf4deb
Bug #3238 Android sample image manipulations blinks in non-preview modes fixed.
2013-08-28 15:08:13 +04:00
Roman Donchenko
2b90b20be2
Merge pull request #1357 from SpecLad:less-precomps
2013-08-28 14:52:28 +04:00
Roman Donchenko
e59c74e1c7
Merge pull request #1348 from SpecLad:merge-2.4
2013-08-28 13:41:41 +04:00
Roman Donchenko
cdf6cf2cd8
Merge pull request #1213 from kdrobnyh:color
2013-08-28 13:31:09 +04:00
Roman Donchenko
122d0f8685
Deleted the now-empty ocl perf_precomp.cpp.
...
See pull request #1241 for why.
2013-08-28 13:26:30 +04:00
Roman Donchenko
5e4ebf3403
Fixed incomplete matrix initialization in HomographyRefineCallback.
2013-08-28 13:20:14 +04:00
Roman Donchenko
7afc2677e6
Removed a duplicate line.
2013-08-28 13:13:15 +04:00
Roman Donchenko
8bb9994094
Merge pull request #1349 from ilya-lavrenov:ocl_perf_finish
2013-08-28 12:46:01 +04:00
Vladislav Vinogradov
d87eb75904
rewrite gpu stereo multi gpu sample:
...
* use different approaches -> threads and streams
* clean up code
2013-08-28 12:41:41 +04:00
peng xiao
9f0a88c1d6
Remove trailing whitespace.
2013-08-28 16:23:46 +08:00
Roman Donchenko
10cb9a0c4a
Merge pull request #1342 from nevion:master
2013-08-28 12:00:39 +04:00
Roman Donchenko
1840fd5f00
Merge pull request #1248 from vkocheganov:chi_square_alt
2013-08-28 11:44:41 +04:00
peng xiao
287c8a3330
Let ocl::context only be initialized once in retina_ocl test.
2013-08-28 09:17:05 +08:00
ilya-lavrenov
3c86aa4ae1
appended ocl::finish to test_cycle defines
2013-08-28 00:39:58 +04:00
Roman Donchenko
2d6f35d6ed
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/gpuwarping/src/cuda/resize.cu
modules/gpuwarping/src/resize.cpp
modules/gpuwarping/test/test_resize.cpp
modules/ocl/perf/main.cpp
modules/ocl/perf/perf_calib3d.cpp
modules/ocl/perf/perf_canny.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/perf_precomp.cpp
modules/ocl/perf/perf_precomp.hpp
2013-08-27 19:15:47 +04:00
Roman Donchenko
d32b62a177
Merge pull request #1341 from roynos:master
2013-08-27 17:47:56 +04:00
Roman Donchenko
dd25f416a6
War on Whitespace, master edition: tabs.
2013-08-27 17:13:53 +04:00
Roman Donchenko
cd5b8af609
Restored one executable bit that was lost during the war on whitespace.
2013-08-27 14:39:43 +04:00
Roman Donchenko
9ed475cf52
War on Whitespace, master edition: file endings.
2013-08-27 14:23:26 +04:00
Roman Donchenko
9b92545ce6
War on Whitespace, master edition: trailing spaces.
2013-08-27 13:57:24 +04:00
Roman Donchenko
2c4bbb313c
Merge commit '43aec5ad' into merge-2.4
...
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVLegacyOptions.cmake
modules/contrib/src/retina.cpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/video.rst
modules/gpu/src/speckle_filtering.cpp
modules/python/src2/cv2.cv.hpp
modules/python/test/test2.py
samples/python/watershed.py
2013-08-27 13:26:44 +04:00
Roman Donchenko
4d06c4c7b6
Merge commit '43aec5ad^' into merge-2.4
...
Conflicts:
modules/contrib/src/inputoutput.cpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpuarithm/perf/perf_element_operations.cpp
modules/gpuarithm/src/element_operations.cpp
modules/ts/src/precomp.hpp
2013-08-27 13:23:26 +04:00
Roman Donchenko
657699a1da
Merge pull request #1267 from clhsieh:gpu_example_build_failed_with_cuda5p5
2013-08-27 12:43:36 +04:00
Roman Donchenko
45a0b39a73
Merge pull request #1339 from mdim:ml_cpp_wrappers_fix
2013-08-27 12:37:33 +04:00
Roman Donchenko
0e32d7ccb3
Merge pull request #1346 from jet47:gpu-tvl1-optimization
2013-08-27 12:36:45 +04:00
Jason Newton
affab4f156
correct range computations, it is difficult to do the more efficient single pass 3N/2 implementations correctly in this particular setting without costing more than they save
2013-08-27 00:34:22 -07:00
Vladislav Vinogradov
bff0fad6c3
gpu TVL1 Optical Flow optimization:
...
do not calculate sum of error in every round of iteration;
instead the error will be summed every 2nd times or more,
if the previous sum of error is too far away from threshold.
2013-08-27 11:21:41 +04:00
