Roman Donchenko
9218f4976c
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/contrib/src/retina.cpp
modules/gpu/perf/perf_video.cpp
modules/gpuoptflow/src/tvl1flow.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_calib3d.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/src/precomp.hpp
samples/gpu/stereo_multi.cpp
11 years ago
Roman Donchenko
99043f6fc2
Merge pull request #1385 from asmorkalov:winrt_glob_fix
11 years ago
Alexander Smorkalov
6d3102141c
Globbing accuracy test fail on Windows RT fixed.
11 years ago
Roman Donchenko
188d3f02ee
Merge pull request #1302 from kdrobnyh:compare
11 years ago
Roman Donchenko
ff2b12334d
Merge pull request #1355 from jet47:gpu-stereo-multi-gpu-sample
11 years ago
Roman Donchenko
bd7930ada1
Merge pull request #1345 from pengx17:2.4_tvl1ocl_opt
11 years ago
Roman Donchenko
7e4c0ac4d6
Merge pull request #1371 from HapeMask:fix-png-warnings
11 years ago
Roman Donchenko
46d74d7c6b
Merge pull request #1360 from vpisarev:24_ipp_dft_canny_morphrect
11 years ago
Gabe Schwartz
b2bedef26f
Added interlace handling to PNG decoder.
...
libpng 1.5+ recommends a call to png_set_interlace_handling() if you use
png_read_update_info and png_read_image. It will generate a warning
without it.
11 years ago
Gabe Schwartz
e2441e0034
Removed incorrect iCCP chunks from GUI resources.
...
Also removed malformed tEXt chunk from a logo PNG.
11 years ago
Roman Donchenko
d6e8216b16
Merge pull request #1374 from zacstewart:2.4
11 years ago
Roman Donchenko
42b4d830e8
Merge pull request #1266 from kdrobnyh:core_stat_functions
11 years ago
Roman Donchenko
96a0afce50
Merge pull request #1236 from pengx17:2.4_fix_retina_color_param
11 years ago
Zac Stewart
8049296cda
Correct name of eye function
11 years ago
Zac Stewart
f36a9f745f
Remove extraneous colon before ':basicstructures:'
11 years ago
abidrahmank
7fd8a19fe8
warning corrections
11 years ago
Roman Donchenko
114bec52fe
Merge pull request #1363 from ilya-lavrenov:ocl_enable_tests
11 years ago
Roman Donchenko
72e11f9066
Merge pull request #1370 from ilya-lavrenov:ocl_decor
11 years ago
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])
11 years ago
kdrobnyh
f4aa7ff919
Add IPP support in meanStdDev, minMaxIdx, norm functions
11 years ago
kdrobnyh
dc1eb583b4
Merge pull request #5 from Itseez/2.4
...
Some changes in OpenCV
11 years ago
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
11 years ago
ilya-lavrenov
968c095403
gpu -> ocl
11 years ago
Roman Donchenko
53818f0f5f
Merge pull request #1361 from asmorkalov:winrt_api_container
11 years ago
Roman Donchenko
78a6692e53
Merge pull request #1359 from asmorkalov:winrt_tiff_api_fix
11 years ago
kdrobnyh
7a7aa148d4
Add IPP support in compare function
11 years ago
Roman Donchenko
fc37df05ec
Merge pull request #1366 from asmorkalov:ocv_autobuffer_fix
11 years ago
Roman Donchenko
86f4cd253a
Merge pull request #1309 from pengx17:master_retina_ocl
11 years ago
Alexander Smorkalov
5af2cc6223
AutoBuffer with initial zero size fixed.
11 years ago
Vadim Pisarevsky
f12702be24
fixed bugs in rectangular morphology case
11 years ago
Alexander Smorkalov
ebe7f00cb4
/apicontainer added to linker flags on WinRT to fix api test issues.
11 years ago
Roman Donchenko
90cf8fbd60
Merge pull request #1338 from asmorkalov:android_tegra_detector
11 years ago
Roman Donchenko
e958767a8b
Merge pull request #1343 from asmorkalov:android_img_manipulations_fix
11 years ago
Alexander Smorkalov
3036ec4b89
LibTIFF Win32 API back-end disabled for Windows RT.
11 years ago
Roman Donchenko
11dcd4f4f3
Merge pull request #1356 from SpecLad:homography-uninit
11 years ago
Vadim Pisarevsky
771feb61c2
fixed building OpenCV with IPP 6.x (different DFT API); added Canny and rectangular morphology (based on Alex Kapustin patches)
11 years ago
Alexander Smorkalov
aa00b5a0ab
New Tegra detector with Android 4.3 support added. Manager version++.
11 years ago
Alexander Smorkalov
8d4cbf4deb
Bug #3238 Android sample image manipulations blinks in non-preview modes fixed.
11 years ago
Roman Donchenko
2b90b20be2
Merge pull request #1357 from SpecLad:less-precomps
11 years ago
Roman Donchenko
e59c74e1c7
Merge pull request #1348 from SpecLad:merge-2.4
11 years ago
Roman Donchenko
cdf6cf2cd8
Merge pull request #1213 from kdrobnyh:color
11 years ago
Roman Donchenko
122d0f8685
Deleted the now-empty ocl perf_precomp.cpp.
...
See pull request #1241 for why.
11 years ago
Roman Donchenko
5e4ebf3403
Fixed incomplete matrix initialization in HomographyRefineCallback.
11 years ago
Roman Donchenko
7afc2677e6
Removed a duplicate line.
11 years ago
Roman Donchenko
8bb9994094
Merge pull request #1349 from ilya-lavrenov:ocl_perf_finish
11 years ago
Vladislav Vinogradov
d87eb75904
rewrite gpu stereo multi gpu sample:
...
* use different approaches -> threads and streams
* clean up code
11 years ago
peng xiao
9f0a88c1d6
Remove trailing whitespace.
11 years ago
Roman Donchenko
10cb9a0c4a
Merge pull request #1342 from nevion:master
11 years ago
Roman Donchenko
1840fd5f00
Merge pull request #1248 from vkocheganov:chi_square_alt
11 years ago
peng xiao
287c8a3330
Let ocl::context only be initialized once in retina_ocl test.
11 years ago