Commit Graph

9592 Commits

Author SHA1 Message Date
Roman Donchenko
8200a95ced Boring changes - core.
This and several following commits contain the "boring" changes required
to support the new Ptr. These are changes like:

* new T -> makePtr<T> or .reset(new T) or Ptr<T>(new T)
  (depending on the situation)
* p.empty() -> !p
* delete_obj -> DefaultDeleter::operator()

and similar changes that are numerous, but primitive.
2013-09-05 18:26:43 +04:00
Roman Donchenko
461c98fa86 Replaced Ptr with my new implementation. 2013-09-05 14:54:20 +04:00
Roman Donchenko
ecc51817d9 Merge pull request #1399 from pengx17:master_retina_ocl_fix 2013-09-05 11:57:46 +04:00
pengxiao
e45f92a9e1 Fix a bug of ocl retina on NVIDIA platform. 2013-09-04 16:38:36 +08:00
Roman Donchenko
fd3b2326b4 Merge pull request #1373 from abidrahmank:pykeypoints 2013-09-04 11:53:33 +04:00
Roman Donchenko
009919872f Merge pull request #1389 from SpecLad:merge-2.4 2013-09-03 19:42:06 +04:00
Abid K
0902f183ca alignment of parameters as per speclad 2013-09-03 21:12:03 +05:30
Roman Donchenko
79457f8f49 Merge pull request #1224 from mbarnach:pca_io 2013-09-03 18:43:54 +04:00
Roman Donchenko
18bb951574 Nuked the rest of the precomp.cpp files.
Consider this a part of merging #1357.
2013-09-02 19:53:45 +04:00
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
2013-09-02 19:44:51 +04:00
Roman Donchenko
99043f6fc2 Merge pull request #1385 from asmorkalov:winrt_glob_fix 2013-09-02 16:05:15 +04:00
Alexander Smorkalov
6d3102141c Globbing accuracy test fail on Windows RT fixed. 2013-09-02 04:31:58 -07:00
Roman Donchenko
188d3f02ee Merge pull request #1302 from kdrobnyh:compare 2013-09-02 15:11:20 +04:00
Roman Donchenko
ff2b12334d Merge pull request #1355 from jet47:gpu-stereo-multi-gpu-sample 2013-09-02 14:10:06 +04:00
Roman Donchenko
bd7930ada1 Merge pull request #1345 from pengx17:2.4_tvl1ocl_opt 2013-09-02 13:09:22 +04:00
Roman Donchenko
7e4c0ac4d6 Merge pull request #1371 from HapeMask:fix-png-warnings 2013-08-30 17:56:06 +04:00
Roman Donchenko
46d74d7c6b Merge pull request #1360 from vpisarev:24_ipp_dft_canny_morphrect 2013-08-30 17:55:07 +04:00
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.
2013-08-30 09:49:24 -04:00
Gabe Schwartz
e2441e0034 Removed incorrect iCCP chunks from GUI resources.
Also removed malformed tEXt chunk from a logo PNG.
2013-08-30 09:49:24 -04:00
Roman Donchenko
d6e8216b16 Merge pull request #1374 from zacstewart:2.4 2013-08-30 17:28:51 +04:00
Roman Donchenko
42b4d830e8 Merge pull request #1266 from kdrobnyh:core_stat_functions 2013-08-30 17:26:20 +04:00
Roman Donchenko
96a0afce50 Merge pull request #1236 from pengx17:2.4_fix_retina_color_param 2013-08-30 17:25:07 +04:00
Zac Stewart
8049296cda Correct name of eye function 2013-08-30 06:34:47 -04:00
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