Roman Donchenko [Fri, 6 Sep 2013 08:28:59 +0000 (12:28 +0400)]
retina_ocl.hpp: switched BasicRetinaFilter's members around to fix a -Wreorder warning.
Roman Donchenko [Fri, 6 Sep 2013 07:53:33 +0000 (11:53 +0400)]
Merge pull request #1281 from SpecLad:the-smartest-pointer
Roman Donchenko [Thu, 5 Sep 2013 10:53:21 +0000 (14:53 +0400)]
Added tests for Ptr.
Roman Donchenko [Thu, 15 Aug 2013 15:54:00 +0000 (19:54 +0400)]
Fixed some dubious uses of tbb::task_scheduler_init.
Roman Donchenko [Thu, 15 Aug 2013 10:44:25 +0000 (14:44 +0400)]
Rewrote the documentation for Ptr to fit the new implementation.
Roman Donchenko [Wed, 14 Aug 2013 08:44:58 +0000 (12:44 +0400)]
Made Filestorage able to not own its CvFileStorage instance.
This allows to get rid of the last remaining Ptr<T>::addref calls.
Roman Donchenko [Wed, 14 Aug 2013 08:44:11 +0000 (12:44 +0400)]
Replaced calls to Ptr<T>::ptr to ::dynamicCast.
Roman Donchenko [Wed, 14 Aug 2013 08:41:58 +0000 (12:41 +0400)]
Added to CV_INIT_ALGORITHM a Ptr creation function, for convenience.
Also changed the static functions to inline, to stop GCC complaining
about unused functions.
Roman Donchenko [Wed, 14 Aug 2013 08:32:41 +0000 (12:32 +0400)]
Adapt Python bindings to the new Ptr.
Roman Donchenko [Tue, 13 Aug 2013 15:12:25 +0000 (19:12 +0400)]
Java: removed usages of Ptr<T>::addref().
Now the features2d class wrappers use composition instead of inheritance.
Roman Donchenko [Tue, 13 Aug 2013 14:52:06 +0000 (18:52 +0400)]
Replace an incorrect usage of Ptr with a simple vector.
Roman Donchenko [Tue, 13 Aug 2013 14:49:29 +0000 (18:49 +0400)]
Boring changes - samples.
Roman Donchenko [Tue, 13 Aug 2013 14:33:06 +0000 (18:33 +0400)]
Boring changes - apps.
Roman Donchenko [Tue, 13 Aug 2013 14:29:36 +0000 (18:29 +0400)]
Boring changes - legacy.
Roman Donchenko [Tue, 13 Aug 2013 14:24:30 +0000 (18:24 +0400)]
Boring changes - contrib.
Roman Donchenko [Tue, 13 Aug 2013 14:18:38 +0000 (18:18 +0400)]
Boring changes - ocl.
Roman Donchenko [Tue, 13 Aug 2013 14:58:46 +0000 (18:58 +0400)]
Boring changes - gpuwarping.
Roman Donchenko [Tue, 13 Aug 2013 14:17:21 +0000 (18:17 +0400)]
Boring changes - gpustereo.
Roman Donchenko [Tue, 13 Aug 2013 14:16:41 +0000 (18:16 +0400)]
Boring changes - gpulegacy.
Roman Donchenko [Tue, 13 Aug 2013 14:15:02 +0000 (18:15 +0400)]
Boring changes - gpuimgproc.
Roman Donchenko [Tue, 13 Aug 2013 14:10:26 +0000 (18:10 +0400)]
Boring changes - gpufilters.
Roman Donchenko [Tue, 13 Aug 2013 14:06:39 +0000 (18:06 +0400)]
Boring changes - gpucodec.
Roman Donchenko [Tue, 13 Aug 2013 14:05:11 +0000 (18:05 +0400)]
Boring changes - gpubgsegm.
Roman Donchenko [Tue, 13 Aug 2013 14:03:48 +0000 (18:03 +0400)]
Boring changes - gpuarithm.
Roman Donchenko [Tue, 13 Aug 2013 14:03:13 +0000 (18:03 +0400)]
Boring changes - gpu.
Roman Donchenko [Tue, 13 Aug 2013 14:01:59 +0000 (18:01 +0400)]
Boring changes - videostab.
Roman Donchenko [Tue, 13 Aug 2013 13:57:49 +0000 (17:57 +0400)]
Boring changes - video.
Roman Donchenko [Tue, 13 Aug 2013 13:57:06 +0000 (17:57 +0400)]
Boring changes - superres.
Roman Donchenko [Tue, 13 Aug 2013 13:54:12 +0000 (17:54 +0400)]
Boring changes - stitching.
Roman Donchenko [Tue, 13 Aug 2013 13:48:37 +0000 (17:48 +0400)]
Boring changes - softcascade.
Roman Donchenko [Tue, 13 Aug 2013 13:46:40 +0000 (17:46 +0400)]
Boring changes - photo.
Roman Donchenko [Tue, 13 Aug 2013 13:45:29 +0000 (17:45 +0400)]
Boring changes - objdetect.
Roman Donchenko [Tue, 13 Aug 2013 13:36:38 +0000 (17:36 +0400)]
Boring changes - nonfree.
Roman Donchenko [Tue, 13 Aug 2013 13:35:25 +0000 (17:35 +0400)]
Boring changes - ml.
Roman Donchenko [Tue, 13 Aug 2013 13:30:14 +0000 (17:30 +0400)]
Boring changes - features2d.
Roman Donchenko [Tue, 13 Aug 2013 13:03:56 +0000 (17:03 +0400)]
Boring changes - calib3d.
Roman Donchenko [Tue, 13 Aug 2013 12:48:54 +0000 (16:48 +0400)]
Boring changes - bioinspired.
Roman Donchenko [Tue, 13 Aug 2013 12:47:18 +0000 (16:47 +0400)]
Boring changes - highgui.
Roman Donchenko [Tue, 13 Aug 2013 12:39:58 +0000 (16:39 +0400)]
Boring changes - imgproc.
Roman Donchenko [Tue, 13 Aug 2013 12:22:07 +0000 (16:22 +0400)]
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.
Roman Donchenko [Tue, 13 Aug 2013 11:18:07 +0000 (15:18 +0400)]
Replaced Ptr with my new implementation.
Roman Donchenko [Thu, 5 Sep 2013 07:57:44 +0000 (11:57 +0400)]
Merge pull request #1399 from pengx17:master_retina_ocl_fix
pengxiao [Wed, 4 Sep 2013 08:38:36 +0000 (16:38 +0800)]
Fix a bug of ocl retina on NVIDIA platform.
Roman Donchenko [Wed, 4 Sep 2013 07:53:32 +0000 (11:53 +0400)]
Merge pull request #1373 from abidrahmank:pykeypoints
Roman Donchenko [Tue, 3 Sep 2013 15:42:05 +0000 (19:42 +0400)]
Merge pull request #1389 from SpecLad:merge-2.4
Abid K [Tue, 3 Sep 2013 15:42:03 +0000 (21:12 +0530)]
alignment of parameters as per speclad
Roman Donchenko [Tue, 3 Sep 2013 14:43:54 +0000 (18:43 +0400)]
Merge pull request #1224 from mbarnach:pca_io
Roman Donchenko [Mon, 2 Sep 2013 15:53:45 +0000 (19:53 +0400)]
Nuked the rest of the precomp.cpp files.
Consider this a part of merging #1357.
Roman Donchenko [Mon, 2 Sep 2013 15:44:51 +0000 (19:44 +0400)]
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
Roman Donchenko [Mon, 2 Sep 2013 12:05:14 +0000 (16:05 +0400)]
Merge pull request #1385 from asmorkalov:winrt_glob_fix
Alexander Smorkalov [Mon, 2 Sep 2013 07:57:42 +0000 (00:57 -0700)]
Globbing accuracy test fail on Windows RT fixed.
Roman Donchenko [Mon, 2 Sep 2013 11:11:19 +0000 (15:11 +0400)]
Merge pull request #1302 from kdrobnyh:compare
Roman Donchenko [Mon, 2 Sep 2013 10:10:05 +0000 (14:10 +0400)]
Merge pull request #1355 from jet47:gpu-stereo-multi-gpu-sample
Roman Donchenko [Mon, 2 Sep 2013 09:09:22 +0000 (13:09 +0400)]
Merge pull request #1345 from pengx17:2.4_tvl1ocl_opt
Roman Donchenko [Fri, 30 Aug 2013 13:56:06 +0000 (17:56 +0400)]
Merge pull request #1371 from HapeMask:fix-png-warnings
Roman Donchenko [Fri, 30 Aug 2013 13:55:07 +0000 (17:55 +0400)]
Merge pull request #1360 from vpisarev:24_ipp_dft_canny_morphrect
Gabe Schwartz [Thu, 29 Aug 2013 18:32:50 +0000 (14:32 -0400)]
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.
Gabe Schwartz [Tue, 27 Aug 2013 20:28:10 +0000 (16:28 -0400)]
Removed incorrect iCCP chunks from GUI resources.
Also removed malformed tEXt chunk from a logo PNG.
Roman Donchenko [Fri, 30 Aug 2013 13:28:51 +0000 (17:28 +0400)]
Merge pull request #1374 from zacstewart:2.4
Roman Donchenko [Fri, 30 Aug 2013 13:26:20 +0000 (17:26 +0400)]
Merge pull request #1266 from kdrobnyh:core_stat_functions
Roman Donchenko [Fri, 30 Aug 2013 13:25:06 +0000 (17:25 +0400)]
Merge pull request #1236 from pengx17:2.4_fix_retina_color_param
Zac Stewart [Fri, 30 Aug 2013 10:34:47 +0000 (06:34 -0400)]
Correct name of eye function
Zac Stewart [Fri, 30 Aug 2013 10:34:23 +0000 (06:34 -0400)]
Remove extraneous colon before ':basicstructures:'
abidrahmank [Fri, 30 Aug 2013 10:28:10 +0000 (15:58 +0530)]
warning corrections
Roman Donchenko [Fri, 30 Aug 2013 08:24:24 +0000 (12:24 +0400)]
Merge pull request #1363 from ilya-lavrenov:ocl_enable_tests
Roman Donchenko [Fri, 30 Aug 2013 08:21:26 +0000 (12:21 +0400)]
Merge pull request #1370 from ilya-lavrenov:ocl_decor
abidrahmank [Fri, 30 Aug 2013 05:41:06 +0000 (11:11 +0530)]
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])
kdrobnyh [Thu, 29 Aug 2013 17:05:35 +0000 (21:05 +0400)]
Add IPP support in meanStdDev, minMaxIdx, norm functions
kdrobnyh [Thu, 29 Aug 2013 14:53:46 +0000 (07:53 -0700)]
Merge pull request #5 from Itseez/2.4
Some changes in OpenCV
ilya-lavrenov [Wed, 28 Aug 2013 07:25:54 +0000 (11:25 +0400)]
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
ilya-lavrenov [Thu, 29 Aug 2013 11:55:53 +0000 (15:55 +0400)]
gpu -> ocl
Roman Donchenko [Thu, 29 Aug 2013 14:09:06 +0000 (18:09 +0400)]
Merge pull request #1361 from asmorkalov:winrt_api_container
Roman Donchenko [Thu, 29 Aug 2013 14:07:57 +0000 (18:07 +0400)]
Merge pull request #1359 from asmorkalov:winrt_tiff_api_fix
kdrobnyh [Mon, 19 Aug 2013 12:41:31 +0000 (16:41 +0400)]
Add IPP support in compare function
Roman Donchenko [Thu, 29 Aug 2013 12:35:38 +0000 (16:35 +0400)]
Merge pull request #1366 from asmorkalov:ocv_autobuffer_fix
Roman Donchenko [Thu, 29 Aug 2013 12:26:55 +0000 (16:26 +0400)]
Merge pull request #1309 from pengx17:master_retina_ocl
Alexander Smorkalov [Sun, 25 Aug 2013 12:33:22 +0000 (16:33 +0400)]
AutoBuffer with initial zero size fixed.
Vadim Pisarevsky [Wed, 28 Aug 2013 15:53:40 +0000 (19:53 +0400)]
fixed bugs in rectangular morphology case
Alexander Smorkalov [Wed, 28 Aug 2013 15:36:57 +0000 (08:36 -0700)]
/apicontainer added to linker flags on WinRT to fix api test issues.
Roman Donchenko [Wed, 28 Aug 2013 15:02:08 +0000 (19:02 +0400)]
Merge pull request #1338 from asmorkalov:android_tegra_detector
Roman Donchenko [Wed, 28 Aug 2013 15:01:15 +0000 (19:01 +0400)]
Merge pull request #1343 from asmorkalov:android_img_manipulations_fix
Alexander Smorkalov [Wed, 28 Aug 2013 14:31:46 +0000 (07:31 -0700)]
LibTIFF Win32 API back-end disabled for Windows RT.
Roman Donchenko [Wed, 28 Aug 2013 14:05:10 +0000 (18:05 +0400)]
Merge pull request #1356 from SpecLad:homography-uninit
Vadim Pisarevsky [Wed, 28 Aug 2013 13:00:26 +0000 (17:00 +0400)]
fixed building OpenCV with IPP 6.x (different DFT API); added Canny and rectangular morphology (based on Alex Kapustin patches)
Alexander Smorkalov [Fri, 23 Aug 2013 13:37:43 +0000 (17:37 +0400)]
New Tegra detector with Android 4.3 support added. Manager version++.
Alexander Smorkalov [Mon, 26 Aug 2013 13:35:20 +0000 (17:35 +0400)]
Bug #3238 Android sample image manipulations blinks in non-preview modes fixed.
Roman Donchenko [Wed, 28 Aug 2013 10:52:28 +0000 (14:52 +0400)]
Merge pull request #1357 from SpecLad:less-precomps
Roman Donchenko [Wed, 28 Aug 2013 09:41:39 +0000 (13:41 +0400)]
Merge pull request #1348 from SpecLad:merge-2.4
Roman Donchenko [Wed, 28 Aug 2013 09:31:08 +0000 (13:31 +0400)]
Merge pull request #1213 from kdrobnyh:color
Roman Donchenko [Wed, 28 Aug 2013 09:23:50 +0000 (13:23 +0400)]
Deleted the now-empty ocl perf_precomp.cpp.
See pull request #1241 for why.
Roman Donchenko [Wed, 28 Aug 2013 09:20:14 +0000 (13:20 +0400)]
Fixed incomplete matrix initialization in HomographyRefineCallback.
Roman Donchenko [Wed, 28 Aug 2013 09:13:15 +0000 (13:13 +0400)]
Removed a duplicate line.
Roman Donchenko [Wed, 28 Aug 2013 08:46:01 +0000 (12:46 +0400)]
Merge pull request #1349 from ilya-lavrenov:ocl_perf_finish
Vladislav Vinogradov [Wed, 28 Aug 2013 08:41:41 +0000 (12:41 +0400)]
rewrite gpu stereo multi gpu sample:
* use different approaches -> threads and streams
* clean up code
peng xiao [Wed, 28 Aug 2013 08:23:46 +0000 (16:23 +0800)]
Remove trailing whitespace.
Roman Donchenko [Wed, 28 Aug 2013 08:00:39 +0000 (12:00 +0400)]
Merge pull request #1342 from nevion:master
Roman Donchenko [Wed, 28 Aug 2013 07:44:40 +0000 (11:44 +0400)]
Merge pull request #1248 from vkocheganov:chi_square_alt
peng xiao [Wed, 28 Aug 2013 01:17:05 +0000 (09:17 +0800)]
Let ocl::context only be initialized once in retina_ocl test.
ilya-lavrenov [Tue, 27 Aug 2013 14:46:30 +0000 (18:46 +0400)]
appended ocl::finish to test_cycle defines
Roman Donchenko [Tue, 27 Aug 2013 15:15:47 +0000 (19:15 +0400)]
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